Fix build with ffmpeg-0.11, part of bug #443208

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 33 insertions, 21 deletions

diff --git a/media-plugins/vdr-pcd/ChangeLog b/media-plugins/vdr-pcd/ChangeLog
index 883d052f7b77..b7ea9776661f 100644
--- a/media-plugins/vdr-pcd/ChangeLog
+++ b/media-plugins/vdr-pcd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-pcd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/ChangeLog,v 1.4 2011/04/06 17:20:39 idl0r Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/ChangeLog,v 1.5 2013/01/26 14:44:11 aballier Exp $
+
+  26 Jan 2013; Alexis Ballier <aballier@gentoo.org> vdr-pcd-0.9.ebuild,
+  +files/vdr-pcd-0.9-ffmpeg-1.patch:
+  Fix build with ffmpeg-0.11, part of bug #443208
 
   06 Apr 2011; Christian Ruppert <idl0r@gentoo.org> vdr-pcd-0.9.ebuild:
   Use the new ffmpeg virtual, bug 362103. QA Fix: Assign RDEPEND. Switch to
diff --git a/media-plugins/vdr-pcd/Manifest b/media-plugins/vdr-pcd/Manifest
index e497e39cfc52..ecaea509e883 100644
--- a/media-plugins/vdr-pcd/Manifest
+++ b/media-plugins/vdr-pcd/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST vdr-pcd-0.9.tgz 19927 RMD160 7d001b11e8748af5838d658fdeaf15e21ace065b SHA1 3b18675f1800673db1d797194434a7ff38d4f3dd SHA256 92e29d5aceab1a61416a8d83c3e9eeace30cdf9fb82e476cb3db8eac5c169d82
-EBUILD vdr-pcd-0.9.ebuild 847 RMD160 5c285c761e42b0ee77bc1842115c731306f3072e SHA1 425cfebd64e94c5f95eb0eca0e6075d54e203b54 SHA256 6f09fb6dff192a760a71e19ec1803d79bcc391ba9c6c545cee856d1e6001e9d5
-MISC ChangeLog 786 RMD160 8427f98b000cb3719785f6a37d1054c389a1be66 SHA1 cac9be7d6932cf48fa24f4d76fa90c5a54397ff6 SHA256 26e5f4606b08b9a79870bd10a6f884c70b497ed54b0550dda61ecd5e415b45b9
-MISC metadata.xml 448 RMD160 e2b6269c881bc2ce4f191286e967351c1a858365 SHA1 b64bb6b5788bea9e3c458b9cce285822e4e42575 SHA256 06f69e94ea88e7519c16c60b4e1bef1ff53cc17d4d35393c689b0103e5605d0e
+AUX vdr-pcd-0.9-ffmpeg-1.patch 335 SHA256 8558bdcae36eb4cd774d8feb0266b37245d87d2e0c3d59434666833a32170129 SHA512 30497f524c25ea852fd91a0db46410ab064292024d5da2d4fc5e80187397c237f6ef0abccb15efbe1da54c68f4f2aabe91997c45f9f2239bc5ac6b357b97a2bc WHIRLPOOL 87c43ecd1329d29b4f6e7f6ff48f25d9656edd43bd39a32cb922df93719765adf888c1795280937c7ab2f10b08528dc2b5de0fbd00e52da23ac1465df71b2114
+DIST vdr-pcd-0.9.tgz 19927 SHA256 92e29d5aceab1a61416a8d83c3e9eeace30cdf9fb82e476cb3db8eac5c169d82 SHA512 8b02eef0ed75467822c876b72c9e2c2c01d060a1fc7b8c6f3a224b175042a5f2215b4e0d8d136be867533406748da3cfb871b1b0716e7e73d10cbf96bccf28cc WHIRLPOOL ab15b873f7c13ecb05b76f7efd61e33d32d691660a913b044a46f48c5f28d5a984a3837a2228bd40bddd581112317b6577efd97be5711404234ca30697c36596
+EBUILD vdr-pcd-0.9.ebuild 825 SHA256 731ac86ee57bd36904af0537a58e237757f8e31fd9f9dbe859ffb3ee0df3beaf SHA512 482d0745188534351ba22b60abb18ea3aed05966bd44077962a0ade82e6623701307ebdd16a1a766286a930e34ff988a30ffffbe7d5d2d58a2a0a945e5c72c62 WHIRLPOOL 59906e68bedb9f809b602e11f0bf1e4fc136dd6852ea7a57deebc1862d796f17ea51480a7819ec22fbe18b6ae500923bab839962127d5867a012b37890318ecd
+MISC ChangeLog 949 SHA256 3716a3ded18a594d6f7d795a92c258538dadf4f4609d88e68f048e9a724c5bec SHA512 c1e90660f377763208a8ef05021f080c480bf72b4c7b2df62e88a1e166b833ad5fb5bfbab61eb9c82a4858ce98503ad01fc74e29251082d40c77890bbaea3d00 WHIRLPOOL f7e94464267121da6f379ebf0327f4ea122314fd634ede5bd9a8a60d832cf45fbd39f6eda9860d8fe76d371ca7fd1ba11e6ed21943afbdae64e17c4573a1512f
+MISC metadata.xml 448 SHA256 06f69e94ea88e7519c16c60b4e1bef1ff53cc17d4d35393c689b0103e5605d0e SHA512 6717b08fe3eedc86e53413cfdbf8b2f6b38a3739d2919a88f51a48260acb480d120e3002fe9d23c69bc99295186858416e6b182c68c280fa93a12ddd640dc913 WHIRLPOOL 9d6a0d82fc468f30a4a72eaa03a90115fc8f9a4a2aa877adad0a3d5d15335234676fe03b096929ff6a628a6f97612571d818cd0f422fcbfd63a4561e71ddcfb9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNnKDtAAoJEMOx0zmdw4Z1FwUH/1eZl+vyc8Z3OjsSexMHQuFO
-GQTo8Q5zytIIjebIYWa/4veBbvy4TW/W5wQjX8kp3djUczdI0bMUIFd3OiPAEC2Z
-knzT5TkE3mRHsFeI5Xb/oagzXEfibHF+x3CyuAR2GWtNVxvC42eLPmUfJkwNrwtt
-nUicXy9e/GZIuB8A8vtBWZbdFK5+Z6HocizVdt57m205RhnocIcNIWnWAZPPVXkj
-n8XC3933sPj3fSn+C9aPAdWjssT/Ov3v7AnWwLLvwkbRqlQnJR3zV7cdEWh+cKQd
-Xh2Q6g45WEQiYyVF8ATID62zJrTcr2mWoNnQka3R/2myOyNmTpH8sBVeTe7E3gk=
-=Q4Zb
+iEYEAREIAAYFAlED67wACgkQvFcC4BYPU0pvLgCgsQHJ9iJaU4hHmgqbRIJT11Gx
+SgAAn1smlTVxRfWkmSTY0UWlzB8OwZ0o
+=mCzQ
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch b/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch
new file mode 100644
index 000000000000..f1599bc918a9
--- /dev/null
+++ b/media-plugins/vdr-pcd/files/vdr-pcd-0.9-ffmpeg-1.patch
@@ -0,0 +1,12 @@
+Index: pcd-0.9/mpeg.c
+===================================================================
+--- pcd-0.9.orig/mpeg.c
++++ pcd-0.9/mpeg.c
+@@ -44,7 +44,6 @@ cMpegFrame::cMpegFrame(bool Pal)
+   bufferSize = 0;
+   mpegSize = 0;
+ 
+-  avcodec_init();
+   avcodec_register_all();
+ 
+   if (!(avCodec = avcodec_find_encoder(CODEC_ID_MPEG2VIDEO))) {
diff --git a/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild b/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild
index e9619963f4e5..363d7290b804 100644
--- a/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild
+++ b/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild,v 1.6 2011/04/06 17:20:39 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild,v 1.7 2013/01/26 14:44:11 aballier Exp $
 
 EAPI="3"
 
-inherit vdr-plugin flag-o-matic
+inherit vdr-plugin flag-o-matic eutils
 
 DESCRIPTION="VDR Plugin: adds the functionality to view PhotoCDs"
 HOMEPAGE="http://www.heiligenmann.de/vdr/vdr/plugins/pcd.html"
@@ -16,15 +16,14 @@ KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.4.4
-		>=virtual/ffmpeg-0.4.9_p20070616"
+		>=virtual/ffmpeg-0.10"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	vdr-plugin_src_prepare
 
-	if has_version ">=virtual/ffmpeg-0.4.9_p20080326" ; then
-		sed -e "s:ffmpeg/avcodec.h:libavcodec/avcodec.h:" -i mpeg.h
-	fi
+	sed -e "s:ffmpeg/avcodec.h:libavcodec/avcodec.h:" -i mpeg.h
+	epatch "${FILESDIR}/${P}-ffmpeg-1.patch"
 
 	# UINT64_C is needed by ffmpeg headers
 	append-flags -D__STDC_CONSTANT_MACROS