Add avresample useflag

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

4 files changed, 21 insertions, 13 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 323798ca06bd..bf28fa8b493f 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.557 2012/05/26 18:19:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.558 2012/05/29 12:56:18 aballier Exp $
+
+  29 May 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+  metadata.xml:
+  Add avresample useflag
 
 *ffmpeg-0.11 (26 May 2012)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d4ef1463c694..5153fc5042eb 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,13 +9,13 @@ DIST ffmpeg-0.11.tar.bz2 6071924 RMD160 042d199f0fc8733a8c4790f42966186b503812da
 EBUILD ffmpeg-0.10.2.ebuild 8557 RMD160 e0e083ea792e5fcf20680328c2697288d60e01b8 SHA1 303e97a92e80664645e6e1a0b086df8ee2cd0be8 SHA256 ddef6a22679025c5c18da9684e13fd500366cd0352933748af3b027a43bf68d5
 EBUILD ffmpeg-0.10.3.ebuild 8577 RMD160 b6ec22bbf885f9a09e00c0892c7653ee99a32991 SHA1 42e8335b45990c040aa95b7aafd88c93b43f4774 SHA256 1e31987ee5e02b2cad99c963766ede378cb8a402ef945c1d52eb3520a8586960
 EBUILD ffmpeg-0.11.ebuild 8673 RMD160 031100c8121fe10ae431582443f30429498187bb SHA1 d94a21b4be2abaabd4f3b3aaad8bd767aba76eba SHA256 7e3f3990b4b37ef6b35e824dbd6b6d68dbde51e16d41b683ca2bb2136b900528
-EBUILD ffmpeg-9999.ebuild 8635 RMD160 c063aa834846a198c0e101446989cf81c7d4ed30 SHA1 d0e4ca8d5fe5473ad9ed7c9fc58e7f34e4d2700f SHA256 5c556f5439800c112e9a468ed2d8e13ba533f1c3d5c8a80d710731834c1667aa
-MISC ChangeLog 79336 RMD160 24c5b903a88c9628337c40a3c93336e3dbce0be5 SHA1 95bf589a774529daa1c841ebadb15e4a27f30673 SHA256 4ce495b8e6e513c7a3abb3231461e4edae3a420c17c6ce311a5cb0707d4fa9ad
-MISC metadata.xml 3045 RMD160 dc7945d3f121a56d1c09794b47216fb1008a2f50 SHA1 2cc3e2d9ffc5647ce7880a618e26aa4ef029a25d SHA256 bfbce0eed908e9fe97bc59a1dcbf754ad2887c87a720394a1cb32f11d1231a91
+EBUILD ffmpeg-9999.ebuild 8751 RMD160 63c175cf28f868c5f23bab656911f4c748401626 SHA1 50be03a912e0febdbe77710758c7bc016d848383 SHA256 5ce693da8104e183fd8ff6ac5fc95de50c22ce0d8aaaec6a1b45f24f674b19e2
+MISC ChangeLog 79450 RMD160 9366351babf18b74d926c4a8ec5e02111f58b5c5 SHA1 d8a91e048e968982349c00156dfd248bc79df588 SHA256 88573bbcefe66b417535ea5015e0cedf0d5e2b99cef48864c87ff7e61092f644
+MISC metadata.xml 3264 RMD160 d490f085da685d2a01fd804fa0e36c8de4ca3c69 SHA1 8dc1c5965fae0dbf2e7b11660f49ea35f5816bbb SHA256 efd3dc3907116acc644ff3cf9ec6625db5ab24d7e919a2a915cfc31e1e166ced
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/BHp8ACgkQvFcC4BYPU0pmtQCcCJ9MGISja3gepLjRZO9sIizN
-AGsAn3et3G4s1QiDW3vgp0OgLy1uyX8S
-=o8Fo
+iEYEARECAAYFAk/Ex3gACgkQvFcC4BYPU0o1jwCfXXNBnQiTM6FkEoDsjzwp53TN
+SZ8AoKhzG62v27gn14HtkYILXW0/BDWb
+=sC+2
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 51b68b241bd8..38eafdbfba36 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.94 2012/05/17 20:45:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.95 2012/05/29 12:56:18 aballier Exp $
 
 EAPI="4"
 
@@ -29,11 +29,11 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 IUSE="
-	aac aacplus alsa amr ass bindist bluray +bzip2 cdio celt cpudetection debug
-	doc +encode faac fontconfig frei0r gnutls gsm +hardcoded-tables
-	ieee1394 jack jpeg2k libv4l modplug mp3 network openal openssl oss pic
-	pulseaudio rtmp schroedinger sdl speex static-libs test theora threads
-	truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
+	aac aacplus alsa amr ass avresample bindist bluray +bzip2 cdio celt
+	cpudetection debug doc +encode faac fontconfig frei0r gnutls gsm
+	+hardcoded-tables ieee1394 jack jpeg2k libv4l modplug mp3 network openal
+	openssl oss pic pulseaudio rtmp schroedinger sdl speex static-libs test
+	theora threads truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
 	"
 
 # String for CPU features in the useflag[:configure_option] form
@@ -237,6 +237,9 @@ 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/metadata.xml b/media-video/ffmpeg/metadata.xml
index 617e548641ea..83f4324dfcc8 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -14,6 +14,7 @@
 	<flag name="ass">Enables <pkg>media-libs/libass</pkg> based subtitle renderer.</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="bluray">Enable playback of Blu-ray filesystems</flag>
     <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>