there is now a libfdk-aac decoder, move it to the decoder section

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 15 insertions, 11 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 7557c31dfbdc..e7e5aec65c43 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.681 2013/10/11 05:27:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.682 2013/10/11 05:31:14 aballier Exp $
+
+  11 Oct 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+  there is now a libfdk-aac decoder, move it to the decoder section
 
   11 Oct 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   bump yasm dep
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 69aab04946de..782bc43701bb 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -19,13 +19,13 @@ EBUILD ffmpeg-1.2.3.ebuild 8937 SHA256 9a9ab52f234b090c40d1e01b687ffde62b5077122
 EBUILD ffmpeg-1.2.4.ebuild 8937 SHA256 efa002a312d16aba8c7e4a6dc741732d1a1527479bb7662d8af19aaf2ef686a6 SHA512 cd6a5e3b121e514ac30187cc857ff49bce3f54a3dde938db018caa02b2edd611a6b8ede33cf544d6aba316d2b0c7a28e6d7ca80575f7eb704b26a58b15a4745e WHIRLPOOL 29af19dd1e7fef72c8aa4ce0413e27755308f2016fd2d9be63772ea67c311614d625dcae83c53dcaebd0b9edc0ca8fdc834e110f66b9d9defaf2d1bcc0151c2b
 EBUILD ffmpeg-2.0.1.ebuild 9756 SHA256 6390b6667805cc95a59ca466a8c6ab579521d218ffd99c6d982f27b378fd646d SHA512 28dc229f2ae2e2dd383123b619505cc27bda1855254b2079572724841bed53e7bbf77c1cc859ccb235406992027bea1bc0a1198a1568ce4595296ca866fe9c8d WHIRLPOOL d3b830a192ea455753889125b966fb7fdc65fb03d691d43244719ead9959856cf5217f40abc004b0c0478acd8624abceec2c02998bcf56840b8d7d04482f3c26
 EBUILD ffmpeg-2.0.2.ebuild 9756 SHA256 7ecf4827ef9c1850d96a33fde8fcb8b21e3ca06a5d1666b6397ae7148ca45d89 SHA512 0ebb2469aed4b2f812c071803b2e7a5814b3f7ca4b010ace5b17a628a6f461f128bc14aff736598593e01a7d89858510085ed04c8b789b6e539d5a3599a27957 WHIRLPOOL fcac3c655c9e4bda1af631ac62e29f7cae5b203eb9caae984e327be079388cc0635ad4910c700343f1cc0721fecfab93596766643dfb8b747964624cb1fcf063
-EBUILD ffmpeg-9999.ebuild 9763 SHA256 26cd2802285f69898ba32ced821bc2f170a4722f57a8966393534bbf3711ec3d SHA512 188383cb69d8b7f3341e051d48c988cec49e4b6c7eb2601f4b68cef92ecda660941d87503d7d9a6374e43aac0f5ed8f90cb38df9d1e15e380164c8d55646938a WHIRLPOOL c204d4a926c3822997516ef390f58f931d1abd1603d1c634032cd951e0eb0b97aa962d0970731f537af945794061c0626ab9c1851a6f8670ba1ea01107352175
-MISC ChangeLog 95202 SHA256 f169e40c1007f52d02abe51f88284e2d3837099c9aacfcbeb82820d9652c9baf SHA512 ef8af1c56d07f407622cbb3ca77ed0c9bb25976ebd3bd61ac4ae60345e46cf6da807438eeaf07bbce607696d8d13accac0973aa679714082273fc13e38857bd8 WHIRLPOOL 0a29b74a2e77ccdf9719f4b7b4f156c9e76db51a9347ef6fb948e13f22b916b666d812e9dd8b3eaeaaad38f4372b741d1b450b91046ac2c7b8ac18654c7314e4
+EBUILD ffmpeg-9999.ebuild 9799 SHA256 b60a70f014f1dff74f09f708fe4717107fa24a4870082c5b25228d6e2001398d SHA512 65ee1f43be3442e7a4925a8cf1f56f72d959ae1c6861f48ac4c66486f49983f5c70f75e036d5b7f53f06a5af9dc5ea44a42fa50a7c1b3cfadb33767f04207651 WHIRLPOOL d765b087c85899a3682088cf9348339ddb65b4f1859f9b53a66e0acb0644f8f5f581b33eb50f34ac64bf48708331e844aad0c9344c9f6541d2a87c90d6c25131
+MISC ChangeLog 95343 SHA256 4712b740b87fd0cd0ef625596ab4d0b254fa083a6af798c7da9aa80d12033780 SHA512 23c83ac5cdc34633e1ac76e4e39796cf761ae1c24bb293e2b3cd88d66919cb9737716ef3f71fa1e1fbdb2b5440a9459a776ab19b6a583dd3eae7261a270c730f WHIRLPOOL f4adc305950b4097f595207bc405ed3228dcda4f1c6fac9a0f362da349249dd0eff34adb5d314d6b3a35bc8fc96f324e481bd154e30a80917ebfce6291b2fc90
 MISC metadata.xml 3860 SHA256 0480b2ab42cca74fa5abe6d7f40ccf82c81d19eef97b88878ec07afc83ad6fa8 SHA512 3a1f45a406c90cd54354f5d78d9e51883dc530f904b56c822ae843e87632a6d64e11aa23c874bd47ba40673addc579d9b76cf573434717ab1f0fb4d8ff4e310c WHIRLPOOL f62cf68b99f10188af3f5b7cca0a6daf614cfe048ebd8c4f802a47105a3f839d680487ae1be2144d10dcf5c475502ad3d4092d6fd4c491a924cfadada1f62ffe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJXjFYACgkQvFcC4BYPU0pwogCgr2bCcNvPlVE2caKV/2+co7GY
-t3AAni+2uHVIut6TenULNph3ne6D5uHU
-=crSM
+iEYEAREIAAYFAlJXjSMACgkQvFcC4BYPU0qJxwCeMyLPSxeqlEZW5W0oVEq1NIfZ
+YQIAn0gKF5VRLTN1vjA2vb+CK818tWOx
+=jf+/
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 2e1aef3074e4..adb30f8db22a 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.137 2013/10/11 05:27:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.138 2013/10/11 05:31:14 aballier Exp $
 
 EAPI="5"
 
@@ -75,7 +75,6 @@ RDEPEND="
 		aacplus? ( media-libs/libaacplus )
 		amrenc? ( 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 )
@@ -83,6 +82,7 @@ RDEPEND="
 		x264? ( >=media-libs/x264-0.0.20111017:= )
 		xvid? ( >=media-libs/xvid-1.1.0 )
 	)
+	fdk? ( media-libs/fdk-aac )
 	flite? ( app-accessibility/flite )
 	fontconfig? ( media-libs/fontconfig )
 	frei0r? ( media-plugins/frei0r-plugins )
@@ -165,7 +165,7 @@ src_configure() {
 	# Encoders
 	if use encode
 	then
-		ffuse="${ffuse} aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac"
+		ffuse="${ffuse} aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame"
 		for i in aacplus faac theora twolame wavpack x264 xvid; do
 			ffuse="${ffuse} ${i}:lib${i}"
 		done
@@ -174,7 +174,7 @@ src_configure() {
 		if use aac || use amrenc ; then
 			myconf="${myconf} --enable-version3"
 		fi
-		if use aacplus || use faac || use fdk ; then
+		if use aacplus || use faac ; then
 			myconf="${myconf} --enable-nonfree"
 		fi
 	else
@@ -206,11 +206,12 @@ src_configure() {
 	ffuse="${ffuse} threads:pthreads"
 
 	# Decoders
-	ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb	jpeg2k:libopenjpeg"
+	ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg"
 	use amr && myconf="${myconf} --enable-version3"
 	for i in bluray celt gme gsm modplug opus quvi rtmp schroedinger speex vorbis vpx; do
 		ffuse="${ffuse} ${i}:lib${i}"
 	done
+	use fdk && myconf="${myconf} --enable-nonfree"
 
 	for i in ${ffuse} ; do
 		myconf="${myconf} $(use_enable ${i%:*} ${i#*:})"