Always enable libavresample: strictly speaking enabling or disabling it changes the ABI of the package, and since some consumers started to use it seems safer to hard-enable it considering its small size

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

7 files changed, 30 insertions, 27 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index da650f385682..babbe674b4d8 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.633 2013/04/03 17:49:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.634 2013/04/04 07:34:43 aballier Exp $
+
+  04 Apr 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-1.0.6.ebuild,
+  ffmpeg-1.1.4.ebuild, ffmpeg-1.2.ebuild, ffmpeg-9999.ebuild, metadata.xml:
+  Always enable libavresample: strictly speaking enabling or disabling it
+  changes the ABI of the package, and since some consumers started to use it
+  seems safer to hard-enable it considering its small size
 
   03 Apr 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-1.0.6.ebuild,
   ffmpeg-1.1.4.ebuild, ffmpeg-1.2.ebuild, ffmpeg-9999.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 6832bef3d0a4..84fe9a7d32bc 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -8,16 +8,16 @@ DIST ffmpeg-1.0.6.tar.bz2 6450599 SHA256 650db1d500a52ebb67fe30ffc83dd475d5e70b4
 DIST ffmpeg-1.1.4.tar.bz2 5819942 SHA256 252c00bd781f08a3542795b8f111b131f4afe93f1c486a4884306d27823aef6d SHA512 ad4ae8703fa0dfd6ec7ac7b45b0d2d3c4df544b56565932fed4f9b620c650f1762572b587a0c47eb1bb66c96a7e8c1374ac4ae0f6dfaf355ea8701c408e2c105 WHIRLPOOL a3ef9c60051f072f55ed919c3de0d25f8881331b89595d32d6eb46993dbcfb6bf9d273a1ea07f3b15dc9671e0117f47b29db7c74ca98a02c121729332e8ad18b
 DIST ffmpeg-1.2.tar.bz2 5969590 SHA256 9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf SHA512 e46cd47cd6cba2820165ac2464fda6d9442675339eea8cdc6b023bfa174f1b2b3e2e6fae85cff03671ed385c49b508c3bae966160418ddb0b1afdd3fee7780ae WHIRLPOOL 0001248edaf74cac27079620dd3dbf05a494039be7f6e6e411959d7a69f27be9ddcecdf030e5835f225409031ffe174470474f7fb6b52aa046481356ae055e24
 EBUILD ffmpeg-0.10.6.ebuild 8936 SHA256 4d92f9aafbf1a67467dd7af29254ece197512a988d8e3671cba4e5890c2157ce SHA512 be31d275c5a98f20ceb4cc69472717e8fffeef24093f2df5fdd01b22f57bb48bd27acc6808c8c7a8267c148476455c4b8ab5bd55d566c7845cb2685abc87ddc8 WHIRLPOOL b5f0a2a9660874f41f16151a065facd6cfb0589a22b880ad1676890e2d31fda310919454a67744950076321ca1c777a85528b0870251ff594d3c7355a0ac1a2c
-EBUILD ffmpeg-1.0.6.ebuild 9634 SHA256 24b2f6180a6e121ae940b854ceced2a0f7842243506ac77ed41aca2fe7770214 SHA512 5efc716996d113a9046df0c3b805428295cad80cf6b97ee510d17a82a8d458c509b0b58a9c5e3dda6b675f81952c49551ed9805e09be9d64ce75fb391f3c2333 WHIRLPOOL 16e8af5875849142130733746a89e1185356456a73688aeb2c6ce4880b17173e36a3cfecba6eb304ffb4c4f0662415c6ccb975ae652af348c6abcb83d671029d
-EBUILD ffmpeg-1.1.4.ebuild 9602 SHA256 12f4d59f0720eae8d62c1037c612e5c37f5076d14a978de5462345489926f380 SHA512 17bfce6fd2416e207c31a477076e532f737aa7cf74076633f9d384fe76a04b86bf6e0efc79255ab52da527e78546192793464ec044e1fe788820f38c0c60b90a WHIRLPOOL b40e3fcc1f7f59cc763d7950e21b1cf7a4a82c921320adf392812d16c9da854cd5ab1da0d3d50ca9caf768806a59ac604051bfe9e148b2c086e9104de6009a72
-EBUILD ffmpeg-1.2.ebuild 8923 SHA256 f0803e091f6247c6c592bf35e8f6632c84c4f4faa4587319607a1b1ddfc3b8af SHA512 c80e371738f677199102f8a7eec70d650ed8e13ca43f028334f444dabce352e93badf59a48fd6349d5f1d8c45a0a29df4fa0d172056862187179d129d50bacd0 WHIRLPOOL 91a32d3726a78f88fb788ef6e237b0649de15ce5002a2dc179db98e6133cda07cec8e3ab10c79a4acf5546077549dc8d3296333f2089d431f3a02ef7ec96f171
-EBUILD ffmpeg-9999.ebuild 8926 SHA256 857dd8afa4567990a9f4d526fe159d03a1a8f98dd29415f826c6c95eb14451c7 SHA512 e6eb3d9f7e5e81bcd9cfa8b18958ab716b2a55b35b4d55ee37e65ddf29fd2d9caf813c5c08ae0a3089a92f8c7a1a502cfe757568144a4879285d0ee850d34e81 WHIRLPOOL 4712bc4c06bc7a35469ee1bc366ac7e33b60761b69cb9822776b33846a3b44f2d9e23d07daf5fc5d4741068ded3b2f5594aff6b5d644e4b6d23a57fa71c2e182
-MISC ChangeLog 89067 SHA256 3dfc1f7adc2cff96baf54e9f3cc5c707158c22308337fd83d6c8af1c88b7764c SHA512 ef9a85a76fcc60b19766ef3807ee8cee4edab2d533650ab13c8de2c845acad0d288b93ae716aff132825b5b4310fc149a98508a7eaddec239132a58e7b7955e3 WHIRLPOOL 52e5f29545a6b392d051d8ab7d4b43669a4797914e50301075a59f48c5a527d6362df0748a0d88d221e474ca1430535f31743dccfd39040f6ad681f1d0f8b16b
-MISC metadata.xml 3725 SHA256 b0eee9c78de338fc58bc8295e5da8079fe450229703dce3bf1221d711c00a6fe SHA512 88dfc6d61f50ea554ae3189f3138ecce3dbc07f4abdb786a4b77bee43c4057c4530bd313697e82b280301ab58bf71fd0eb0db5670392f8336f67681ae50c1389 WHIRLPOOL a4d9468f66d5d2835289fd7aab1d83b07ee34f864717254531f741445db12ef1fa35f28ecef583a887e3e6e8ed3ba7499d7189490ce61f10c1b34bf7915aa829
+EBUILD ffmpeg-1.0.6.ebuild 9539 SHA256 c982e60aab6c3b155a2538b7938be3284b36a3f390d1c297fdba2414b2d6c1f9 SHA512 948e13c4b10c89d16dec58e442b183df57b3f8a5ad91e6eb1ff9d76b97e1e554dac260618614404e4295fc5553d8fb2f5dba98a358184925b8b53d3dcbb6c980 WHIRLPOOL cd1100213ddeba2f00b4f7aed11af9fb4cfccc7327cf84568a287e926c0c6cf8d14bbe9626f11cc6c69e43d9418e3c06d8cf3cb44ab5b98de8357d81f3cb00ce
+EBUILD ffmpeg-1.1.4.ebuild 9507 SHA256 9af9f91a039f4b8c955e076b7d2e027a503596ed33d1f63bf91305ba69b70e3f SHA512 43b69c498c2d66cd965546ecf0e7c6a3bc8da545bc579df608e0c13d35fb09f1cd3450cbb2c92c484003c95baca32a19cdbce7abf6b9a0f71389ed001255c91c WHIRLPOOL 7766a187667d25d6c55d735615ed9ddca44c60bde26728243856523e63ea44a065747ca41ecf1cc2b145e16ce20b2a0d592e7128f3a0bf5d47a06cc4c3bdd636
+EBUILD ffmpeg-1.2.ebuild 8922 SHA256 dacc21fd27ab42cf24015c99fc7868951451b1c6d9fbb53408f8c3fb6b7a57af SHA512 59f2c05d2972371276fca21ea1887a89adb010110a105b20cb96952236da8ccf8d000e169258ce3b51ffd894005e9568579c8996d6b01adaf44199d8ddc87eaf WHIRLPOOL 17f0a42cf5daabee6293839d9ecf0128b1b890413bbb58e8cc4bdd6d896473ed5001822f793117c941b5c610a9d472b129c5acb3ebc92bf5b110bb11ace38e42
+EBUILD ffmpeg-9999.ebuild 8925 SHA256 da1854518b168ba0ddc4a745231578da865a4fadfe39d933d07d91b18815fa2d SHA512 84bb1bb001b6b75d36927ee62d77fc47aeefe70d7cfe569463fb0d5261aa501d51d2600f0c486e2fbe30b03600f2cd79eab3b45423bdb372284fa8df1b712a3e WHIRLPOOL 04aaa4220a4ab85984680ba2e4c0ab202f9aa460196b94c2dd2f451cde0c216b6c26cdf50f31fd59557ee760794711a2d8407bd7f9534a9aadbf228078968dea
+MISC ChangeLog 89427 SHA256 61f0c0806575eb61616d090555462b0079f5fcbc32457913be45919e7a8a391e SHA512 c33c7b97ad9f8edaec0d20ace53cb588e157145bad0cfacd34d7ea4f325922bd238414544a4670f11204fd439294d7319908c6f86ffaa1d70ce7707bb7652459 WHIRLPOOL 841fc239c35d10b52ce72bb0fe83e0a6f13d41936d79d57dbc0946f93f03604eb21898893c2e029c4b75c32465b6594b311fd20275fb31a6ba282c4b164725ea
+MISC metadata.xml 3506 SHA256 87175b36b5ab9e0d0ab24c7a758835671361a73d70c5008d596e5d2ff8486493 SHA512 445fc69245aaab198611ffcb110d81eba90df93c37c1dbc1e7ce63e53fd72533d28f60f8150461d23af5ee4d3537324f48b0f7f05120f46273a8451ce934ebe0 WHIRLPOOL f3771586966dfe434d7e9703b380b426bcd175a0b30e2b50815903f7480c24db2f1f9b9ba8145a14b63647460966768a5def329f91708dee2d19b2d241d5eaf7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFca8IACgkQvFcC4BYPU0rH2ACeIdQOfs5H+cuG5TlubebrcGUA
-LkAAoKgguylM8oAJMGYodZAiwuTDKbDl
-=VLnU
+iEYEAREIAAYFAlFdLRQACgkQvFcC4BYPU0qwVQCfe+E86hPnj2v3CjyD0kwQ177d
+6XgAoIUOdp4X3w9Xcx6S10E/RyaR5F6n
+=sYsr
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-1.0.6.ebuild b/media-video/ffmpeg/ffmpeg-1.0.6.ebuild
index f2e320141c2c..46d762687f7c 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.6.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-1.0.6.ebuild,v 1.2 2013/04/03 17:49:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.6.ebuild,v 1.3 2013/04/04 07:34:43 aballier Exp $
 
 EAPI="4"
 
@@ -29,7 +29,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
-	aac aacplus alsa amr +avresample bindist bluray +bzip2 cdio celt
+	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
 	cpudetection debug doc +encode examples 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
@@ -235,6 +235,7 @@ src_configure() {
 		${version3}
 		--enable-postproc
 		--enable-avfilter
+		--enable-avresample
 		--disable-stripping
 		${myconf}"
 
@@ -254,9 +255,6 @@ src_configure() {
 		esac
 	fi
 
-	# avresample support for libav compatibility
-	use avresample && myconf="${myconf} --enable-avresample"
-
 	# Misc stuff
 	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
 
diff --git a/media-video/ffmpeg/ffmpeg-1.1.4.ebuild b/media-video/ffmpeg/ffmpeg-1.1.4.ebuild
index 565748c5d8ce..ee286ba05eeb 100644
--- a/media-video/ffmpeg/ffmpeg-1.1.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.1.4.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-1.1.4.ebuild,v 1.2 2013/04/03 17:49:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.4.ebuild,v 1.3 2013/04/04 07:34:43 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 +avresample bindist bluray +bzip2 cdio celt
+	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
 	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
 	gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca
 	libsoxr libv4l modplug mp3 network openal openssl opus oss pic pulseaudio
@@ -232,6 +232,7 @@ src_configure() {
 		${version3}
 		--enable-postproc
 		--enable-avfilter
+		--enable-avresample
 		--disable-stripping
 		${myconf}"
 
@@ -251,9 +252,6 @@ src_configure() {
 		esac
 	fi
 
-	# avresample support for libav compatibility
-	use avresample && myconf="${myconf} --enable-avresample"
-
 	# Misc stuff
 	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
 
diff --git a/media-video/ffmpeg/ffmpeg-1.2.ebuild b/media-video/ffmpeg/ffmpeg-1.2.ebuild
index 41dc6687bfbb..24fa43a43fc8 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.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-1.2.ebuild,v 1.2 2013/04/03 17:49:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.ebuild,v 1.3 2013/04/04 07:34:43 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 +avresample bindist bluray +bzip2 cdio celt
+	aac aacplus alsa amr 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
@@ -142,7 +142,7 @@ src_configure() {
 	# options to use as use_enable in the foo[:bar] form.
 	# This will feed configure with $(use_enable foo bar)
 	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse="avresample bzip2:bzlib cpudetection:runtime-cpudetect debug doc
+	local ffuse="bzip2:bzlib cpudetection:runtime-cpudetect debug doc
 			     gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib"
 	use openssl && myconf="${myconf} --enable-nonfree"
 
@@ -228,6 +228,7 @@ src_configure() {
 		--enable-gpl
 		--enable-postproc
 		--enable-avfilter
+		--enable-avresample
 		--disable-stripping
 		${myconf}"
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 1741e585c366..fc1669f550b2 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.125 2013/04/03 17:49:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.126 2013/04/04 07:34:43 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 +avresample bindist bluray +bzip2 cdio celt
+	aac aacplus alsa amr 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
@@ -142,7 +142,7 @@ src_configure() {
 	# options to use as use_enable in the foo[:bar] form.
 	# This will feed configure with $(use_enable foo bar)
 	# or $(use_enable foo foo) if no :bar is set.
-	local ffuse="avresample bzip2:bzlib cpudetection:runtime-cpudetect debug doc
+	local ffuse="bzip2:bzlib cpudetection:runtime-cpudetect debug doc
 			     gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib"
 	use openssl && myconf="${myconf} --enable-nonfree"
 
@@ -228,6 +228,7 @@ src_configure() {
 		--enable-gpl
 		--enable-postproc
 		--enable-avfilter
+		--enable-avresample
 		--disable-stripping
 		${myconf}"
 
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index bea267b69b6e..96d35d94a9c2 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -13,7 +13,6 @@
     </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="avresample">Enables libavresample, <pkg>media-video/libav</pkg> version of libswresample (which installed and makes libavresample redundant): A conversion library between uncompressed audio formats.</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>