Drop aac use flag, split to faac / faad use flags - ffmpeg has native AAC encoding / decoding which should be used by default; drop unused vhook use flag on live ebuild

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

5 files changed, 32 insertions, 32 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index edb4cfcfe68a..3e077eafd83b 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,14 @@
 # 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.276 2009/03/10 07:30:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.277 2009/03/10 18:47:43 beandog Exp $
+
+*ffmpeg-0.5-r1 (10 Mar 2009)
+
+  10 Mar 2009; Steve Dibb <beandog@gentoo.org> metadata.xml,
+  -ffmpeg-0.5.ebuild, +ffmpeg-0.5-r1.ebuild, ffmpeg-9999.ebuild:
+  Drop aac use flag, split to faac / faad use flags - ffmpeg has native AAC
+  encoding / decoding which should be used by default; drop unused vhook use
+  flag on live ebuild
 
 *ffmpeg-0.5 (10 Mar 2009)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 833e0f7c662f..b36623b0d4bd 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ffmpeg-0.4.9_p20081014-sparc-gcc43.patch 503 RMD160 3b7b0deb5c8ceac2b8ec39c45d761c6f6f9158f3 SHA1 f538896e44e15bb07fd500d0bf0360c96bc6a9da SHA256 4f7675477d51ddce885a7a1bb647a30663e0294db0f6936fa37d162f2d4a94b0
 AUX ffmpeg-shared-gcc4.1.patch 1667 RMD160 cf0318bcb812ad701e8cd55f10f59ca71933cf6c SHA1 0fd4d860efd8a0240fa66443429d8404d28a27dd SHA256 0bd67ed0cc1ea47c36756f5a66e504af4de85ce072c4b92083fb44065b5a3671
 DIST ffmpeg-0.4.9-p20081014.tar.bz2 2676641 RMD160 6b7e556292425dabcf1f6e94c01d493a3d353835 SHA1 016fdd2798ce442dddfe4551e04a2324b0587428 SHA256 a039ac78b31e24b1a1a06daa927bdf24fc3cc7b73adbb7a5d936a0c828b84018
@@ -13,14 +10,7 @@ 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-0.5.ebuild 6131 RMD160 c5da58be5a29450ee89a7aeb1da0f1d7dd444538 SHA1 5c0ff5c9908eb7e08b9f6f9bca2f9e6140470fa1 SHA256 7645dc64949100e40078ae714c2298fecd5a931c50e06b124158b73304a39c28
-EBUILD ffmpeg-9999.ebuild 6038 RMD160 3ccf14e61b88e68e890aa7694ee7a7564c546643 SHA1 56a6c1888b20d9846b761f92fc63fb1116e75f0b SHA256 d31ffdb75d0c35f74e5049fd917fc60a6801b45a37ee658b8e23678732d896ab
-MISC ChangeLog 41797 RMD160 a81922afec9311f001e0d9f1bfaf0e22a916d88b SHA1 6419b439b66524385230caf7326a0c80bc0ab956 SHA256 1c1866d90c16bf4f33c7458ec5b051256c9a7368048c7dbbea3e4d5dd0058cac
-MISC metadata.xml 1394 RMD160 db86918f2117d27cefb8de1c4e7bce1e725b6866 SHA1 886ffe82d1f33f694f466e70c145ffc3c101b0b5 SHA256 53777dfc2ba8de0d32cce092343748953bbb61b194d0151e3784695afa76d546
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm2FwoACgkQvFcC4BYPU0oB1gCgyUNJ33k2PdQgQHi+1U7LbdrC
-vrAAoMwebDOhS8rzafO8wJhOF7jjzGVd
-=HY7e
------END PGP SIGNATURE-----
+EBUILD ffmpeg-0.5-r1.ebuild 6145 RMD160 3afc81efd617c7cb130aba59ff81d392b88590c9 SHA1 aee16d3033db733bd306047d280e8327178db076 SHA256 5053c95a9ecc087aae7631ef1f00ecd5c40e2c870fc6c633be574e5171f0cb80
+EBUILD ffmpeg-9999.ebuild 6042 RMD160 249a21b68de9f5b7710982ce59c0dcbcd74f7def SHA1 0b62f8bad5a6e46e9c7dbe5ee56544252cb610f2 SHA256 3fa0e16d46ef42ae9a7853207dbf7e665c911ba7129d56a8014a5da4f2a43c91
+MISC ChangeLog 42128 RMD160 de9075bad615bb25406d22499255fc7fe13e9aef SHA1 399e470d5f998cc9109ef2f7687637ec8569d6f6 SHA256 d5a85dd56437387b6d4a268feb6db5e90c67541ade9b96620da209ace8541f24
+MISC metadata.xml 1614 RMD160 5f0065e48397a73cb871bbf78381dad7b0fbd98c SHA1 dc90e3a12e4a107d190a91a1c802de8a2a5b4fda SHA256 8a35c0545fa4663cac93f7c9b93b2a68466197671722ea8c5d35925ed06099ac
diff --git a/media-video/ffmpeg/ffmpeg-0.5.ebuild b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
index 1edb179becdd..fa5f16e59216 100644
--- a/media-video/ffmpeg/ffmpeg-0.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-0.5.ebuild,v 1.1 2009/03/10 07:30:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.1 2009/03/10 18:47:43 beandog Exp $
 
 EAPI=1
 
@@ -14,22 +14,22 @@ SRC_URI="http://ffmpeg.org/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-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
+IUSE="+3dnow +3dnowext alsa altivec amr custom-cflags debug dirac doc ieee1394
+	  +encode -faac -faad 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 )
 	alsa? ( media-libs/alsa-lib )
 	encode? (
-		aac? ( media-libs/faac )
+		faac? ( media-libs/faac )
 		mp3? ( media-sound/lame )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		theora? ( media-libs/libtheora media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20081006 )
 		xvid? ( >=media-libs/xvid-1.1.0 ) )
-	aac? ( >=media-libs/faad2-2.6.1 )
+	faad? ( >=media-libs/faad2-2.6.1 )
 	zlib? ( sys-libs/zlib )
 	ieee1394? ( media-libs/libdc1394
 				sys-libs/libraw1394 )
@@ -68,7 +68,7 @@ src_compile() {
 	# enabled by default
 	if use encode
 	then
-		use aac && myconf="${myconf} --enable-libfaac"
+		use faac && myconf="${myconf} --enable-libfaac"
 		use mp3 && myconf="${myconf} --enable-libmp3lame"
 		use vorbis && myconf="${myconf} --enable-libvorbis"
 		use theora && myconf="${myconf} --enable-libtheora"
@@ -94,7 +94,7 @@ src_compile() {
 	use threads && myconf="${myconf} --enable-pthreads"
 
 	# Decoders
-	use aac && myconf="${myconf} --enable-libfaad"
+	use faad && myconf="${myconf} --enable-libfaad"
 	use dirac && myconf="${myconf} --enable-libdirac"
 	use schroedinger && myconf="${myconf} --enable-libschroedinger"
 	use speex && myconf="${myconf} --enable-libspeex"
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 154d520c509d..c88c6c7f6179 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.10 2009/03/05 19:20:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.11 2009/03/10 18:47:43 beandog Exp $
 
 EAPI=1
 
@@ -15,21 +15,21 @@ HOMEPAGE="http://ffmpeg.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-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"
+IUSE="+3dnow +3dnowext alsa altivec amr custom-cflags debug dirac doc
+	  ieee1394 +encode -faac -faad gsm ipv6 +mmx +mmxext vorbis test theora
+	  threads x264 xvid network zlib sdl X mp3 oss schroedinger
+	  +hardcoded-tables bindist v4l v4l2 speex +ssse3 jpeg2k"
 
 RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
 	alsa? ( media-libs/alsa-lib )
 	encode? (
-		aac? ( media-libs/faac )
+		faac? ( media-libs/faac )
 		mp3? ( media-sound/lame )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		theora? ( media-libs/libtheora media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20081006 )
 		xvid? ( >=media-libs/xvid-1.1.0 ) )
-	aac? ( >=media-libs/faad2-2.6.1 )
+	faad? ( >=media-libs/faad2-2.6.1 )
 	zlib? ( sys-libs/zlib )
 	ieee1394? ( media-libs/libdc1394
 				sys-libs/libraw1394 )
@@ -68,7 +68,7 @@ src_compile() {
 	# enabled by default
 	if use encode
 	then
-		use aac && myconf="${myconf} --enable-libfaac"
+		use faac && myconf="${myconf} --enable-libfaac"
 		use mp3 && myconf="${myconf} --enable-libmp3lame"
 		use vorbis && myconf="${myconf} --enable-libvorbis"
 		use theora && myconf="${myconf} --enable-libtheora"
@@ -94,7 +94,7 @@ src_compile() {
 	use threads && myconf="${myconf} --enable-pthreads"
 
 	# Decoders
-	use aac && myconf="${myconf} --enable-libfaad"
+	use faad && myconf="${myconf} --enable-libfaad"
 	use dirac && myconf="${myconf} --enable-libdirac"
 	use schroedinger && myconf="${myconf} --enable-libschroedinger"
 	use speex && myconf="${myconf} --enable-libspeex"
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 19aea3f21c35..153e3f9f2754 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -13,6 +13,8 @@
     </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="faac">Use external faac library for AAC encoding (instead of internal libavcodec support)</flag>
+	<flag name="faad">Use external faad library for AAC decoding (instead of internal libavcodec support)</flag>
     <flag name="gsm">Enables support for the gsm lossy speech compression codec via libgsm.</flag>
     <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
     <flag name="mmxext">Enables mmx2 support</flag>