Version bump, closing bug #181626 and bug #174159

Package-Manager: portage-2.1.2.9

5 files changed, 166 insertions, 9 deletions

diff --git a/media-video/cinelerra-cvs/ChangeLog b/media-video/cinelerra-cvs/ChangeLog
index 69cddd95f7e9..3a74c12b6d0f 100644
--- a/media-video/cinelerra-cvs/ChangeLog
+++ b/media-video/cinelerra-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/cinelerra-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.28 2007/02/25 01:57:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/ChangeLog,v 1.29 2007/06/11 19:26:02 aballier Exp $
+
+*cinelerra-cvs-20070607 (11 Jun 2007)
+
+  11 Jun 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/recentffmpeg.patch, +cinelerra-cvs-20070607.ebuild:
+  Version bump, closing bug #181626 and bug #174159
 
   25 Feb 2007; Alexis Ballier <aballier@gentoo.org>
   -cinelerra-cvs-20061020.ebuild:
diff --git a/media-video/cinelerra-cvs/Manifest b/media-video/cinelerra-cvs/Manifest
index 9b14a692ae72..9b260a11f677 100644
--- a/media-video/cinelerra-cvs/Manifest
+++ b/media-video/cinelerra-cvs/Manifest
@@ -1,15 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX recentffmpeg.patch 656 RMD160 e11f653b08b7145feeff245d8aadb72b11b89ee9 SHA1 f84d2dd7cb52fc2f489bab2d2ecd5c72a3a43c33 SHA256 be61fc2c7a200b73370aa0f1fae7cd18a28b4d27c4667782c8ea4d6cb01c0d1e
+MD5 e1ff8ea5d792db64b9a120ffa4abdaec files/recentffmpeg.patch 656
+RMD160 e11f653b08b7145feeff245d8aadb72b11b89ee9 files/recentffmpeg.patch 656
+SHA256 be61fc2c7a200b73370aa0f1fae7cd18a28b4d27c4667782c8ea4d6cb01c0d1e files/recentffmpeg.patch 656
 DIST cinelerra-cvs-20070122.tar.bz2 46641387 RMD160 3ff696096166a5a41730687400acadf21a4e8e87 SHA1 163f267f19606bb3d7d33ef4018ee0187f34978c SHA256 95b94ef5da7eb4d2278f5c6e069c95f30b48cd2f64273faf730b599705ff6b80
+DIST cinelerra-cvs-20070607.tar.bz2 23791150 RMD160 ecd77bab5f827139a4f64e75942b03aa9e7c22aa SHA1 5c1c14716653ac725fce744c131cba2d27ae43ff SHA256 728fd0ffc4f65eb13e892ca729b136e150bfee7ee11ed72d9ad389c25fa9ff6c
 EBUILD cinelerra-cvs-20070122.ebuild 2805 RMD160 e1d01d23d2c9bb21f33ffed8ca5ad399920ca162 SHA1 372474e14d3ba8780fe6761dcd17de8981a82c0e SHA256 be2736479edd18f09631c0db1e013bfda8f6cb261bff49c0ea4150dbb0959c55
 MD5 8db2ef2a9497008b0cd786eacc9de454 cinelerra-cvs-20070122.ebuild 2805
 RMD160 e1d01d23d2c9bb21f33ffed8ca5ad399920ca162 cinelerra-cvs-20070122.ebuild 2805
 SHA256 be2736479edd18f09631c0db1e013bfda8f6cb261bff49c0ea4150dbb0959c55 cinelerra-cvs-20070122.ebuild 2805
-MISC ChangeLog 4436 RMD160 80a489be98d5772b4d74d41bc06d06a79b000991 SHA1 c3b8c1ef317ab5c78b4fd5aeb718d0947883907b SHA256 0d6fae36296cf875353cb40c901eb3caa2bd401cbb41ebf5592daafe9d53ca4d
-MD5 8356e5ee13c620f8e51edee54c6cb53e ChangeLog 4436
-RMD160 80a489be98d5772b4d74d41bc06d06a79b000991 ChangeLog 4436
-SHA256 0d6fae36296cf875353cb40c901eb3caa2bd401cbb41ebf5592daafe9d53ca4d ChangeLog 4436
+EBUILD cinelerra-cvs-20070607.ebuild 2880 RMD160 317bd8439735f5337188e3a58ecc44f948681100 SHA1 56887a7dda9bdf407ae0a3666ea6a99b9d761383 SHA256 1f8e1ca8bc412a997e610d0afbb03b2f5a86c1a9a6c20cad418f13bf7d73513e
+MD5 8e2abc3164be6667e3036ee976e8a877 cinelerra-cvs-20070607.ebuild 2880
+RMD160 317bd8439735f5337188e3a58ecc44f948681100 cinelerra-cvs-20070607.ebuild 2880
+SHA256 1f8e1ca8bc412a997e610d0afbb03b2f5a86c1a9a6c20cad418f13bf7d73513e cinelerra-cvs-20070607.ebuild 2880
+MISC ChangeLog 4641 RMD160 9e4594b8379559cd89904996216ce21ec210d978 SHA1 d29def7fb6234fe9813b8cce83a806392f80526c SHA256 6072e9d2c43f4423ce5cc868247770587d05e1d9e2750f15df36ed95fde28243
+MD5 dbec10b38b4723021e6d23eca2a8b456 ChangeLog 4641
+RMD160 9e4594b8379559cd89904996216ce21ec210d978 ChangeLog 4641
+SHA256 6072e9d2c43f4423ce5cc868247770587d05e1d9e2750f15df36ed95fde28243 ChangeLog 4641
 MISC metadata.xml 251 RMD160 11462994b78856883a805c72334300d07101713d SHA1 a8362b29138cd87a592947af33840bf3210cfc59 SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f
 MD5 955f56e990f8c32d705708b4cc4db089 metadata.xml 251
 RMD160 11462994b78856883a805c72334300d07101713d metadata.xml 251
@@ -17,10 +26,13 @@ SHA256 0e151c0a2781f2632c75a2f2c3b1a8d187aed329467472236c65627a7e0ba42f metadata
 MD5 da63968c9c86e2802ceddb031d84d084 files/digest-cinelerra-cvs-20070122 277
 RMD160 cb00452a0ba6bedde45e27c6899ffee832b345ee files/digest-cinelerra-cvs-20070122 277
 SHA256 775de61ed4c9fdc409b65ea6c9249da7637c43914bf6f159053404a201754110 files/digest-cinelerra-cvs-20070122 277
+MD5 917460fdc7d753c3098febbca2faa4d4 files/digest-cinelerra-cvs-20070607 277
+RMD160 021b733910e30702d3dffe6343873995be6890d7 files/digest-cinelerra-cvs-20070607 277
+SHA256 5c2327a3faf1cfb14ebc0be9ac001d84749f4d9716d237c7bc7f9bee5f4297d7 files/digest-cinelerra-cvs-20070607 277
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFF4O0hvFcC4BYPU0oRAvN1AJ9iS2eHv9JKMeJ65lj+aI/N8n1RaQCgn3zD
-/iwUficM5vPBQ5qLXMBZqJA=
-=mqWT
+iD8DBQFGbaHTvFcC4BYPU0oRAucIAKC/tROghYyzl4bkPLgIkg0Xgd1DZQCfVXNI
+mYN8eG8Ztzeljy4hiJfPPdQ=
+=CBYW
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra-cvs/cinelerra-cvs-20070607.ebuild b/media-video/cinelerra-cvs/cinelerra-cvs-20070607.ebuild
new file mode 100644
index 000000000000..69bffd1568b6
--- /dev/null
+++ b/media-video/cinelerra-cvs/cinelerra-cvs-20070607.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra-cvs/cinelerra-cvs-20070607.ebuild,v 1.1 2007/06/11 19:26:02 aballier Exp $
+
+WANT_AUTOMAKE=1.9
+WANT_AUTOCONF=2.5
+
+inherit toolchain-funcs eutils flag-o-matic autotools
+
+#filter-flags "-fPIC -fforce-addr"
+
+DESCRIPTION="Cinelerra - Professional Video Editor - Unofficial CVS-version"
+HOMEPAGE="http://cvs.cinelerra.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="3dnow alsa esd mmx oss static truetype ieee1394 css altivec opengl"
+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-svn-20060302
+	ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 \
+		>=sys-libs/libavc1394-0.5.0 )
+	media-video/mjpegtools
+	alsa? ( media-libs/alsa-lib )
+	esd? ( >=media-sound/esound-0.2.34 )
+	truetype? ( >=media-libs/freetype-2.1.10 )
+	opengl? ( virtual/opengl )
+	>=media-libs/openexr-1.2.2
+	>=media-libs/libvorbis-1.1.0
+	>=media-libs/libogg-1.1
+	>=media-libs/libtheora-1.0_alpha4-r1
+	|| ( (
+			x11-libs/libX11
+			x11-libs/libXv
+			x11-libs/libXxf86vm
+			x11-libs/libXext
+			x11-libs/libXvMC
+			x11-libs/libXft
+		) virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	if [[ "$(gcc-major-version)" -lt "4" ]]; then
+		eerror "You need to have gcc 4 or better"
+		eerror "Please follow : http://www.gentoo.org/doc/en/gcc-upgrading.xml"
+		eerror "And have a look at bug #128659"
+		die "You must use gcc 4 or better."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/recentffmpeg.patch"
+}
+
+src_compile() {
+	AT_M4DIR="m4" eautoreconf
+	econf \
+	`use_enable static` \
+	`use_enable alsa` \
+	`use_enable esd` \
+	`use_enable oss` \
+	`use_enable mmx` \
+	`use_enable 3dnow` \
+	--with-plugindir=/usr/$(get_libdir)/cinelerra \
+	`use_enable truetype freetype2` \
+	`use_enable ieee1394 firewire` \
+	`use_enable css` \
+	`use_enable opengl` \
+	`use_enable altivec` \
+	--with-external-ffmpeg \
+	--with-buildinfo=cust/"Gentoo - SVN r1009" \
+	|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die
+	dohtml -a png,html,texi,sdw -r doc/*
+	# workaround
+	rm -fR ${D}/usr/include
+	mv ${D}/usr/bin/mpeg3cat ${D}/usr/bin/mpeg3cat.hv
+	mv ${D}/usr/bin/mpeg3dump ${D}/usr/bin/mpeg3dump.hv
+	mv ${D}/usr/bin/mpeg3toc ${D}/usr/bin/mpeg3toc.hv
+	ln -s /usr/bin/mpeg2enc ${D}/usr/$(get_libdir)/cinelerra/mpeg2enc.plugin
+}
+
+pkg_postinst () {
+	elog "Please note that this is unofficial and somewhat experimental code."
+	elog "See cvs.cinelerra.org for a list of changes to the official cinelerra"
+	elog "release."
+}
diff --git a/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20070607 b/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20070607
new file mode 100644
index 000000000000..c910c7118b67
--- /dev/null
+++ b/media-video/cinelerra-cvs/files/digest-cinelerra-cvs-20070607
@@ -0,0 +1,3 @@
+MD5 2fe7fc904e12b2f151ca9f9abda370b3 cinelerra-cvs-20070607.tar.bz2 23791150
+RMD160 ecd77bab5f827139a4f64e75942b03aa9e7c22aa cinelerra-cvs-20070607.tar.bz2 23791150
+SHA256 728fd0ffc4f65eb13e892ca729b136e150bfee7ee11ed72d9ad389c25fa9ff6c cinelerra-cvs-20070607.tar.bz2 23791150
diff --git a/media-video/cinelerra-cvs/files/recentffmpeg.patch b/media-video/cinelerra-cvs/files/recentffmpeg.patch
new file mode 100644
index 000000000000..99f986966365
--- /dev/null
+++ b/media-video/cinelerra-cvs/files/recentffmpeg.patch
@@ -0,0 +1,29 @@
+Index: cinelerra-cvs/cinelerra/ffmpeg.h
+===================================================================
+--- cinelerra-cvs.orig/cinelerra/ffmpeg.h
++++ cinelerra-cvs/cinelerra/ffmpeg.h
+@@ -1,7 +1,9 @@
+ #ifndef FFMPEG_H
+ #define FFMPEG_H
+ 
++extern "C" {
+ #include <avcodec.h>
++}
+ 
+ #include "asset.h"
+ #include "guicast.h"
+Index: cinelerra-cvs/cinelerra/fileac3.h
+===================================================================
+--- cinelerra-cvs.orig/cinelerra/fileac3.h
++++ cinelerra-cvs/cinelerra/fileac3.h
+@@ -1,8 +1,9 @@
+ #ifndef FILEAC3_H
+ #define FILEAC3_H
+ 
+-
++extern "C" {
+ #include <avcodec.h>
++}
+ #include "filebase.h"
+ #include <stdio.h>
+