Snapshot from cinelerra-cv git with libpng14 patch from Arch Linux.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 155 insertions, 2 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 2aacacad3343..4532711edeb4 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.39 2010/01/30 14:37:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.40 2010/03/20 15:00:49 ssuominen Exp $
+
+*cinelerra-20100320 (20 Mar 2010)
+
+  20 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +cinelerra-20100320.ebuild, +files/cinelerra-20100320-libpng14.patch,
+  +files/cinelerra-20100320-pkgconfig-x264.patch:
+  Snapshot from cinelerra-cv git with libpng14 patch from Arch Linux.
 
 *cinelerra-20090210-r1 (30 Jan 2010)
 
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 7567168a9fb7..ff6736c57fba 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,8 +1,12 @@
+AUX cinelerra-20100320-libpng14.patch 1082 RMD160 43a09cb00718a4cecbdb175d32b90539703ebc09 SHA1 f57287f451c2e380c0f83b86589f7dc43f5d2bdb SHA256 d214ad3ade6f51fce92db1b0c3889fff1c5c55634d5adfdb05257e5393f34972
+AUX cinelerra-20100320-pkgconfig-x264.patch 480 RMD160 3746b9f0e2b85888e2ffe7e7ccb8a4f2cc53c129 SHA1 643d1568e3a7cb66018e507632e8bc10b5e66aec SHA256 d569d0c6f1bf52a37d3a96d2753c4847aad1c5cf91ea14d2449ec6f527f2110f
 AUX cinelerra-jpeg-7.patch 1131 RMD160 128d7cf423843eeaae8a1a334a3166e9ce5295cd SHA1 8803c6d90ac76404d8151f2011eb2982f0d27fda SHA256 e6dfc3c95e8e6a21cc9b23aee2ee967b2a52a0ee208e70af0ed0814a919bb0df
 AUX cinelerra-libavutil50.patch 2140 RMD160 95720943d2bee3a7f5c5a864aef5631655a65120 SHA1 6fa5d1024adde249fe026837061ceace11b06532 SHA256 f29284a0e8b629c1ff22090c03c9fe3947adbd024dd2c05d925775c8f96f8eda
 AUX cinelerra-pkgconfig-x264.patch 649 RMD160 29d4e37c6ffb11128281a6f49e614e32b7af6510 SHA1 62817baa7a633ec568b79dd5f02bd918eb14ff55 SHA256 eaf8f936b41dd998b6a793ffad37e98c840ea3225adf61419ff7e0610f61e92e
 AUX cinelerra-x264.patch 679 RMD160 27c0bb325268a3523887d3d10da94090119247f1 SHA1 f59faeeca021a70ad41887b7ccc0278c8c29472d SHA256 a4a561def29c25d087cab8fceabba1dfed4c712c493dc2c8411cbf6d6226cd2b
 DIST cinelerra-20090210.tar.lzma 21049396 RMD160 346353eec1a796698cb95b3066058344b244416c SHA1 68e40b1de7d17da70d1087af339146be3d00fd0f SHA256 35daee11a42dec974ac45de54773022463b3daeb61da4590a9e9d57fce3298ea
+DIST cinelerra-20100320.tar.bz2 32670992 RMD160 96c47cf5d9f57b88ad7e3ddee42e61cfe9ccb421 SHA1 ecf4c728e149556e4725a84d460f8a0b8dad6277 SHA256 8b1b057f77283c95d728e9b848d71e938756f6deea0102ca69b618753231c9f3
 EBUILD cinelerra-20090210-r1.ebuild 2631 RMD160 baeeeb15c7faf4876b24bc047c08c0ac1e6b15dd SHA1 973cf0bc3a55411df6c06078a9075b8964615e28 SHA256 a6c87960ba5cf0864217943f79d5fad968ac4a7b2c38a80d853c66fdecf7de70
-MISC ChangeLog 9865 RMD160 dc8d920e48528b93ee36824529ae83a1c0b83fd2 SHA1 17a5f06b33ee47bf4338039ade929f83b9617603 SHA256 b0dc166204f4e0b4fdd33009b85b718accbffcba27182eff4c206ecd7979a493
+EBUILD cinelerra-20100320.ebuild 2308 RMD160 2b1df77c04ca61be68de0ae508a9b1d0c51ebcee SHA1 cba6ddc2c9db8c8571f2ea9ffc122eefe3d880f0 SHA256 c90edd364535ea6b28c15519b450829ff493ade3fede2ee7474d7e2ce6a5637c
+MISC ChangeLog 10147 RMD160 4453a6013902c85a3ad6d8f968f67bd98a42bdf1 SHA1 4e8a303f3e7e93c42d80d6bfeeee30bb1a29b38a SHA256 6c5051dfc2e3308b08bbdb5340bf2d10d5908c25302327d0ac1a7c763279f0ed
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
diff --git a/media-video/cinelerra/cinelerra-20100320.ebuild b/media-video/cinelerra/cinelerra-20100320.ebuild
new file mode 100644
index 000000000000..3438b696c9de
--- /dev/null
+++ b/media-video/cinelerra/cinelerra-20100320.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20100320.ebuild,v 1.1 2010/03/20 15:00:49 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils multilib
+
+DESCRIPTION="Cinelerra - Professional Video Editor - Unofficial CVS-version"
+HOMEPAGE="http://www.cinelerra.org/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="3dnow alsa altivec css ieee1394 mmx opengl oss"
+
+RDEPEND="media-libs/libpng
+	>=media-libs/libdv-1.0.0
+	media-libs/faad2
+	media-libs/faac
+	media-libs/a52dec
+	media-libs/libsndfile
+	media-libs/tiff
+	media-video/ffmpeg
+	media-sound/lame
+	>=sci-libs/fftw-3.0.1
+	media-libs/x264
+	media-video/mjpegtools
+	>=media-libs/freetype-2.1.10
+	>=media-libs/openexr-1.2.2
+	>=media-libs/libvorbis-1.2.3
+	>=media-libs/libogg-1.1.4
+	>=media-libs/libtheora-1.1.1
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libXvMC
+	x11-libs/libXft
+	alsa? ( media-libs/alsa-lib )
+	ieee1394? ( media-libs/libiec61883
+		>=sys-libs/libraw1394-1.2.0
+		>=sys-libs/libavc1394-0.5.0 )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	mmx? ( dev-lang/nasm )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-libavutil50.patch \
+		"${FILESDIR}"/${P}-pkgconfig-x264.patch \
+		"${FILESDIR}"/${PN}-x264.patch \
+		"${FILESDIR}"/${PN}-jpeg-7.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		--disable-esd \
+		$(use_enable ieee1394 firewire) \
+		$(use_enable css) \
+		$(use_enable mmx) \
+		$(use_enable 3dnow) \
+		$(use_enable altivec) \
+		$(use_enable opengl) \
+		--with-plugindir=/usr/$(get_libdir)/cinelerra \
+		--with-buildinfo=cust/"Gentoo - ${PV}" \
+		--with-external-ffmpeg
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dohtml -a png,html,texi,sdw -r doc/*
+	# workaround
+	rm -rf "${D}"/usr/include
+	mv -v "${D}"/usr/bin/mpeg3cat "${D}"/usr/bin/mpeg3cat.hv
+	mv -v "${D}"/usr/bin/mpeg3dump "${D}"/usr/bin/mpeg3dump.hv
+	mv -v "${D}"/usr/bin/mpeg3toc "${D}"/usr/bin/mpeg3toc.hv
+	dosym /usr/bin/mpeg2enc /usr/$(get_libdir)/cinelerra/mpeg2enc.plugin
+}
diff --git a/media-video/cinelerra/files/cinelerra-20100320-libpng14.patch b/media-video/cinelerra/files/cinelerra-20100320-libpng14.patch
new file mode 100644
index 000000000000..f3a0b854f741
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-20100320-libpng14.patch
@@ -0,0 +1,41 @@
+http://repos.archlinux.org/wsvn/community/cinelerra-cv/trunk/libpng14.patch
+
+--- cinelerra/cinelerra/filepng.C
++++ cinelerra/cinelerra/filepng.C
+@@ -56,7 +56,7 @@
+ 		fread(test, 16, 1, stream);
+ 		fclose(stream);
+ 
+-		if(png_check_sig((unsigned char*)test, 8))
++		if(png_sig_cmp((unsigned char*)test, 0, 8) == 0)
+ 		{
+ //printf("FilePNG::check_sig 1\n");
+ 			return 1;
+--- cinelerra/plugins/shapewipe/shapewipe.C
++++ cinelerra/plugins/shapewipe/shapewipe.C
+@@ -386,7 +386,7 @@
+ 	}
+ 
+ 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+-		png_voidp_NULL, png_error_ptr_NULL, png_error_ptr_NULL);
++		NULL, NULL, NULL);
+ 
+ 	if (!png_ptr)
+ 	{
+@@ -399,14 +399,14 @@
+ 	info_ptr = png_create_info_struct(png_ptr);
+ 	if (!info_ptr)
+ 	{
+-		png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++		png_destroy_read_struct(&png_ptr, NULL, NULL);
+ 		return 1;
+ 	}
+ 
+ 	end_info = png_create_info_struct(png_ptr);
+ 	if (!end_info)
+ 	{
+-		png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 		return 1;
+ 	}
+ 
diff --git a/media-video/cinelerra/files/cinelerra-20100320-pkgconfig-x264.patch b/media-video/cinelerra/files/cinelerra-20100320-pkgconfig-x264.patch
new file mode 100644
index 000000000000..4a2a51e1b65f
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-20100320-pkgconfig-x264.patch
@@ -0,0 +1,16 @@
+--- configure.in
++++ configure.in
+@@ -269,12 +269,7 @@
+ 
+ ############## libx264
+ LIBX264_LIBS=""
+-AC_CHECK_LIB(x264, x264_encoder_close,
+-	[libx264=yes LIBX264_LIBS=-lx264],,-lpthread -lm)
+-if test "x$with_pic" = "xyes"; then
+-	AC_CHECK_LIB(x264_pic, x264_encoder_open,
+-		[libx264=yes LIBX264_LIBS=-lx264_pic],,-lpthread -lm)
+-fi
++PKG_CHECK_MODULES([LIBX264], [x264], [libx264=yes], [libx264=no])
+ AC_CHECK_HEADER(x264.h, [libx264h=yes])
+ AC_SUBST(LIBX264_LIBS)
+ ##############