add fdk useflag

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

4 files changed, 17 insertions, 10 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index f8bba5c7f50d..781d3da71ac9 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.583 2012/09/29 15:17:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.584 2012/09/29 15:34:17 aballier Exp $
+
+  29 Sep 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+  metadata.xml:
+  add fdk useflag
 
   29 Sep 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   tests now work without zlib
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 6a6f7f4950a2..6371ae82caa1 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -16,13 +16,13 @@ EBUILD ffmpeg-0.10.5.ebuild 8643 SHA256 9cd95876fbefdbd3320b8667b0fc3e84f237916e
 EBUILD ffmpeg-0.11.1.ebuild 8781 SHA256 ac676957c3fa78197326e28cc49db75f626e10d73c218e58ec6daf125d5c1ec9 SHA512 79bcfc09186272f41ea531791c68390e7a65fb284848bc570162d9e92ac4b99d3eb1c391e2d1004f2450b86242b68261fabed99a6ff56734059479d864674030 WHIRLPOOL f0671834fdc160627a40de6d36075fd52744b8c8cbfdda68d2edd5b6e1584c9b424fb577d8614145b3809de4ec5399e5f92be0e1144968dc9be1dd3fde69f6dd
 EBUILD ffmpeg-0.11.2.ebuild 8781 SHA256 1b3d27693e38c9ac39fd75c58625c969c157e5d1ce4962d86102cd8c14dc331f SHA512 a04bfcd20231537bed1d977fc924b7fefc5a71691f62327224c57e3b659193fe86742572a488ce9399a151229b7a907fac06b0cd87fad2a7d69baca9fc0b880a WHIRLPOOL 72879505edec487f42f42504fdca88148869e6c7e588c13c2c881e2356ae9055be32f33711fe11d6b3ed6c10ca4587de8f2e5004e15de8c8c69d575228a99a39
 EBUILD ffmpeg-1.0.ebuild 9119 SHA256 cc84fe515caa6de1d8d8b689ec35243a8e77716297b99d982ffe5e9547cbf0a5 SHA512 df03339d70a7ecc123545a8933f16645fb8660dad27ac3d820516971c60fc040914d1c4dbd3b6167051938e8de4893775e0032d552f448af055d07eed63a85d7 WHIRLPOOL ce976a0617874ced0668e84d61a2d7278a10a97a8d43aeab4b154424cd0403290903801ad3823a013099de63c9eea9e3f45372c5f60149ffe585ad9736f99ea3
-EBUILD ffmpeg-9999.ebuild 9117 SHA256 a9a6c0cdd6127891e2010691910669456ce5eb1470b4220ab439918e003d8131 SHA512 48ec95ec25e81bedc02626a7409c050e5d49858d1c46b6b7673d3ecd4c67829e5c0f3b7446d6160f2e2d9b8d94eaaaac17d5f3ab469e32ff84a097acc5a179e1 WHIRLPOOL 8f6fc17c236f1c8adbd84cec942100b723fb68a7f9e1b6c0343d7ce97333d69b58e210ed91ebeeee2c7a037ea231d9f8f33d7749ab549713a5d757ef04736775
-MISC ChangeLog 82523 SHA256 e5f23eb2ec8c9e49305313b03d8ab3f1da4febe2069706443960b00ad146953f SHA512 ca540913957bb83fac30ff87b91cc4069e4719228df8dea8a7448b189f5ca3b00539634ea94f963eaaaaeb85a7e0ab5618e30bbdfad4ab170934900b209853ce WHIRLPOOL e95becc8fafe0116e0f3ac7e579c08759e5f1276eab9888d5264002f9d5b26d11896bf3b243d593a28bd7f824d08f4fb7ccdb3d83647e8d171e7419089e91a2b
-MISC metadata.xml 3620 SHA256 9bb269f2a159087f59fa468dc963974d162a76b9886d3f0846bc1ed840c3a72b SHA512 f50ed1d593174df65ce6fefb9ad859c914f60a2c6bdbc88dacbb436938747b2c8da35ee7eae32e92a551963a552635cef9a74dbaf12de9d2a0946d9efd6ebfee WHIRLPOOL 9f8e2f50b9e4665bc66a1b694a0e7ad913df6eb26e639f84743d7d5605f751cdf18943848c5866b1535f7539da457ae053441fc07fd71cb7ec64833d319dde3a
+EBUILD ffmpeg-9999.ebuild 9220 SHA256 3c5d5b54b78879d6c4de8dac4e90af6061ea8e9a2ef9cb128417b54dffd757ac SHA512 34ca4d793c75e9c79905457fcaecea117d6bbe116a797a39fe65766cb339dd7e3fbf5d32006e8f9913318b272206d98c125e18990da666f631436aac9ad14516 WHIRLPOOL b644ba0d0cf47e3c4687f84600429ffd61877c885badf96e4f5760e7df15a9a4cd5eb981cc04a461f85153525660735a12919957656ab744a1f9bf5785747a36
+MISC ChangeLog 82630 SHA256 f2802f13c6f07170436f49f95b75ff7e72de3f61ade92021deabc878694c2f96 SHA512 60f0dcea82c3460d7b5f1685986f07810131a4a8c2308999d56ff1f7597a91fee18a5204d25e8fcd6f3715294679289882cd7914b7ee9ff71628f09b873f2ea5 WHIRLPOOL f64d0bd8b0a770a5448cc946b48aaa19f1871aa3267415765f0c3806df4a2aff1223574a2c9b6a216ec6027c8c592bf20048d55cd44c25080502a9a8ae0acccc
+MISC metadata.xml 3691 SHA256 d8f103ff120e9fbd1db48d048a4f3d5afad2a91647272e80af799b21ef8a0544 SHA512 4d7d3e2ada412a6dc15249b1a61a8ade25bf633748d1a21280946814f2f4206429d7b84959d592e3ac6645801750bcfcaf127aedddb9025c9d2cfee5af1a3a55 WHIRLPOOL 7efc7fee337bcda0bf6a2547519f19ea0a95f470edd3106acac3e28fcdfe445b0a9f7281e14d8ff2a53f0dd322ad63821fe3aba08c8b17d36b51803f9a25c329
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBnERAACgkQvFcC4BYPU0ofDACgo9wCPRO+rRIehdDL6jzACTnh
-tk8An1VW4159slqf96r/bdVYeRn9W/D4
-=4slX
+iEYEAREIAAYFAlBnFP8ACgkQvFcC4BYPU0pJYgCgsf87z/OyvUVM2dVb7oNcCTyk
+U5QAn0AevXEWUa3w/EqCQ9Zkw7DwlP5B
+=ZfSm
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index f6372998dc5c..9559f9f1f577 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.106 2012/09/29 15:17:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.107 2012/09/29 15:34:17 aballier Exp $
 
 EAPI="4"
 
@@ -30,8 +30,8 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 fi
 IUSE="
 	aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt
-	cpudetection debug doc +encode faac flite fontconfig frei0r gnutls gsm
-	+hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca libv4l
+	cpudetection debug doc +encode faac fdk flite fontconfig frei0r gnutls
+	gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca libv4l
 	modplug mp3	network openal openssl opus oss pic pulseaudio rtmp schroedinger
 	sdl speex static-libs test theora threads truetype twolame v4l vaapi vdpau
 	vorbis vpx X x264 xvid +zlib
@@ -63,6 +63,7 @@ RDEPEND="
 		aacplus? ( media-libs/libaacplus )
 		amr? ( media-libs/vo-amrwbenc )
 		faac? ( media-libs/faac )
+		fdk? ( media-libs/fdk-aac )
 		mp3? ( >=media-sound/lame-3.98.3 )
 		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
 		twolame? ( media-sound/twolame )
@@ -157,6 +158,7 @@ src_configure() {
 		done
 		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
 		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+		use fdk && myconf="${myconf} --enable-libfdk-aac --enable-nonfree"
 	else
 		myconf="${myconf} --disable-encoders"
 	fi
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 61be2c61a3fd..a3f868e20b25 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -21,6 +21,7 @@
     <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</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</flag>
+	<flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
 	<flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag>
 	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
     <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>