Expose opus support

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x1191738E

6 files changed, 33 insertions, 21 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 7e99f300a455..c50a3b6c6528 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.146 2013/03/24 20:09:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.147 2013/04/05 10:48:46 lu_zero Exp $
+
+  05 Apr 2013; Luca Barbato <lu_zero@gentoo.org> libav-9.4.ebuild,
+  libav-9.9999.ebuild, libav-9999.ebuild, metadata.xml:
+  Expose opus support
 
 *libav-9.4 (24 Mar 2013)
 *libav-0.8.6 (24 Mar 2013)
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index f76730141508..fda1ec734811 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -16,15 +16,15 @@ EBUILD libav-0.8.6.ebuild 9171 SHA256 14c6d38c6db77f992d35bcfeffc25ae689a7f5fff8
 EBUILD libav-0.8.9999.ebuild 9110 SHA256 596fc2c01d57af2f3af6af4b45139eb766b9d43503f8874ed82bbff6a099d0e1 SHA512 1717f9cf91ab218e302c685e7f3ab0231ce731fc79c45fb5b797ce7243125317d51fd788d151742407164b49f54528408382f9672e053a09438de44132bc7ef0 WHIRLPOOL a1c93c43997b327982e24dea09a4c64189133e270528a499e8cfb9ce64dd7c86598ef212264d6f52e30dcaa1ee3ce8f60725e225aaa8f9eedc0f34832f3a4d1b
 EBUILD libav-9.2.ebuild 9209 SHA256 2de366b1be468d37fdf1aba55daa4c601c974fe071887ce10e848fb4951b3cca SHA512 20082081a4c66fc6442953dc276e9fafdf137b868b63383bab5d105ecccaf27582b8fc3fcd67f4c232c4f0323757ceca4b1aabeff080ab84b56d3ccc76fe7ed1 WHIRLPOOL 33baa32b5670c75d361cd33900a4f85de27849c60321885be1f86007e168bd68466afa4f2c1f864976f0fb5212432152058cc31526d007d6e4bdb051d5bca56e
 EBUILD libav-9.3.ebuild 8839 SHA256 93571cea695971202249329909449171b7c142f35fa443f70f9c66d14168e3ee SHA512 6e078964f95318b776dd623ec442075dfbc39b824099da515d9967647b14e4c2030074a8a9223af3528761b72e31202538a99a68f41f37748a9fc873fa9ba917 WHIRLPOOL af5e8557afc31a412c08167e3313ed332d657a259b7deab0d2015434559fbbd21af4bf75c68adf7a7f5d7b936610f8babf581eaddbafa7608816747a0eca2ea1
-EBUILD libav-9.4.ebuild 8839 SHA256 067b13f49efd0623280f3b24f069e4bcf791f708b5cbf22ce312b87a26a917a2 SHA512 a056bf183546db5e94ae2d2e966102477dbc47e1c06e44aab704e71d2209fa8c207593cc3d9d2f24473c257e580e044097d4a04bfce92b29c44665bb69d54bbe WHIRLPOOL c5a30eaa8147006a30ac665e35ec1c63fa4513a560e6bad5705e8004e6945779b00a8df7f250927fa9b9065703cddc16cc87231b7e3549ef257b497792fbeaaa
-EBUILD libav-9.9999.ebuild 8840 SHA256 3f7315077297c66831c3b46b3bf4a700e1d5727f541dafd11433aa5fc5c42f21 SHA512 5216b65c619138c7450cc19a84170c004703f7adb6152cfda95d81060530673a8120de9d5177bd034f11136397186e5985c89424e41dadaa4569dc1f8d26243b WHIRLPOOL b18da3b5337778f8a04834e922ef8c6c16a5c338a53db81c0861a6e19b9f59a861f436d9f33970708e6daeaad9789e376dd9a703946ef90dabe48774a30ef21d
-EBUILD libav-9999.ebuild 8717 SHA256 ccf0645aa7d1e2a433d2836e7f233fd8bea0d5f11bd65fa35beb94cf0571a1bf SHA512 0f0cf48641e8e5a963fe2772930570560a564b15a335501a5ec2df6489042661ee7eed03da045a29d7ba33dec8da9dee5e0c34695a1a4ec53892bcc4167b09bc WHIRLPOOL 67896d85adbcf09762787b245b642135bae884a7ea53cb8a82dfe9b088bb47b53e54c40ab0e5ed3dbdef9d590e22b8faeefa4d6af93c75d5602f5e0da290f944
-MISC ChangeLog 21624 SHA256 42691c9d803883029153035c22cb4c09163671c1be559624ba74b01391a81528 SHA512 d8abacd4c263c16e32705c97d7d947a778c27668f0ee2f5b25d30fe32a6ddfbb6e98b4b212a41f3b9c9196a3be425f8fd887a4eb6b8a50ac2a7fc199e205072a WHIRLPOOL 42fbe14b9598765d8d56d72e2cad823df324c3897bd978d176e33585f96ff410aaf2135af6c8111d6315e00be187effd7d5e16e79229249f90a41565cd595859
-MISC metadata.xml 3023 SHA256 26380d1657785b484265cc5ce3112dfef63231857cd64f81300b30b806a2f8e8 SHA512 7eb1ea995315cf8caed89296b5fe1cdb9ebaceb8e0cb8e2e1bef22f59f0a518ce128d4e43d18550bdc711df9237790cdf91c775d28e016ea752a3abfa6faa533 WHIRLPOOL 45f87adcebdea041818809051ad67dbb3b880f46971dbab594b4b7dfe4d31a84d97dc5b6e45bb0c51b50b21142074490bd8d268d9b73bfb5ee839ee78e428b0d
+EBUILD libav-9.4.ebuild 8874 SHA256 9435f3a3eefbbe63f6500299957bb401712ba1c20bfd0876f3eb7bf5dfdc6a61 SHA512 bf7d5ae6aed6581a94a68aeda0d0a309f84a8b29d281a3eb78ea9f684682f4b6d40938dc7c6567bd40e88cdc5698c8cb7a360b372fee2e0589642e19502d5db1 WHIRLPOOL 41e0e084028a056818e525549234dfec076a391540f5fedeaf279a8f5d53a5acf05971a76e452d6e6a0ae58e3741eb3ea8a159a6b927399724368207b2d4ae3b
+EBUILD libav-9.9999.ebuild 8877 SHA256 783078761281e8c167c1417176854cab77612400f963235cc1b4c736351fe68a SHA512 0df6ac5afd05c0066fed08c78a88098761764bcc591b7f2b0065599b0ce455055e8d37de8e5a4588505695959fc603f46b7da875f34bfb3862fd0b33b7168f7e WHIRLPOOL 1674dc351e6b04bd276396be3f060466f2a3e6e628b862e099b4fddbca5b632e69128bdb53d1831ddcd8e5843b7ad3cf08fc41f0c8cbb330842353c06b613358
+EBUILD libav-9999.ebuild 8754 SHA256 912c110b9824153d511e1503e3405b8d486e47a732cf3c9c07c24072c186f1a4 SHA512 61675c1a70f1a6c5da363e407fe860a1a3b7cd379fb68e756b07bd15c3e4f0ad706cfd77618f72c20675ef49f2264e7a01cc2adbacda8a20086e420b443e288a WHIRLPOOL 5648de61cb35cf98f7e1a35fc5234070e14d107ad255282062db8245dafd3af198ca8abbc5ad2ad3e0de9597a96db5d734802b0c6ef7b9bba19f4eb0999d4bfc
+MISC ChangeLog 21770 SHA256 bccda0c586aa06c68ca17fe2cdbfe7dab489a53cc77b5676e77a4f958f544502 SHA512 b0f96a5eb60248023f55bb897ab0de217134a9a5148bf92c6c3868b9f66675b0a618cf1cf1e77d86dfca49111d3dd3026cf97e7a36c27a131074ebd6d0afec98 WHIRLPOOL 0c5c2ea018291ef8921cb97918f5dfe38daaa7dcf62cf44542618842bfb42be01cfc107437f1033db04807fe627b083deb95dfc4c77c719dc5216ff986e6cb15
+MISC metadata.xml 3106 SHA256 968ffe2f92f6e2ae9963fe0005e78fc205ebca769d48eedd578472cef8c8cfcc SHA512 f10f99a54e1806b17d0923429c2df151e470edceefd854e63c0411b2be6fbbaf829e441dd318ff0e87d5f2d6985c52673646c20c971fba9c0d44d67edc3bb5c8 WHIRLPOOL 9004c95991227752427cf62491949845931683a9a45a7a555b98b1bf92cf7d2efad0e2c912b4a069e58e31f41062d0025b8e3a082e0cc37c5d13484969058a47
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAlFPXZkACgkQcXOrnRGRc47j+AD/e+FipuOnJ+9vCY9fRN8ILgxo
-0uAiYpQ6Y9ScIDR92FMA/0f+6TEEcMQJYk/3YMFshBDovTohUUjKT2DgtKeP1cBA
-=2xHW
+iF4EAREIAAYFAlFerBUACgkQcXOrnRGRc45yGAEAzESAtaZbmaLwN7V5swrf9ETk
+7jABv//jDtrtMe2y+L8A+gNJka+MUtRWZap9nQ+Y4xHU/2rGqaLsjDhISsI4Pb77
+=tIpg
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-9.4.ebuild b/media-video/libav/libav-9.4.ebuild
index e12c07de589e..4c7b69126503 100644
--- a/media-video/libav/libav-9.4.ebuild
+++ b/media-video/libav/libav-9.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/libav/libav-9.4.ebuild,v 1.1 2013/03/24 20:09:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.4.ebuild,v 1.2 2013/04/05 10:48:46 lu_zero Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 
 IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
 	+encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
-	network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
 	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
 	x264 xvid +zlib"
 
@@ -51,8 +51,12 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
-	cdio? ( || ( dev-libs/libcdio-paranoia
-				<dev-libs/libcdio-0.90[-minimal] ) )
+	cdio? (
+		|| (
+			dev-libs/libcdio-paranoia
+			<dev-libs/libcdio-0.90[-minimal]
+		)
+	)
 	encode? (
 		aac? ( media-libs/vo-aacenc )
 		amr? ( media-libs/vo-amrwbenc )
@@ -75,6 +79,7 @@ RDEPEND="
 	)
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	opus? ( media-libs/opus )
 	pulseaudio? ( media-sound/pulseaudio )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
 	ssl? (
@@ -200,7 +205,7 @@ src_configure() {
 
 	# Decoders
 	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="gsm rtmp schroedinger speex vpx"
+	uses="gsm opus rtmp schroedinger speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=" --enable-lib${i}"
 	done
@@ -226,7 +231,7 @@ src_configure() {
 	# Try to get cpu type based on CFLAGS.
 	# Bug #172723
 	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# If they contain an unknown CPU it will not hurt since configure
 	# will just ignore it.
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
 		[[ "${i}" == "native" ]] && i="host" # bug #273421
diff --git a/media-video/libav/libav-9.9999.ebuild b/media-video/libav/libav-9.9999.ebuild
index 2cc372ad36e9..36ba2471f7d8 100644
--- a/media-video/libav/libav-9.9999.ebuild
+++ b/media-video/libav/libav-9.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/libav/libav-9.9999.ebuild,v 1.4 2013/03/08 11:15:02 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.5 2013/04/05 10:48:46 lu_zero Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 
 IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
 	+encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
-	network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
 	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
 	x264 xvid +zlib"
 
@@ -79,6 +79,7 @@ RDEPEND="
 	)
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	opus? ( media-libs/opus )
 	pulseaudio? ( media-sound/pulseaudio )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
 	ssl? (
@@ -204,7 +205,7 @@ src_configure() {
 
 	# Decoders
 	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="gsm rtmp schroedinger speex vpx"
+	uses="gsm opus rtmp schroedinger speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=" --enable-lib${i}"
 	done
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 07cf2548cc1d..75baa132d614 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-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/libav/libav-9999.ebuild,v 1.57 2013/03/08 11:15:02 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.58 2013/04/05 10:48:46 lu_zero Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ SLOT="0/9"
 ~x64-solaris ~x86-solaris"
 IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
 	+encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
-	network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
 	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
 	x264 xvid +zlib"
 
@@ -75,6 +75,7 @@ RDEPEND="
 	)
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	opus? ( media-libs/opus )
 	pulseaudio? ( media-sound/pulseaudio )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
 	ssl? (
@@ -203,7 +204,7 @@ src_configure() {
 
 	# Decoders
 	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
-	uses="gsm rtmp schroedinger speex vpx"
+	uses="gsm opus rtmp schroedinger speex vpx"
 	for i in ${uses}; do
 		use ${i} && myconf+=" --enable-lib${i}"
 	done
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index bded17c4f69d..6d422f0e12b5 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -26,6 +26,7 @@
 	<flag name="mmxext">Enable mmx2 support.</flag>
 	<flag name="network">Enable network streaming support.</flag>
 	<flag name="openssl">Prefer <pkg>dev-libs/openssl</pkg> over <pkg>net-libs/gnutls</pkg> to provide SSL/TLS support (notice: the resulting binaries are unredistributable).</flag>
+	<flag name="opus">Use the external opus library for encoding and decoding.</flag>
 	<flag name="pulseaudio">Enable pulseaudio input support.</flag>
 	<flag name="pic">Force shared libraries to be built as PIC (this is slower).</flag>
 	<flag name="qt-faststart">Build and install qt-faststart application.</flag>