Fix build with recent changes upstream (vhook removed in favour of libavfilter, swscale cannot be disabled anylonger); merge the EAPI=1 changes from the snapshotted version; add 3dnowext USE flag.

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

4 files changed, 31 insertions, 23 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index e339bce70c32..85017e86e305 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.274 2009/02/28 10:23:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.275 2009/03/05 19:20:34 flameeyes Exp $
+
+  05 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
+  ffmpeg-9999.ebuild:
+  Fix build with recent changes upstream (vhook removed in favour of
+  libavfilter, swscale cannot be disabled anylonger); merge the EAPI=1
+  changes from the snapshotted version; add 3dnowext USE flag.
 
   28 Feb 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
   custom-cflags is a global USE-flag
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 2472cc22ef1f..16b037323974 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -12,13 +12,14 @@ EBUILD ffmpeg-0.4.9_p20081219.ebuild 6146 RMD160 d9ace186852d82930fb988e5ef265f3
 EBUILD ffmpeg-0.4.9_p20090121.ebuild 6151 RMD160 af9848d2992e88c99a9b907542e95c5ee571f638 SHA1 b3f5d2e73a78f6c647e9096d8d3c7c23eb95fff2 SHA256 2ca908b5a71741b347aea0e7c44f74e24356b691f3c13705ff957580d3230c37
 EBUILD ffmpeg-0.4.9_p20090201-r1.ebuild 6253 RMD160 e8a26996c720d2b8483c487b58f29563dd468cf8 SHA1 e1796504e4586151d5df63a727c5a9e231a3404e SHA256 a15df64fc68af3838e927794b9536f355900c5430900f86d410ef9d75a86b64f
 EBUILD ffmpeg-0.4.9_p20090201.ebuild 6273 RMD160 d78b233e4b285c2f452396c84827126c9eb5dbb6 SHA1 a330052ed12fb8ca0cb1e30557d08719c9f012b6 SHA256 9ae1b2798eab76507447ebe785d97f3752ebf8fde9bc89866817b45d47efbb1f
-EBUILD ffmpeg-9999.ebuild 6223 RMD160 7e3c415d5c48fc530eb26ace97b8975146dcf9cf SHA1 31184ec3f96a6104d2f7bda4210a9f0544dcd438 SHA256 18e7ab897f6e38faaaed9ef8519ffc0641ac12987fdd2f821ea7e5ecd2c64584
-MISC ChangeLog 41372 RMD160 6846f0b81e237910fb4a8a9a5c8b522af156282a SHA1 cc2e8730c7bc34b6f3bb30912d6f9ed8e8221abe SHA256 0ef24bfe8ef49ab1c77dd2f51d01329f0409dba7256fc48e5c0396f9a23b0d90
-MISC metadata.xml 1158 RMD160 f666c9d210c950f862cbf0fcc323a7085f5febe7 SHA1 e5c84b8a4916b9bb20960ae16345c6d0844baa81 SHA256 ab916e46e6a91bf195e25dfe23c777436744017dfdb96d3330fd633bec599e2f
+EBUILD ffmpeg-9999.ebuild 6038 RMD160 3ccf14e61b88e68e890aa7694ee7a7564c546643 SHA1 56a6c1888b20d9846b761f92fc63fb1116e75f0b SHA256 d31ffdb75d0c35f74e5049fd917fc60a6801b45a37ee658b8e23678732d896ab
+MISC ChangeLog 41671 RMD160 c6fa3e3dd668837df890781ab89e3a0d4a390c23 SHA1 b6d049ac592ef6c5e4426bd3c5151e4ab4e4aecb SHA256 d47dd52279f2436bdb2d95ed524c0b3448a3003b1ccb8aa689cbea22acd92904
+MISC ffmpeg-9999.ebuild.rej 1621 RMD160 592fe6883e885bae07ec39213508dfdbe06093a4 SHA1 891eb9ec64cc5614fc5c65ebf141fba835118420 SHA256 11f02513d84dcc074722bdc2f908330090cc37b3fa50761f1d260d76e201520a
+MISC metadata.xml 1394 RMD160 db86918f2117d27cefb8de1c4e7bce1e725b6866 SHA1 886ffe82d1f33f694f466e70c145ffc3c101b0b5 SHA256 53777dfc2ba8de0d32cce092343748953bbb61b194d0151e3784695afa76d546
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmpEOIACgkQkKaRLQcq0GLCnACgpyHYadZDSDzPUVZ+FxpXALF5
-siYAoKLgIBzETFXpF/7o/MlnEOOIEokQ
-=zHUJ
+iEYEARECAAYFAkmwJkoACgkQAiZjviIA2XhcugCeK5mgIGxIVf5tc8O2hPNb6IEw
+Zs0AoNE93RaMi39crPKMrmi+Z7iikQCD
+=NAce
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 5435fdc3733d..154d520c509d 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.9 2009/02/10 19:54:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.10 2009/03/05 19:20:34 flameeyes Exp $
+
+EAPI=1
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/ffmpeg/trunk"
 
@@ -13,12 +15,12 @@ HOMEPAGE="http://ffmpeg.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="3dnow aac alsa altivec amr debug dirac doc ieee1394 jpeg2k encode gsm ipv6 mmx mmxext vorbis
-	  test theora threads x264 xvid network zlib sdl X mp3 oss schroedinger
-	  hardcoded-tables bindist v4l v4l2 speex ssse3 vhook"
+IUSE="+3dnow +3dnowext aac alsa altivec amr custom-cflags debug dirac doc
+	  ieee1394 +encode gsm ipv6 +mmx +mmxext vorbis test theora threads
+	  x264 xvid network zlib sdl X mp3 oss schroedinger +hardcoded-tables
+	  bindist v4l v4l2 speex +ssse3 vhook jpeg2k"
 
-RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 )
-	sdl? ( >=media-libs/libsdl-1.2.10 )
+RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
 	alsa? ( media-libs/alsa-lib )
 	encode? (
 		aac? ( media-libs/faac )
@@ -48,9 +50,6 @@ DEPEND="${RDEPEND}
 	v4l2? ( sys-kernel/linux-headers )"
 
 src_compile() {
-	replace-flags -O0 -O2
-	#x86, what a wonderful arch....
-	replace-flags -O1 -O2
 	local myconf="${EXTRA_ECONF}"
 
 	# enabled by default
@@ -64,9 +63,9 @@ src_compile() {
 		myconf="${myconf} --disable-network"
 	fi
 
-	myconf="${myconf} --disable-optimizations"
+	use custom-cflags && myconf="${myconf} --disable-optimizations"
 
-	# disabled by default
+	# enabled by default
 	if use encode
 	then
 		use aac && myconf="${myconf} --enable-libfaac"
@@ -120,6 +119,7 @@ src_compile() {
 	done
 	use mmxext || myconf="${myconf} --disable-mmx2"
 	use 3dnow || myconf="${myconf} --disable-amd3dnow"
+	use 3dnowext || myconf="${myconf} --disable-amd3dnowext"
 	# disable mmx accelerated code if PIC is required
 	# as the provided asm decidedly is not PIC.
 	if gcc-specs-pie ; then
@@ -136,14 +136,10 @@ src_compile() {
 		break
 	done
 
-	# video hooking support. replaced by libavfilter, probably needs to be
-	# dropped at some point.
-	use vhook || myconf="${myconf} --disable-vhook"
-
 	# Mandatory configuration
 	myconf="${myconf} --enable-gpl --enable-postproc \
 			--enable-avfilter --enable-avfilter-lavf \
-			--enable-swscale --disable-stripping"
+			--disable-stripping"
 
 	# cross compile support
 	tc-is-cross-compiler && myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 8de5b9e18914..19aea3f21c35 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -6,6 +6,11 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
+    <flag name="3dnowext">
+      Enable manually-optimised routines using the AMD 3DNow!Ex SIMD
+      instruction set, present in modern AMD CPUs.  (Check for
+      3dnowext in /proc/cpuinfo to know whehter you support it).
+    </flag>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
     <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
     <flag name="gsm">Enables support for the gsm lossy speech compression codec via libgsm.</flag>