fix build with latest ffmpeg

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 56 insertions, 14 deletions

diff --git a/media-plugins/vdr-markad/ChangeLog b/media-plugins/vdr-markad/ChangeLog
index 913fa136c724..cd596e44d028 100644
--- a/media-plugins/vdr-markad/ChangeLog
+++ b/media-plugins/vdr-markad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-markad
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.8 2011/04/06 17:13:37 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.9 2011/12/17 14:26:49 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org> vdr-markad-0.1.2.ebuild,
+  +files/vdr-markad-0.1.2-ffmpeg.patch:
+  fix build with latest ffmpeg
 
   06 Apr 2011; Christian Ruppert <idl0r@gentoo.org> vdr-markad-0.0.8-r1.ebuild,
   vdr-markad-0.0.9.ebuild, vdr-markad-0.1.0.ebuild, vdr-markad-0.1.1.ebuild,
diff --git a/media-plugins/vdr-markad/Manifest b/media-plugins/vdr-markad/Manifest
index 6cadf1032dfe..4aa34d34bdf4 100644
--- a/media-plugins/vdr-markad/Manifest
+++ b/media-plugins/vdr-markad/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX vdr-markad-0.1.2-ffmpeg.patch 2039 RMD160 90d8f595050507c265e6c8d89de42a7fc7f53002 SHA1 85f95241bde38d754a1e71bb5840df42f906bd79 SHA256 51933e4233d094afe9cf583205f1b0cf5f6ee602213092edc4f0359826aaf347
 DIST vdr-markad-0.0.8.tgz 83428 RMD160 7bb59217b1ba2e90f3ea4dbf0436cddb8151eaf2 SHA1 16314cec8c0c9b0419ac651da4712ada41bd3bdf SHA256 15fdd0f385e18ca8143dd9bb294e557fc9da4298997773bd5c94445589d739e9
 DIST vdr-markad-0.0.9.tgz 97991 RMD160 060637bd32450635491c9b7d3a75d95b775e6c75 SHA1 645766d0c76c37bf1f836443363c6fe04d58bd36 SHA256 d7f0ec6cfa387ed720a24fc9791ee244aa4aa45d98e52d015076433fb366f90b
 DIST vdr-markad-0.1.0.tgz 91896 RMD160 e7ef6a95f4183151e21748f829f1cef1a75011c0 SHA1 db6a1a54040f01ac4cfbc06762c535961bba3a82 SHA256 90b7f915bf1d1785ec9d9b31d850c0981367ed72f3df9b73d60e04c38d68ddda
@@ -10,17 +11,13 @@ EBUILD vdr-markad-0.0.8-r1.ebuild 1309 RMD160 1001e8ef9b9e923ad759f83b7fe3d22ff9
 EBUILD vdr-markad-0.0.9.ebuild 1306 RMD160 b84351822d2477b369e0570e7f85214071fd4b4d SHA1 88475080c11341de8400422ca2bbc3b97145bb73 SHA256 4d757490486ca540fc1cfba6b74f7d49e74e01053ef9ae78d0a93d210b20109c
 EBUILD vdr-markad-0.1.0.ebuild 1306 RMD160 1c08fb506bb3372efdd7c4b43685b8cdd2fa27db SHA1 dd072cc1e855a9575ec307dc69ca6e19f9521eb0 SHA256 2c7c7c97787ecfc91183824cd1f8c92265165fee3349264e70b38b343716be91
 EBUILD vdr-markad-0.1.1.ebuild 1306 RMD160 dd02389a8915bc44ede5de5d5980aa68db4c483d SHA1 548de5a9beda5369ed421acaf37249e7baa5b1dd SHA256 4bd0e487bfe642a5d8fed7641b286aa837b96277879f125669d09fafd87c508a
-EBUILD vdr-markad-0.1.2.ebuild 1306 RMD160 7d14a5b71ba6501a228e1b2ff0b8a5eee19c8ddb SHA1 8c6fadad5eda5bbf8665c4e1976074628e02d412 SHA256 6886559099dfae1b2cc7b0fcc7201ff21d00b5bf5d53a07bbe7234ea49cb8b07
-MISC ChangeLog 1445 RMD160 0128a9c5dcf437f46ca7f7a8cb4b1748e9080dde SHA1 a87e43e2fcdbbf2355e35ee8b44770e4ac35ffc7 SHA256 de8f313eb5d27f9fdf54328421099a31d792732c627bd9ca950d5dfb14f740ae
+EBUILD vdr-markad-0.1.2.ebuild 1356 RMD160 143bcd6808f42a702dd5192c6484bf61dbd32731 SHA1 26c9abdb55bea6dafb53d033604ed196cff5109f SHA256 cbfaaeb07402aa42f14666f37405c1b280e58e1e8f9c2b2b9ce6c2b659482637
+MISC ChangeLog 1597 RMD160 c133fe63b81ba80ef4a04b3ff0f36fa8edec2597 SHA1 93099c723b07c54b1215f90b9c7ef89aebb808f8 SHA256 af2a80486e3fb4e1bbfd8ef88c2caa9fd15f51ca99dc472c80f38f6a1aad18b7
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNnJ9IAAoJEMOx0zmdw4Z1zbcH/1Y/ya/Q50Nn27Mo/0lrYi3h
-6aa96dgcwDdZCxrSdd/bom9SLlWZLIcA2MEi5+1Rnxw20FrBL7XS13ab1kwbvtHR
-k3a3StDvr0zdTIj5yS6/YwMX/we8FfOacZrTDCn8yXDRDjDS1BHxxeMxfAUsNTUV
-mMQRIoL0LfnDNKv8ZFr0FGJq8Ym1ndu9sfX7bRQf5C86TnPJ2PiZ38LmU0klVCof
-RNDtB++1KcjOeqJnPoxfwQm2j9hqcP4XODJUPwzTjqu1e1cWmMvhFTnQ50OAWfkl
-lbrIsjKVAZBJ3+emRZfvhhpPvSw42W0r+lFWWsQKuGEFHIPVipouKov9InZ9iAc=
-=Aau5
+iEYEARECAAYFAk7spq8ACgkQvFcC4BYPU0q8QACdFauzqxEF4XE3smC0tQouXwzy
+ogEAn1ysZ0/yJ1Ao8CPUzaSTSQi2dEvL
+=s5JU
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.2-ffmpeg.patch b/media-plugins/vdr-markad/files/vdr-markad-0.1.2-ffmpeg.patch
new file mode 100644
index 000000000000..8934756ec99a
--- /dev/null
+++ b/media-plugins/vdr-markad/files/vdr-markad-0.1.2-ffmpeg.patch
@@ -0,0 +1,40 @@
+Index: markad-0.1.2/command/decoder.cpp
+===================================================================
+--- markad-0.1.2.orig/command/decoder.cpp
++++ markad-0.1.2/command/decoder.cpp
+@@ -163,7 +163,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH
+             if (mp2_context)
+             {
+                 mp2_context->codec_id = mp2_codecid;
+-                mp2_context->codec_type = CODEC_TYPE_AUDIO;
++                mp2_context->codec_type = AVMEDIA_TYPE_AUDIO;
+                 if (avcodec_open(mp2_context, mp2_codec) < 0)
+                 {
+                     esyslog("could not open codec for MP2");
+@@ -198,7 +198,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH
+             if (ac3_context)
+             {
+                 ac3_context->codec_id = ac3_codecid;
+-                ac3_context->codec_type = CODEC_TYPE_AUDIO;
++                ac3_context->codec_type = AVMEDIA_TYPE_AUDIO;
+                 if (avcodec_open(ac3_context, ac3_codec) < 0)
+                 {
+                     esyslog("could not open codec for AC3");
+@@ -265,7 +265,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH
+                 video_context->skip_frame=AVDISCARD_NONKEY; // just I-frames
+             }
+             video_context->codec_id = video_codecid;
+-            video_context->codec_type = CODEC_TYPE_VIDEO;
++            video_context->codec_type = AVMEDIA_TYPE_VIDEO;
+             int ret=avcodec_open(video_context, video_codec);
+             if ((ret < 0) && (video_codecid==CODEC_ID_MPEG2VIDEO_XVMC))
+             {
+@@ -274,7 +274,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH
+                 video_codec=avcodec_find_decoder(video_codecid);
+                 if (video_codec)
+                 {
+-                    video_context->codec_type=CODEC_TYPE_UNKNOWN;
++                    video_context->codec_type=AVMEDIA_TYPE_UNKNOWN;
+                     video_context->codec_id=CODEC_ID_NONE;
+                     video_context->codec_tag=0;
+                     memset(video_context->codec_name,0,sizeof(video_context->codec_name));
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild
index c9ce47699286..5a4219985740 100644
--- a/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild
+++ b/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild,v 1.2 2011/04/06 17:13:37 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.2.ebuild,v 1.3 2011/12/17 14:26:49 aballier Exp $
 
 EAPI="3"
 
-inherit vdr-plugin
+inherit vdr-plugin eutils
 
 VERSION="578" # every bump, new version
 
@@ -35,6 +35,7 @@ src_prepare() {
 	if has_version ">=media-video/vdr-1.7.15"; then
 		sed -e "s:2001:6419:" -i markad-standalone.cpp
 	fi
+	epatch "${FILESDIR}/${P}-ffmpeg.patch"
 }
 
 src_compile() {