Add support for fdk-aac encoder

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

4 files changed, 18 insertions, 11 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 2d5fd97f2ba2..77c002807c00 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.101 2012/08/23 08:44:54 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.102 2012/09/13 19:25:33 lu_zero Exp $
+
+  13 Sep 2012; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild,
+  metadata.xml:
+  Add support for fdk-aac encoder
 
   23 Aug 2012; Michael Weber <xmw@gentoo.org> libav-0.8.3.ebuild:
   ppc stable (bug 422537).
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 85a885b55c67..a8052ad3e58f 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -8,13 +8,13 @@ EBUILD libav-0.8.2-r2.ebuild 8983 SHA256 f9f492b6de3efd5097ce64828a91fe771a5264d
 EBUILD libav-0.8.2.ebuild 8984 SHA256 88bd7e5abcf25fa6c6e3269f764d27aa64fba8c5c8291ee03583b2656e8206c5 SHA512 8851efe1c597286fe00ae824594f2c7f2597801a7933b5f570c5f6a9b7cd1534d168983abcc1879d0e5ab9684220e2e9ad51da2acf5d57f0447bbb3e738bf08d WHIRLPOOL 3dafcdb2ca3ebf017c0e420776ea307ad0ca43598d8c8fcb75bedd4c9bb4524c18296830b156820e91efe2dd153a420d07e3fba8f13940989fbb9e7fda47919a
 EBUILD libav-0.8.3.ebuild 8968 SHA256 86a81dd254e2a05563a35a73abc50700dc3724c81bd80980aad83b85184118de SHA512 401370fd082a67e8b252e6eb52cf36ffd65e56b85f01ca30c35c55f0541fc7b984f80695c98888e57c727999ab8932dbbfaeb73dd22713f2de5e34432d8bf6f3 WHIRLPOOL 65f78243694fdf3e445cf84291667a551a010060cf0dfda0ce9697832e92b241385b3a53e0704e445e681bc12d9f06be59bb6ac76d9892e76cf687d0d0f74db1
 EBUILD libav-0.8.9999.ebuild 8984 SHA256 3eb7ace30ce59a697addde65ea3b5fdc914db9601404713205eb5efb447c1bcb SHA512 312999cff140cceceafe7412db26c177d323a561332d64679023f85bbd3cf58428427aa8242cc2c42fdab839dfc4f3a3bbbb161f43610a3bcea29840273c88bb WHIRLPOOL 13506f0e59b31374b8ad6a0c96b745c346abc6dbcdcfeb51518a00cd9f72a58cfd2ab47f91303a4e81b4d8fb6854113fca6a87898d3537865123c395ec28f5b1
-EBUILD libav-9999.ebuild 8905 SHA256 e1b1bcdcfa162b73528af3b320084160c8227dff387bed09bf8196ce44023da1 SHA512 733e95c50846b15cbc929abcc41e6646f881c3781c0c9d3c9451ae6a5c01099e183614c78bb506fd317040cea95fbca9acfed262a2cb3dee412ad84fb7ff86b4 WHIRLPOOL f5dcb355ee24381e2476ad2f7b3b705ca81fb1111e1d96cb76165a44d659c266f56c3daa6947e4a2d723d58e66e0a753e0d546a1fca0c8115b3390307024d7c6
-MISC ChangeLog 15645 SHA256 52d60738ca82cb54a1be631c1c1a4c489cc35fbe485f1814cde211873301151f SHA512 7482298c1010d46fcfb7fe470a43299413ff0a089382d2674aa62a289fbe988552e1da6ac3e714e6496bf1a4f817a7465d3ec5170539401b8388bb1787b7356f WHIRLPOOL f2a81cb2bb210ed32601a65905f65f8669cd579c0093eb125a3fa0d6a074386f936e092fbf07072e42eec04a024b9bfae71ef58787a22e4a7ebccb7526ea8ec7
-MISC metadata.xml 2956 SHA256 c7b04d7524f77f7116e95a33c7cb58e898defc88458d62b44d8975af61974675 SHA512 a903e80c38366813476870f5616d3b244e6de211faadedf20998b27c8dd8cb7856ec536349b662345eba169935a5e01771fa7cd429fc9afb8ce62ef58148e6d2 WHIRLPOOL 82d6945b963d4f28af3247101fee01f93130d50f143058e48b41b352d81a8c731827df33f64228b12aaa681f3be45e9b541f633ef3fb7d0b7c2b8d645f625f2c
+EBUILD libav-9999.ebuild 9005 SHA256 5603848d034405afd5c75d598c115287a5b73aeedb012536f1c9b4320124f805 SHA512 1fdc37c828a559af7ebdda8b3b0befbcbb245cff4a2716abf6607d5334215f24f0c7b25f339e3afdd71a95bd36d58717d2a63b6075587fcae9a1ff5d1497672f WHIRLPOOL 28b71bcabd84efdcbf50d2eecffeebf37b412e5e0f0277d3c88859528d3b8f6dbc5887491e3fb5ee492ec1a5043448dacfd19794da6f1780b64ab47d0f1ab8cc
+MISC ChangeLog 15768 SHA256 4cce8c8b69261384e2c92e0d800f24e320d2e5d72cfe601c6159d399152129f2 SHA512 0deefb24d421ef1da84b574e4e688c948ec57da6e91336fbe35c0dcc34a233f51d9fd9f7c79d26ae3f8383f6e1b9a890d066f9439e75ad20bbe93c94e79c80f7 WHIRLPOOL 970cbd2c7c2c6f861e4ed260d8450b35ce816f722e993aea7a6a059f0f4df11d60e495d16f78d85e59a5f27e7d40cf789ffc6a71e304e472351334cb72e4f3cd
+MISC metadata.xml 3027 SHA256 e4234b285e3f5bbd8b5a0a801b70829bd8c8d82fc7db1cc187ad5415355afe56 SHA512 dbf7570120dbc29401019eab2267f1f1f7c04d3463927b4dc0753c8db6dcbed151cb0317878d57c9e678f459bc5ca41eb82f0a2b447125f22f95c6facd3e0a71 WHIRLPOOL 4539248eff9a0ccd894ccc88c923aacd0fd9603ece0ed47172a9fbb7cd2a190a44437c0c050a62d7d3dfef3e0ff21f318330938b9fa9ca1e931c1e6b2a10216d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAlA17YoACgkQknrdDGLu8JDJkAD/d7lLFYlzfddyUgJRDlwv2ZcA
-XlSaeeZ8arcfZKsmZNUA/1T7F2yhAX4kT8wkq4J8b1QXOpNXMTqiv4apymSKjCjQ
-=qXs0
+iF4EAREIAAYFAlBSM0EACgkQcXOrnRGRc46nBQEAtuSED2K22VS1fGAtdsIX5e8B
+5GcEBzIoyE7SobJUqkkA/3I2YHWagviph9FAHKLal3SZmgRK+kGKt/7bfLXncyTo
+=nP70
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index e1f96fb34fff..1f5be0b7eccb 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-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/libav/libav-9999.ebuild,v 1.51 2012/08/07 18:22:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.52 2012/09/13 19:25:33 lu_zero Exp $
 
 EAPI=4
 
@@ -28,7 +28,7 @@ SLOT="0"
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-	+encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+	+encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
 	network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
 	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
 	x264 xvid +zlib"
@@ -52,6 +52,7 @@ RDEPEND="
 		aac? ( media-libs/vo-aacenc )
 		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]
@@ -108,7 +109,7 @@ DEPEND="${RDEPEND}
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl )
+REQUIRED_USE="bindist? ( !faac !openssl !fdk )
 	rtmp? ( network )
 	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )
 	test? ( encode zlib )
@@ -159,6 +160,7 @@ src_configure() {
 	# Encoders
 	if use encode; then
 		use faac && myconf+=" --enable-nonfree"
+		use fdk && myconf+=" --enable-nonfree --enable-libfdk-aac"
 		use mp3 && myconf+=" --enable-libmp3lame"
 		use amr && myconf+=" --enable-libvo-amrwbenc"
 		use aac && myconf+=" --enable-libvo-aacenc"
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index a5f9f996bf68..3d89fb660f4e 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -18,6 +18,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="frei0r">Enable frei0r wrapping in libavfilter</flag>
 	<flag name="gpl">Build all GPL licensed code. Without this flag set the package is build under LGPL license.</flag>
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>