add amrenc useflag to have a more finegrained control, bug #473284

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

4 files changed, 17 insertions, 12 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index a2dcfa3b2cca..42286a8af6ef 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.654 2013/06/14 17:15:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.655 2013/06/15 15:49:12 aballier Exp $
+
+  15 Jun 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+  metadata.xml:
+  add amrenc useflag to have a more finegrained control, bug #473284
 
   14 Jun 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   add wavpack useflag
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 52c967e42bc5..9b0270e0a79b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,13 +11,13 @@ EBUILD ffmpeg-0.10.7.ebuild 8938 SHA256 f5e01fac8854398bf96c3200c57556e8888138dc
 EBUILD ffmpeg-1.0.6.ebuild 9541 SHA256 bc6c3ccb7bd57c636c045e3ce628b1f83c26a474e2e86f052457f5c0d261a1a3 SHA512 257cef9216df82c42adcbebcd9b0ee7e5bca132d0e78c83f7ad4220c23a80e7db67d67da902f90027b518ff05821c7a3f24f9077785b4143dce1df3aba96900b WHIRLPOOL fa2a6c6f4ee164d14acfc2f3cedb742e7d58b8c247c0ec7c55176ba8d82d7041bb215cbb3561ba243de651057115d0acb7fb7501254e143965a3337cc805c30b
 EBUILD ffmpeg-1.0.7.ebuild 9560 SHA256 bee5a6617108859f20de2b0bb42b1d01ba956bafe65254c29716c3805daa9a48 SHA512 54e1ef0125621e07f8a1b26d6eb42b5760b9b9e21d84f558e448a18e319afd53315644e97285d62a1ed6043531112d9db813a4ff9f223b394d82782babdb159d WHIRLPOOL 02ea0f8169b77dbfc8dbd63f419b0d8926d49f51ace278c0b2be6c0807fd0117ca464eb8ca6426df9de76db99e2caf263cba5b0a4978bc493f330c9e4549fd06
 EBUILD ffmpeg-1.2.1.ebuild 8921 SHA256 06defa9cf89b0125b2e856e527859f518f6f32a5e3fd61334103eacf0d6afedd SHA512 3e2903acf805b1a7b1364c2f0d2e7e0670781a624ecbbd73a4f629241d089ec7cb376306af180c6af9661c4a0e732210b2e63a5225362ced5fec9bc1575798f3 WHIRLPOOL 8e1e752196151fa33b9d1093e779f85734e1844eb40a35392b7debcdb73bfeb70165613bc15729e0328456c55d8e61d2fffa57656af5e360802e2ca5045a9628
-EBUILD ffmpeg-9999.ebuild 9012 SHA256 7a56a57ff81d33bfe47962843d049b8b72673e9f743de730cfb65858fc945fd9 SHA512 9ab9063079db8870c12a8079a5b00627fe6b3306422fdd1f811a396757da81bf2fe32c04a522ab11f61d79a997d7c29e0e73160a8e275180e383619cc504a9a4 WHIRLPOOL b603d1bb77c09f913aa99228b9e2bab52d5c9a2fd987017a90a916ffe72e759731efd3ac7b20f0dd206f4e93dd850b11db1da7f4bdab74b2dcc5c6153174d314
-MISC ChangeLog 91743 SHA256 bad402200e9be5fc2d1818d15c661b2c112662605dc7b789f25229913b63d080 SHA512 336499f87c09c3411a28294b81397cfaa7e1161b5b4f4fea851371a1fd14fc7406ffbda260de966ca9760b21a1157e10cc80e3856b5716d3cb9c9430025a5b44 WHIRLPOOL c330240f298cb777b2e323eb2d97921cd953bd4ffa0382b94a38365069aca5ad5fd70d728a0bd0ddc384c1e4783024f26edc359ed11ba25ca74047c76469832b
-MISC metadata.xml 3610 SHA256 f063020557dbf61fffd89023e8b4181bdbbd65ff775a12d5eef68d8ab5c8d32f SHA512 d48ae96183cb2412b251b60a2d49f9ad847b62b1a3e822ec1559108ec87974f9a45d464fa12593fdb95e124bc1e7c88d3e710cf41327e4bf725d00f9450e67cf WHIRLPOOL 4082cf7d5382f8f4d25ea60ef1410a6d1ad90ddbad2b622cbba47e1f31e782ef24ef4f05fd064a04b4d63e16544dd7307e85970cfe57483d95c82f0c03d0eb0a
+EBUILD ffmpeg-9999.ebuild 9028 SHA256 2bf2d161c4004035d96cfda58d4b00188911ba3a164bc5a9459db4c5620f2185 SHA512 afce0ab37c663a8b338d103bd38abffcee50e63fab4aff7dfefc7f5ed7f4031948dd60693e4481d9d513a1379032804832dc6307531b069a7a890bbddc711d3a WHIRLPOOL c50e5782f0c3359d9fd7e1ca7a2fc0f3ee3cce086e3061d91485e0ad91f8833d0d19e80679c5f99f6174a4b7035e523071a7c61253286d213382cbce56bfe34b
+MISC ChangeLog 91901 SHA256 70f339aca0b30fc8a63dde3d939f381b2f0419622665337ffe89a0d09f0bbd61 SHA512 bb5995f3817c691b802a05236054bf6b860641cda4981497ed91b98e69acb622590a34753102b8add94edf69f462e29e87f576c2fc3aece3c19fe4940fe09f4c WHIRLPOOL f0f9aa425d3c3582a45e6adbebf8e2481a3b33b9a7654b65d200fa24d24140bc88381b951529a4152b346980149cd02370a0a8eebf7d6658d6cfdf3495466fa3
+MISC metadata.xml 3729 SHA256 03ae8a9384e018a3938893e4e54d12f550a3cfad2bd9efd4b46fa09574086e76 SHA512 ef9d011517cea7a9cbb1b43c8868ac1da4db5ea691754f8e2cb42c98039f6d844bf3c7ebae3990391093a0b56f9e85431216e2d56033e97afb22427247c7b088 WHIRLPOOL 1b6cca8c033e218a5c3e9a4c6cd2fde8395c1829dcbf6d31f393d42a06b76a6237faa5a113d3a08eab1fe0b6275503b2c241e10cdcb20ed4126a10cd5b3b992d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG7T70ACgkQvFcC4BYPU0qLjgCgsrJuYImZ6sFYIhUFGmEFuufB
-ZLcAoJkgrUMPRvsfrYeluI9oiJK+1VjP
-=ryrX
+iEYEAREIAAYFAlG8jPoACgkQvFcC4BYPU0okbgCeJjOxFCPGn8SCaXCXkgSo2G1/
+cRsAoJJHN66b/EhDaj6RF5VJoNje/QBG
+=x6H9
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index a6f6b151f2da..7a0e9880c37d 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.131 2013/06/14 17:15:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.132 2013/06/15 15:49:12 aballier Exp $
 
 EAPI="4"
 
@@ -29,7 +29,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
-	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
+	aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt
 	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
 	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
 	libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic
@@ -61,7 +61,7 @@ RDEPEND="
 	encode? (
 		aac? ( media-libs/vo-aacenc )
 		aacplus? ( media-libs/libaacplus )
-		amr? ( media-libs/vo-amrwbenc )
+		amrenc? ( media-libs/vo-amrwbenc )
 		faac? ( media-libs/faac )
 		fdk? ( media-libs/fdk-aac )
 		mp3? ( >=media-sound/lame-3.98.3 )
@@ -150,13 +150,13 @@ src_configure() {
 	# Encoders
 	if use encode
 	then
-		ffuse="${ffuse} aac:libvo-aacenc amr:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac"
+		ffuse="${ffuse} aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac"
 		for i in aacplus faac theora twolame wavpack x264 xvid; do
 			ffuse="${ffuse} ${i}:lib${i}"
 		done
 
 		# Licensing.
-		if use aac || use amr ; then
+		if use aac || use amrenc ; then
 			myconf="${myconf} --enable-version3"
 		fi
 		if use aacplus || use faac || use fdk ; then
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 664200ffd17f..e97d08f82718 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -13,6 +13,7 @@
     </flag>
     <flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg>.</flag>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
+	<flag name="amrenc">Enables Adaptive Multi-Rate Audio encoding support with <pkg>media-libs/vo-amrwbenc</pkg>.</flag>
     <flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
 	<flag name="bindist">Enforces license compatibility constraints via REQUIRED_USE.</flag>
 	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>