Pulled real patches to fix against libav-9 noticed by Alexis Ballier (bug #443256 by Diego Elio Pettenò).

Package-Manager: portage-2.2.0_alpha153_p6/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

6 files changed, 103 insertions, 26 deletions

diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index a514493f0abd..41c2bb75a03d 100644
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/xmms2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.32 2013/01/16 12:35:31 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.33 2013/01/18 08:05:25 slyfox Exp $
+
+  18 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/xmms2-0.8-ffmpeg-0.11.patch, +files/xmms2-0.8-libav-9-p2.patch,
+  files/xmms2-0.8-libav-9.patch, xmms2-0.8-r1.ebuild:
+  Pulled real patches to fix against libav-9 noticed by Alexis Ballier (bug
+  #443256 by Diego Elio Pettenò).
 
   16 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org>
   +files/xmms2-0.8-libav-9.patch, xmms2-0.8-r1.ebuild:
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 9a5aa3eca7f0..7c401351a49a 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -4,19 +4,21 @@ Hash: SHA256
 AUX xmms2-0.7DrNo-XsParse-3.patch 1544 SHA256 9b690bec7c5e82eb905c95f01bdc321785caf72f88308d08b78f90e231304160 SHA512 cf81d57bce79015c00421d47e966ff0561b36a2908ba34702fdb38f916101ddbd5f7d45dc002ad5e20eec6f59688ed7ce72f9c5b44aba235b0ae19b5756a72e5 WHIRLPOOL e0f98aa483ddc121a139575d230642fd3b48a2723b9859b9e41abc266fede24bc52fcca0f04c4518d6ce8d723d65bb622dc0f5a5d9c4130785157f2e19802409
 AUX xmms2-0.7DrNo-missing-protos.patch 4252 SHA256 76c5953772fa9a2108384539235cbd5127948f8f7a0a5d354faf99b7f916dcd3 SHA512 b84248ba23071bf4e268ba09668fc1099991e737a3153572e125948540aa4e37542db3bac29f3fcd8336c2e34e70cc53d057a66bb6c1b6172ef3f3570151b0e6 WHIRLPOOL c2ff6541208abecd291c0879cba2e84ba1afc1a0c0ef38315ba34dddd543fead46d423144a8710cfc3d025635f1c1ff1e7f63331aa555ef8e9ab6699612dc127
 AUX xmms2-0.7DrNo-windres-build-fix.patch 1929 SHA256 f71546af163b017678282a9ded8ec8e70ea486b95f96c68a62ad5a3edf0db39f SHA512 c96aae6e39b326a7b32e14578e193b4865e500ea702cccb467d4d4689e893ec49e6266bec321f7c40b88c866e048fe8cc52796242b194418c7a50c3c7c2f162f WHIRLPOOL a5f7f0b811466f6b88e8a97ccf84b671412d8cda8bc050576213cab42e8c62aeda4c713dd47da398ad2350ceb708e0a8d9b0efa6acae11bdec2b08189fafc2e8
-AUX xmms2-0.8-libav-9.patch 583 SHA256 6bd9c802e8aee605fdb64fc3805ae40ef5213a969353dc8b4a1e2243b968169d SHA512 79419d249e12f6fe888dc740487a32f64ff024f3677931ced3b4f74745c45028c4af0ec91339da854dc8dae909e7e9a8b16397514d521d058e5dc8f020497cc2 WHIRLPOOL 951a2576c5556cc1a9393159b9eb434e06af56f00110d5e070b63c2e9b4cdee0fcf589f5945a27e0c5b2e731d9c61cf1e811149a5ce247822f12bbaa1e08e294
+AUX xmms2-0.8-ffmpeg-0.11.patch 638 SHA256 3fccbf6d730f56a88fb570715b424759b7d2767aa0fc51053a75dbf34606947f SHA512 5b54c9284577f57da5b1ab6f51f620fe20a2815cc38dfca2437aaac9424917ddbba2d174576d619d36c18ec5ffa194dcff7333e1e68c27bf8abe48f3c6a464a7 WHIRLPOOL de4e6337292d115cf127ae9aecaed5e4bbb840dbf30eb577a75db95df43e648ba7e5f835ca8a4924c890473df0cb52308319262802dc6c97213053542f23c3cb
+AUX xmms2-0.8-libav-9-p2.patch 1823 SHA256 107b2c23e71bf06c8d304808cb97fed44776c57d7a0b3600652ea610c162a290 SHA512 fef46159dc8d40ee05d091076e78f5ffa8d1c93ee2e476110fa96f4f52f79c05c5177192828258ab6e4ec75118ea382458546325692110c819a5fed3cf2c198c WHIRLPOOL cf57cd221c0963212d2699f23dd965db7d77d6aaccde44cadc3f6149f29ef43a152ba672900be0c475614b19416713c5b35e3478fd6fd33c38b0e1e543a0c2df
+AUX xmms2-0.8-libav-9.patch 526 SHA256 43bcee24cb163524519d8abc07b2729e20628ef9d25ed21cadae6f6d653baff5 SHA512 2a6218fb8a27c89321c08025c110425ed1deae0f498bca9a9b306f2848c605a964aef05adcb1f3fd006786fda0b88d8a6d701c4fc8834cb7fb0fe561d8f9e5fb WHIRLPOOL 0c06b8bd2fbab37054bc3063f97ec4f8812c9ad324e9655eca8c398c2e58fc13628ffe751328efa17fd4f953b3ced177f4040a406e8c096010b1290d145dd2b4
 AUX xmms2-0.8DrO_o-waflib-fix-perl.patch 1649 SHA256 bea1cb2c5fe499e385851a2cc7900658266187e821f505a65d4d27393967f44b SHA512 5c7161245199381af80ca1e24edbe0da27f2f11e76a13f504e0051a8de4369d25075781d80c80f4246d21afb508306897331ecc9f5f3c32d0ade24921a829ba7 WHIRLPOOL 9bb58587dcc5588e0cd5fcb3beb95e563654106880f8e42a01d1b01d1f71e40d96a9084eea86239d03b671d2efa67dd8fab27c55f1043798e39d803eaaf2a43e
 DIST xmms2-0.7DrNo.tar.bz2 1519973 SHA256 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c SHA512 e991c0c5d598ccfd868b81ae932255352bd3be014f86e05f1fa782d240b7ce059054cad746cf52c8c383058feba1fdf5675c43ec6495955c06b6e5e9f949ca01 WHIRLPOOL 691446c7cd5b5fd5bcde88561cfe7102d58d5d2a863a340181863703b9369f024937eb12d00983ba2d650268823759663bebc25b3c035103ee710ea1620a9a8a
 DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8 WHIRLPOOL 741dd85b8c065eea799675588a8d4c389c47fa3dcf129a9fd799bb5da0ffcb1eeffa45cfaca40af7c505908818b5e7960c1a54e947f53358edeb43841f2eaa5c
 EBUILD xmms2-0.7-r2.ebuild 6239 SHA256 d5c60070e23e70ef42bcff960304a3c99e7f911de2c98c9936a89b84974babcb SHA512 35cdfc50f79cc6c0d27912aeec3f81fa08c5a64b85918024da9ed40ac320d50576ee27c7968a2e725595995f9ad7175f701a2a58f15628dd9b3d0306694b53de WHIRLPOOL 0a651b9933c874673df635e5f9f70c49c027ee6efe5d5aab9c7930ee34e83c06d82941eea78634cd3729b7ef6995be089a825958aba65b9effe8003808de1277
 EBUILD xmms2-0.7-r3.ebuild 6475 SHA256 dfc21331365b7a6047f189eea1ca17b3212c9d8f079b0c3b6beab2b1b44526f5 SHA512 e80749311fb6a25adf8acdeeff5c4f4742c608d177a490191da33ec7669a4c78f07d735af1f9af5567ef699dea94781a60c4dc31878a4ae9f5a5dce5f0c55e1c WHIRLPOOL 61928d8dc09d520905da68bd6756d598240430cd96c0cc88d6db17e7e0fac3947ebb1f37dbed3ef4561f235e68c0276eaa6f059dfa9599b493b8bbfe6294db3b
-EBUILD xmms2-0.8-r1.ebuild 6948 SHA256 5d3d3e56762cc02f1e95f480991313d6505d346168bbce75d25aa688dc0e3b10 SHA512 657b7ec18de6e4bd9bd3cf6682e1f801fda18f3880b89adb08190c26094635f93d0d003a0e61749635032ceced8a1875346a4bd3a74fa0694215cf43d0ec4098 WHIRLPOOL cbf7f3b2357a6cfcda7708b1f134139a7277e48dfd089a8218c603d8a3d3a4a0782f95f9a5f9f071ee78a509af330ccb3f9cf9f992509b7f23a8dff66f936b28
-MISC ChangeLog 5611 SHA256 3fcc173d18a39ed4c9ae919bac5e2f0fc60259568b4e7e224ef4a55e0e771277 SHA512 dfcd0cc2340e40396ebc79eee616c46efcc26b9432c9fb6d9fd03cad9b0d8afc39b813204b098e24925df5fdd3ef9b207159d3aacde00ac3a3668c425fe69927 WHIRLPOOL f5fd979db3eac6293d3de44393bcc47d2f35b017ee73fe66d2f6b694378044330f8d727cceaf37cd97418ac268855e8d7db0c43912973fcc26a6d136f5c1e490
+EBUILD xmms2-0.8-r1.ebuild 7053 SHA256 f151be69f7e1a936ca1de850b6ec5488b09f5783473d82af48e91116b1e19538 SHA512 a9545222a59a88b78a1737dcd764cff98efe6d0e456b3f7909b1e16db65ad13595dd0e0aac0264a84b63db925145452832f50fc91fc9a6cbf754c3aa68e8a742 WHIRLPOOL ba5b0cdd134918f70ee11136a1bdbadbfcfcb91d80dd5425e6ec6d7f67ef87e893a84d2a6c44e46943bc547e7edfd984cc11edc74120facfd3b7bec26c56701a
+MISC ChangeLog 5904 SHA256 6dc12fc2becf776113e64b0416067be4ad01311a67cbe86fafdb7fdf8e46be33 SHA512 83231c89fad094408d6747e293e5870a105c6eda00129ba76a8b7cd373fb816f7a9cb76dbeef53a91affa4ccd722a62d3200194b5e69c9f1b1951de41af92f69 WHIRLPOOL 6a45016d14e052538b017ad19d89716a374a1d405ff5e2c0f288f75ff3766619d40ece0702a028ad38d24845048abd7af70fce974648500aee90ce29a80783a3
 MISC metadata.xml 2435 SHA256 f7fb6c7694bf849149c7f3f3f2aec711543d994f782b95dd75ca1759bcc1e22a SHA512 a10a9821af91f0935adb73a0c7c315178c92f8821aede4d0da3a5ea1348280d02006027c32298fcdaefbe2e888c3416881fdd65800e12e340caf73d2ae0326f4 WHIRLPOOL 1e128aaf2c232dc22ed7b02777840f2a480039dfae65e36e586ae42785295639d4ee6798061c13bf2ce085b318ae8a84327f49dd560414a248ff2993a3736fe5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD2npgACgkQcaHudmEf86qykACfWfyos+bK3aGI0GEF7Woomg2g
-stsAn13CqewcQ8bvj0J0EGLI6+JvFKh9
-=Ej6A
+iEYEAREIAAYFAlD5AjcACgkQcaHudmEf86qtmgCgh1SU9wuqmMkuiRsWZTPaFLqX
+/usAn1Zs8HH+rtPBYWEydO7GvIW+6eS8
+=noTn
 -----END PGP SIGNATURE-----
diff --git a/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch b/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch
new file mode 100644
index 000000000000..bac2fba7e9fd
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch
@@ -0,0 +1,18 @@
+commit 8743e0c3a4f06053d89b74e40a362ba4949ed53c
+Author: Juho Vähä-Herttua <juhovh@iki.fi>
+Date:   Fri Jun 8 09:30:47 2012 +0300
+
+    OTHER: Quick fix to make XMMS2 compile on ffmpeg 0.11
+
+diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
+index df87b27..f1b1af7 100644
+--- a/src/plugins/avcodec/avcodec_compat.h
++++ b/src/plugins/avcodec/avcodec_compat.h
+@@ -65,3 +65,7 @@ typedef struct AVPacket {
+ # define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
+ #endif
+ 
++/* Calling avcodec_init is not necessary after 53.04 (ffmpeg 0.9) */
++#if LIBAVCODEC_VERSION_INT >= 0x350400
++# define avcodec_init()
++#endif
diff --git a/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch b/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch
new file mode 100644
index 000000000000..db55bc8a6933
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch
@@ -0,0 +1,50 @@
+commit 4781c507be338fe151e08af7d13267a24cbd7572
+Author: Juho Vähä-Herttua <juhovh@iki.fi>
+Date:   Fri Jun 8 09:47:03 2012 +0300
+
+    OTHER: Fix some deprecated warnings in libavcodec
+
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index 242e333..c846d64 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -208,7 +208,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 		}
+ 	}
+ 
+-	data->codecctx = avcodec_alloc_context ();
++	data->codecctx = avcodec_alloc_context3 (codec);
+ 	data->codecctx->sample_rate = data->samplerate;
+ 	data->codecctx->channels = data->channels;
+ 	data->codecctx->bit_rate = data->bitrate;
+@@ -219,7 +219,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 	data->codecctx->codec_id = codec->id;
+ 	data->codecctx->codec_type = codec->type;
+ 
+-	if (avcodec_open (data->codecctx, codec) < 0) {
++	if (avcodec_open2 (data->codecctx, codec, NULL) < 0) {
+ 		XMMS_DBG ("Opening decoder '%s' failed", codec->name);
+ 		goto err;
+ 	} else {
+diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
+index f1b1af7..bc770f2 100644
+--- a/src/plugins/avcodec/avcodec_compat.h
++++ b/src/plugins/avcodec/avcodec_compat.h
+@@ -69,3 +69,17 @@ typedef struct AVPacket {
+ #if LIBAVCODEC_VERSION_INT >= 0x350400
+ # define avcodec_init()
+ #endif
++
++/* Map avcodec_alloc_context3 into the deprecated version
++ * avcodec_alloc_context in versions earlier than 53.04 (ffmpeg 0.9) */
++#if LIBAVCODEC_VERSION_INT < 0x350400
++# define avcodec_alloc_context3(codec) \
++    avcodec_alloc_context()
++#endif
++
++/* Map avcodec_open2 into the deprecated version
++ * avcodec_open in versions earlier than 53.04 (ffmpeg 0.9) */
++#if LIBAVCODEC_VERSION_INT < 0x350400
++# define avcodec_open2(avctx, codec, options) \
++    avcodec_open(avctx, codec)
++#endif
diff --git a/media-sound/xmms2/files/xmms2-0.8-libav-9.patch b/media-sound/xmms2/files/xmms2-0.8-libav-9.patch
index 608fc66cf96a..9c13ec41e025 100644
--- a/media-sound/xmms2/files/xmms2-0.8-libav-9.patch
+++ b/media-sound/xmms2/files/xmms2-0.8-libav-9.patch
@@ -1,21 +1,20 @@
-commit a1fe1f45c19c67ed80c05d8276b88d1296f984d2
-Author: Raphaël Bois <virtualdust@gmail.com>
-Date:   Sun Nov 25 17:55:12 2012 +0100
+commit d61dbc522f4024debb1f99de758de9e5cc7c0936
+Author: Diego Biurrun <diego@biurrun.de>
+Date:   Sun Nov 25 17:33:02 2012 +0100
 
-    OTHER: Add Diego Biurrun in AUTHORS file
+    OTHER: Support for newer libavcodec versions
+    
+    Add missing #include
 
-diff --git a/AUTHORS b/AUTHORS
-index 9d05e1a..3b84fce 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -37,6 +37,10 @@ E: xkr47@outerspace.dyndns.org
- W: http://xkr47.outerspace.dyndns.org/
- D: curl_http updated to xforms, icymetaint plugin (extracted from curl)
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index c846d64..114d7df 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
++#include <libavutil/mem.h>
+ 
+ #include "avcodec_compat.h"
  
-+N: Diego Biurrun
-+E: diego@biurrun.de
-+D: Support for libav 9 in avcodec plugin
-+
- N: Magnus Bjernstad
- E: bjernstad@gmail.com
- D: PythonAPI fixes.
diff --git a/media-sound/xmms2/xmms2-0.8-r1.ebuild b/media-sound/xmms2/xmms2-0.8-r1.ebuild
index 1232635df6dd..8cac9b681311 100644
--- a/media-sound/xmms2/xmms2-0.8-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r1.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-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.12 2013/01/16 12:35:31 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.13 2013/01/18 08:05:25 slyfox Exp $
 
 EAPI=3
 
@@ -107,6 +107,8 @@ src_prepare() {
 	cd .waf* || die
 	epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch
 	cd "${S}"
+	epatch "${FILESDIR}/${P}"-ffmpeg-0.11.patch #443256
+	epatch "${FILESDIR}/${P}"-libav-9-p2.patch #443256
 	epatch "${FILESDIR}/${P}"-libav-9.patch #443256
 
 	if has_version dev-libs/libcdio-paranoia; then