quick patch to fix build with ffmpeg2; bug #536232

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 30 insertions, 9 deletions

diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index 822755bc4124..4c310248694c 100644
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/xmms2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.37 2014/08/10 21:13:03 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.38 2015/02/06 14:09:08 aballier Exp $
+
+  06 Feb 2015; Alexis Ballier <aballier@gentoo.org> xmms2-0.8-r2.ebuild,
+  +files/xmms2-0.8-ffmpeg2.patch:
+  quick patch to fix build with ffmpeg2; bug #536232
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> xmms2-0.7-r2.ebuild,
   xmms2-0.7-r3.ebuild, xmms2-0.8-r1.ebuild, xmms2-0.8-r2.ebuild:
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index e5857be73d6f..6d7ac7f07eb5 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -6,6 +6,7 @@ AUX xmms2-0.7DrNo-missing-protos.patch 4252 SHA256 76c5953772fa9a2108384539235cb
 AUX xmms2-0.7DrNo-windres-build-fix.patch 1929 SHA256 f71546af163b017678282a9ded8ec8e70ea486b95f96c68a62ad5a3edf0db39f SHA512 c96aae6e39b326a7b32e14578e193b4865e500ea702cccb467d4d4689e893ec49e6266bec321f7c40b88c866e048fe8cc52796242b194418c7a50c3c7c2f162f WHIRLPOOL a5f7f0b811466f6b88e8a97ccf84b671412d8cda8bc050576213cab42e8c62aeda4c713dd47da398ad2350ceb708e0a8d9b0efa6acae11bdec2b08189fafc2e8
 AUX xmms2-0.8-cython-0.19.1.patch 1726 SHA256 be06ffe3ffa6d78381e0b81426ae192493a73e6131e17b577f2f5842102a5114 SHA512 8ecfc40196bf8643bde54aaaf21197746dcc31930da68deb7dce48ff0285640bd57a7218788e7dde937af434080a7aaf7cf900193e129cc1b4f6a077b53a2494 WHIRLPOOL a94421a30880dbaad8dc7113f0a091f2b6d097b4deb89490b145ac38000dabf7c0db371c5bfd77a3502bb126ecdd1dc698f7c59fbd135cd689f1249cce49233d
 AUX xmms2-0.8-ffmpeg-0.11.patch 638 SHA256 3fccbf6d730f56a88fb570715b424759b7d2767aa0fc51053a75dbf34606947f SHA512 5b54c9284577f57da5b1ab6f51f620fe20a2815cc38dfca2437aaac9424917ddbba2d174576d619d36c18ec5ffa194dcff7333e1e68c27bf8abe48f3c6a464a7 WHIRLPOOL de4e6337292d115cf127ae9aecaed5e4bbb840dbf30eb577a75db95df43e648ba7e5f835ca8a4924c890473df0cb52308319262802dc6c97213053542f23c3cb
+AUX xmms2-0.8-ffmpeg2.patch 455 SHA256 5fa4f735ef74a2de49150520fa3ba62abff9aca2ac7f84d18b51a55e73cd7e53 SHA512 6aa567c3d823780c7fc8951735f59bcbe3345989e077d3ea6d8100acedd3ebf30523f05152fb80827c236ff83674bb47ca0917b5d2331c4d79c4502e41b365a3 WHIRLPOOL 92101bff32090216545a226c2d76f342931a5cfc9478e568b92cae0a3565ee5940e6f532ef9ebcd689af44a85d171486a659d05a449a5f36073592c145458a08
 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.8-memset.patch 685 SHA256 dd85003c15c4ff0e122422b154d4a8fa5f3371ae3673b23a89c77848e43d47d0 SHA512 aa45c8f4e04e7b5edae131ac60baad265d2fdbc6297fc2595d2caedc0205956ae551408ea208daec857d1cb44a1698c663f8fc6dcb16d3f1a998b12380a562e4 WHIRLPOOL 78c4df892814ee857fff81b8c3357c83f932521a5f17c86999dc066e13a7dd7bd406f9521be5dd133ec93e851e7d34cbd5e30a446169543c57011137ead2f42e
@@ -15,13 +16,13 @@ DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b87
 EBUILD xmms2-0.7-r2.ebuild 6238 SHA256 f34a2d4c0a9c5b7a2080f2df0c28c760ec16694133ef228341dd737c097a1381 SHA512 04943258ff734a580a05dd88d71895cba226257cb8415ff891c3b0dd9be9e26b93370a74dfad7c515336f46a165fb8c46df924a93a00aeebbc5cdf9c29313166 WHIRLPOOL e4626ef4a149447e00db2764c7486449cd741146e308d3e84dde7f497d16d2a1abdbf7f4feb5c43b89429ce01978f289cfdb4248370e5770ef936d9782d7a7cd
 EBUILD xmms2-0.7-r3.ebuild 6474 SHA256 ba6ccfa218456e087abc2df3110f08d87be754a332d6a48e5e65f4dbca5371a7 SHA512 c7353700f02e09382edd671189a3835dce06705c02a8b3b72e711fd00a1926a6451b4c7772fa61fe875ce8a16fa2f8653ef27fcfadc0495161e27e659dc942a9 WHIRLPOOL 41941cf6763a525c892cda293891bf7dec97496a7388ffef406ba8a6659937c04897889e6e99e3366fda795b604ec51bfa074595f42106219f3f11106ca25929
 EBUILD xmms2-0.8-r1.ebuild 7099 SHA256 c526ec487bf0b4aa6412c1bd3c21014e8dfce00c0bfe4dab2b52a80551d90111 SHA512 303e99f8fde181c2cff9594e38df39ffc7820bb0c5f8e551d8b57359af104a90f103a7b1819d12845a4325aefa329eff44aecd9e5bfc16664078546c4795665e WHIRLPOOL ad18c79c62f61b4a9d195408c2518ed02735d09bb4b8c3cf8a73b40a2db3bfee1cbd18c460aa07182b7f3ad410dd7ff45149c25f17d7b19de3a4e73714da679f
-EBUILD xmms2-0.8-r2.ebuild 7102 SHA256 4f503c0333834afb5b64d329d289678d3a7ac9568b25f8df3c439b6879694cd5 SHA512 3f214cd88560787c371263577c9f965bf109ef283ba8156d91c2f0c44b6ae1c3ae7237ab34703327193a89fc2ab5e0b4fe4b0296ad333968e87e0f985a6d4198 WHIRLPOOL bac2e3410c8224646ab98776694ed86b432342e6f269097e3c5b8cdd750225f48fc42dbc6517f6bcc5d06553e36d6fd6b87596431210eb3feb54fb52c3561bbf
-MISC ChangeLog 6724 SHA256 0470af8393a5b3a1a5155fde89c9303642ba2a854c7735d7ce4c653cb0ebd25c SHA512 c685f17f6e858b3d001b5ff4a52607751b744299e26a454d4b89755a625a5524ce368c1aaaa22dead8813a31ae62f78c01447f6250fb19eec186d223a9522797 WHIRLPOOL fb9c89e74aeb29d747569094c545ca2463aa90ff24599481d8ec6399f447f1080ec96d83f23d5dfc29fcdcf3e5812ab2e28c5c294805144d141a41f2d7bed1b0
+EBUILD xmms2-0.8-r2.ebuild 7153 SHA256 689eb840f3e1df04040962c45d4596f151578c6c1284d9fdef91e65bba2fa91f SHA512 7ff7561c2b604869412f9412dd03609ab275f4d18abac47364c51d4b06c41cd9b53e6d82a7d6e0fe9fdfcf42c584c5d1f0987f1bc5465cc93452aec3ac2d6e4e WHIRLPOOL dbaf350688358800024edbab5d1a6838e704625fd4014f848d909bb7e8885058d8e319846b572d8339ce53517ec8b4609cc10c90fa9b1940be4fa141eee4b98e
+MISC ChangeLog 6887 SHA256 e013f8461e1a591b130f7112dd1457333fd9062dd7e4ce2b13c24d656affbddd SHA512 f7e765cc092953761d5873ce4e45421e91401877fbbcd7693d9e56ee33c822b8321270c0cb7d447ecc252dd08610372c7ab38ecec65f96684b2faa67cfa5b92f WHIRLPOOL 8e6cb206d5efb345dbb13ee969c9ede33b7554fb5c8b88f4db232ee33f8d3aed3983a84b76195082293185eac47a4ab5c68db3f6d71c68571b67fe696e1935c9
 MISC metadata.xml 2435 SHA256 f7fb6c7694bf849149c7f3f3f2aec711543d994f782b95dd75ca1759bcc1e22a SHA512 a10a9821af91f0935adb73a0c7c315178c92f8821aede4d0da3a5ea1348280d02006027c32298fcdaefbe2e888c3416881fdd65800e12e340caf73d2ae0326f4 WHIRLPOOL 1e128aaf2c232dc22ed7b02777840f2a480039dfae65e36e586ae42785295639d4ee6798061c13bf2ce085b318ae8a84327f49dd560414a248ff2993a3736fe5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn4F8ACgkQcaHudmEf86phAQCfTb2uEtjaGWp7gcUjyOOgyODj
-xYsAn3nhK8P4F95kUujXXjVB/dx+wVmj
-=UXOf
+iEYEAREIAAYFAlTUywUACgkQvFcC4BYPU0ockACgmvr3hkc+cqX8ZGkGuILvY+lT
+oQsAn2oD8Y484G85j4GWgZP3THrCjVPW
+=ayqb
 -----END PGP SIGNATURE-----
diff --git a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch b/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
new file mode 100644
index 000000000000..2e9fac380ea0
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
@@ -0,0 +1,15 @@
+Index: xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
+===================================================================
+--- xmms2-0.8DrO_o.orig/src/plugins/avcodec/avcodec.c
++++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
+@@ -29,6 +29,10 @@
+ 
+ #define AVCODEC_BUFFER_SIZE 16384
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ typedef struct {
+ 	AVCodecContext *codecctx;
+ 
diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild
index fecb6352b708..7efb7449f168 100644
--- a/media-sound/xmms2/xmms2-0.8-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r2.ebuild,v 1.4 2014/08/10 21:13:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r2.ebuild,v 1.5 2015/02/06 14:09:08 aballier Exp $
 
 EAPI=3
 
@@ -112,6 +112,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}"-libav-9.patch #443256
 	epatch "${FILESDIR}/${P}"-cython-0.19.1.patch
 	epatch "${FILESDIR}/${P}"-memset.patch
+	epatch "${FILESDIR}/${P}"-ffmpeg2.patch #536232
 
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die