Support libav-9

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

4 files changed, 50 insertions, 13 deletions

diff --git a/media-libs/FusionSound/ChangeLog b/media-libs/FusionSound/ChangeLog
index b15ab617e0a7..84b943c41d5a 100644
--- a/media-libs/FusionSound/ChangeLog
+++ b/media-libs/FusionSound/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/FusionSound
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.20 2012/05/05 08:02:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.21 2012/11/25 13:51:03 lu_zero Exp $
+
+  25 Nov 2012; Luca Barbato <lu_zero@gentoo.org> FusionSound-1.1.1-r1.ebuild,
+  +files/FusionSound-1.1.1-libav-9.patch:
+  Support libav-9
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> FusionSound-1.1.1-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
index 91710d007bc1..12524b880498 100644
--- a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
+++ b/media-libs/FusionSound/FusionSound-1.1.1-r1.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-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.13 2012/05/05 08:02:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.14 2012/11/25 13:51:03 lu_zero Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -35,7 +35,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-ffmpeg-0.6.90.patch \
 		"${FILESDIR}"/${P}-ffmpeg-0.10.patch \
 		"${FILESDIR}"/${P}-libavformat54.patch \
-		"${FILESDIR}"/${P}-libav-0.8.1.patch
+		"${FILESDIR}"/${P}-libav-0.8.1.patch \
+		"${FILESDIR}"/${P}-libav-9.patch
 
 	sed -i -e 's:-O3 -ffast-math -pipe::' configure.in || die
 
diff --git a/media-libs/FusionSound/Manifest b/media-libs/FusionSound/Manifest
index 495e2a6cdd24..b8c020ef24ad 100644
--- a/media-libs/FusionSound/Manifest
+++ b/media-libs/FusionSound/Manifest
@@ -1,10 +1,21 @@
-AUX FusionSound-1.1.1-ffmpeg-0.10.patch 5503 RMD160 a731632d28cd95bfbfe7131f483c76abd7d3a5f1 SHA1 267737349affeeb32db52b526288f7c2a6c656e7 SHA256 663e139a98622b5d7b66fab70751994d052cefe5c5e79bb1b8298bc6e3ec2fa2
-AUX FusionSound-1.1.1-ffmpeg-0.6.90.patch 499 RMD160 89046316ea2bee0f4f5a64c32187008d4326a171 SHA1 1614f68a2eb5cec93bc55cbd507909f053b0c6ec SHA256 2711be9cf1d011084c77753539c221bff47daab0ca1e5c7fbb7d1d0419d62cba
-AUX FusionSound-1.1.1-ffmpeg.patch 1909 RMD160 ace5650fd14967d226cc2183cfb8016002a9833b SHA1 36f7d62672e4f92506ce09af28a64076cdc88a1c SHA256 2d4923474c6fd22bafdfb6f2454a1b280d24cb7d8ec2ad20e75c547cdb559439
-AUX FusionSound-1.1.1-gcc43.patch 966 RMD160 778aa15f55614479ac26fa46b7e9d5d9e032d7fc SHA1 d718d3fb2a9914e4c675f6a6058ce750b20337c2 SHA256 501b0a9fc9c109ce38564863cf4ae1737de99eff3f22052506e3371fef443c3b
-AUX FusionSound-1.1.1-libav-0.8.1.patch 690 RMD160 6380870a13e27ae2600ea14e8642375bb87b09cb SHA1 27f31fc7bcc6b591b7b51b1ce2a2b2bfd8b1077a SHA256 76415f0a2e8a2f9e8284970dbd10d5561e94d13ec25df2405e9d251ed205d7af
-AUX FusionSound-1.1.1-libavformat54.patch 1555 RMD160 d3b26938b7b21853f153406e4c3fb692b40f5611 SHA1 304348686bfdbc2d047fef64a43eda3aeca4a860 SHA256 b282ea589d4d24733dfd66d5ecedc97c368da5c096cd6327135f3ec156a3e512
-DIST FusionSound-1.1.1.tar.gz 1103465 RMD160 08fca827c50dbc2abc754f8ec25fcc62a7896917 SHA1 cd5e45d5ab3d83b9474e8d4dc36a0b43e637f302 SHA256 573505cb6d8e39174f188ef8f749fc4c0f3476397f379d2b65ff8d07b8aa6f6d
-EBUILD FusionSound-1.1.1-r1.ebuild 1773 RMD160 48c091add1311d3b3ee98fdc341daa20fe4762e6 SHA1 63946fe624d688ba240222bb74b04c74f6222b84 SHA256 409a0bf30e9fea67ed4f9a0f2585d4f4cbf6717af557debc92efad2be5f556c1
-MISC ChangeLog 3097 RMD160 652da36f9c2ccdc67db4101846a2b0682efac20e SHA1 dc122eb61e9e55f0523363920658c0c92aa4bd20 SHA256 d02afee93b94f0861eef3abbf20e562370023fb69dc018af547f08a5239defa4
-MISC metadata.xml 258 RMD160 5095033a3f1e005eb3f3a84860d66ddec69a3f2a SHA1 9a67dcf026c0a4fb909ce2567329156394735796 SHA256 b2a9da76f94c1e0ae408d46f9621abe6df070aa121366378e2fbc8ec5037c451
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX FusionSound-1.1.1-ffmpeg-0.10.patch 5503 SHA256 663e139a98622b5d7b66fab70751994d052cefe5c5e79bb1b8298bc6e3ec2fa2 SHA512 e3e15f7962806e5699b184334c2f27fe04eea0e194139755a335544e5dad5d20d22ddcf2e2de07dbc41f809fdbf301456eeaa39190bae898538d07ec99262392 WHIRLPOOL e81b0e27f12de7041e73fd5defec34fc57e93625365fc2dcf3d6dac1b24c780b49c7c3ead23ae0cc252c6121b9312b831cee00e421ef2ab8ebcef6adb9bc4618
+AUX FusionSound-1.1.1-ffmpeg-0.6.90.patch 499 SHA256 2711be9cf1d011084c77753539c221bff47daab0ca1e5c7fbb7d1d0419d62cba SHA512 0cba7dbda5f3bcefad1ec1b9b2f0efe3f4b0496b300a28a9233210b8d83eceb9e188bbf84c5dc8c4713cf49dceb5e6a292be5622a807f6b12011517f8cf5b340 WHIRLPOOL 695db76cdc6b53ee66941dfa5c591ed385c9260faa075f64bb33a6b95669adb29106a993d57a60072500d0fb8dc2eead15ec771d232e7e62cea8754a3f59aeb8
+AUX FusionSound-1.1.1-ffmpeg.patch 1909 SHA256 2d4923474c6fd22bafdfb6f2454a1b280d24cb7d8ec2ad20e75c547cdb559439 SHA512 b5b5650b977ebdf2ebe1d47bb3b5d5909ec368c9f04d972deb31dba925931e0e476a3d69cadbef3a51ef052033c4cf93b1aa0d39b75f9c790f717fa7f229a465 WHIRLPOOL ac87e50af46e93696d868ef682bec4d8d8e44797d5a16a53f6b6c9c639769cede880bafe2aee9e8b0dbd34940d2199f6af08b18a739daf4388295844e6151eb5
+AUX FusionSound-1.1.1-gcc43.patch 966 SHA256 501b0a9fc9c109ce38564863cf4ae1737de99eff3f22052506e3371fef443c3b SHA512 cceb2d25dc342ba8aa4b00775169de7e7b83241b0e3b9be74a5b6c6daa56b7c188f2efa50ac4b2423893ebad34a7841cbb3ef93af6982c3e2183c301c7ff79e7 WHIRLPOOL 2c29a5fc053928e9f714562a56672dd098ddb32dc9a7d4ea8189e7674f6be463767b8c4767aee66753f386199f3d0452d4c4679e0515501131e9ea111cd7c64c
+AUX FusionSound-1.1.1-libav-0.8.1.patch 690 SHA256 76415f0a2e8a2f9e8284970dbd10d5561e94d13ec25df2405e9d251ed205d7af SHA512 6c85f56975b0bd8b87f64c266c089ca5ab0a561521608281464eebe01b1604dbe2cd860d2ff9c8ad4412f457695be9bef57812b2f2442c85a7e87cce4bbe19eb WHIRLPOOL 4d766f2379f9fa432ad36a40f983a9583807a220b047b51fbd7720ed4b49abc480f1366bd6aea67e2a4e0c957e52231e8d47061eefd5d8e428d675eaa1f9fbc3
+AUX FusionSound-1.1.1-libav-9.patch 1243 SHA256 aaeba7c421bab86c2083bcb84cc9d77d06fd25879925bc99e0810ece5b66364d SHA512 604d6387449d72d37b82a615c2ab1f5803f7ffb7dbcdb55b27836fa7adba62f0d03c4cd103ab20a5082a60f60ebe04f2c41add26bed663b2f7913d577e258a18 WHIRLPOOL d590731a09da232784fe2f70791942313b85424d793ef6e8ec7ea2f8455e61b8c16b828371f79b65fa4709cfcb407de38febb40ce17e37f7d24f9c0073d52a96
+AUX FusionSound-1.1.1-libavformat54.patch 1555 SHA256 b282ea589d4d24733dfd66d5ecedc97c368da5c096cd6327135f3ec156a3e512 SHA512 30a96c32639cc88747eba36cd77a36460d5874506bcada915e9b61d5c5d7540feef6b450f28ccc3cc7c11042cb25e8f27da3c53e0aac5e71ed67c4202590cdd5 WHIRLPOOL 6dc9d1a19b0159989f866a555dbd3f44e13d4757070a64f148b2b62f274e6e189a5737dc3a32551481ec5bffff640a3e8973220427d7c3898cddba6c3a0119b5
+DIST FusionSound-1.1.1.tar.gz 1103465 SHA256 573505cb6d8e39174f188ef8f749fc4c0f3476397f379d2b65ff8d07b8aa6f6d SHA512 58ede71d78165491a24f28ee7658f4ca7ea6292e3bc5dad3e54f42f785338a6ae02020a03af38e92f3a4e9b2fd5a70cc2d643dc338ffb62eeeed1a0e9d11d853 WHIRLPOOL f0905d60ca3b72daa1744e8608fc7797b335fa4978440fbfb6397ebae689a8e20a2df1509ae7f76a65b92200b975a052df4d38e9608410393863e44fc7973200
+EBUILD FusionSound-1.1.1-r1.ebuild 1811 SHA256 64b43cfca753f77d9fd3b160182e94fd2cfb59132b53f80b48f916a1d49b604a SHA512 94ed158525e327780fa56afee882a446bf62863f59016694e8755f501b1e10e2fe82f17e771dbbe79b3b5b50a989b4b2a0944fccfc6c5aa6e09b5f0dc33eccaf WHIRLPOOL bf99476c91508e79c8bb44515aca18a10c5bdf2781a5ae5391367dd972768ef9cdc794e4e0267b6244b06bfb7712025933631443aa32c86110c0cfdd5bd7acf8
+MISC ChangeLog 3237 SHA256 4db34d1c8905b6a59377b9fa4881b8046993f1f83835a472f256e31db1cdcbaf SHA512 3829bf06107eaf7225ae4f90e2a2cf92bddcc195c67dc9243fdb48db1e20ae05e2b4f755dabccc61ac7e390468e64702c6546487958d7097cf592ba522cd936b WHIRLPOOL cab2a570ce9096ecbcfde40dbeeffade88fbcc044433f349eadba142ecfdb4878324cbd9cc5eaa7d7649323a58789ecc403ec4d46263adb8269c34a5ff849c4d
+MISC metadata.xml 258 SHA256 b2a9da76f94c1e0ae408d46f9621abe6df070aa121366378e2fbc8ec5037c451 SHA512 24f21c55c740c4c72c6f869a4af7af6e4991f51591d719e460aa8fa314210294ca57ff3124637f13e8cb8ae56b313e98caa7f996cdd54399cee6e8725cbebaed WHIRLPOOL 1b1c7e283d1562a58ec3fbd4d5b7df07689bf0ac32373c8c8b8a41ad463e43a496823931c93ed316e36d229afa7420b81c0c12e0d44baa46bbbd16f25fd2e47b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAlCyIlAACgkQcXOrnRGRc46nbAD8Cx3blKZaIzuck8ceLdy9Nygy
+WzlA5kIWnhBQmIfE/Q0A/RR/BLaUtdBx+1K/aQeJNv3HDeyM/6xbHpQn72bfn/P3
+=R2hM
+-----END PGP SIGNATURE-----
diff --git a/media-libs/FusionSound/files/FusionSound-1.1.1-libav-9.patch b/media-libs/FusionSound/files/FusionSound-1.1.1-libav-9.patch
new file mode 100644
index 000000000000..35295d37cf89
--- /dev/null
+++ b/media-libs/FusionSound/files/FusionSound-1.1.1-libav-9.patch
@@ -0,0 +1,21 @@
+diff -burN FusionSound-1.1.1.old//interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c
+--- FusionSound-1.1.1.old//interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c	2012-11-25 14:41:46.306782213 +0100
++++ FusionSound-1.1.1/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_ffmpeg.c	2012-11-25 14:46:14.151772465 +0100
+@@ -1197,7 +1197,7 @@
+           return DFB_FAILURE;
+      }
+      
+-     if (av_find_stream_info( data->ctx ) < 0) {
++     if (avformat_find_stream_info( data->ctx, NULL ) < 0) {
+           D_ERROR( "IFusionSoundMusicProvider_FFmpeg: couldn't find stream info!\n" );
+           IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
+           return DFB_FAILURE;
+@@ -1218,7 +1218,7 @@
+      
+      data->codec = data->st->codec;
+      c = avcodec_find_decoder( data->codec->codec_id );
+-     if (!c || avcodec_open( data->codec, c ) < 0) {
++     if (!c || avcodec_open2( data->codec, c, NULL ) < 0) {
+           D_ERROR( "IFusionSoundMusicProvider_FFmpeg: couldn't find audio decoder!\n" );
+           IFusionSoundMusicProvider_FFmpeg_Destruct( thiz );
+           return DFB_FAILURE;