Fix build with libav9. Fixes bug#443244.

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 66 insertions, 12 deletions

diff --git a/media-plugins/vdr-markad/ChangeLog b/media-plugins/vdr-markad/ChangeLog
index fcd98bdcb409..b43ced07e525 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.11 2012/09/27 19:28:37 hd_brummy Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.12 2013/06/17 19:57:45 scarabeus Exp $
+
+  17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/vdr-markad-0.1.4-libav9.patch, vdr-markad-0.1.4.ebuild:
+  Fix build with libav9. Fixes bug#443244.
 
 *vdr-markad-0.1.4 (27 Sep 2012)
 
@@ -64,4 +68,3 @@
   25 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   +vdr-markad-0.0.8.ebuild, +metadata.xml:
   initial ebuild
-
diff --git a/media-plugins/vdr-markad/Manifest b/media-plugins/vdr-markad/Manifest
index 27bbf4d57c6c..0d2d408937f7 100644
--- a/media-plugins/vdr-markad/Manifest
+++ b/media-plugins/vdr-markad/Manifest
@@ -2,19 +2,29 @@
 Hash: SHA256
 
 AUX vdr-markad-0.1.2-ffmpeg.patch 2039 SHA256 51933e4233d094afe9cf583205f1b0cf5f6ee602213092edc4f0359826aaf347 SHA512 2b7ae00000d38d27a3af5770201b6f6995b075ac66ed3f367ec8fda133b74e35ad61d8ac035ad97bdd8fb5fe9b87b3049645d667a9e3799e750e7a61cf60ac79 WHIRLPOOL 0ee4890e39563272e299e930bcbcd5a22a20e23b8774645bbd6e257c97c1d86485a377559768571efd5ec28da4e1d774ee8f24060322075c71b50f6d0f1a5a43
+AUX vdr-markad-0.1.4-libav9.patch 1301 SHA256 f56bff3bace19170265222019194d5b08ed230b321bad8c217a13447a3a00ea0 SHA512 5d104771a57d82298780e2df253fc99e70a9723daee977263f2652f1a8e26cfb01ca6d0d8fdf5c085ce0eb4e85c93f2465937e58481bd17646ebd47eb4d7234c WHIRLPOOL 302042199a3b0e0082936876248ad05c2f9f2f47efcc99f415fe2a04d8d1139ef77aedaa6b31427edcede44edaaf108848b35045008790172baa557d5c265dc3
 DIST vdr-markad-0.1.2.tgz 100832 SHA256 ca2b855435a11b8bd814e031cca3f37fdd8da866d8b7eec889d1a624c5861d6b
 DIST vdr-markad-0.1.3.tgz 109723 SHA256 e791a4ec133a52d226ad507028733aa351a3892794ed52febf67a3feb652de9d SHA512 31b4b1ec4947c128f4fc156f837bcce7716cdc464839e9c731c0f13fe97ce55302cb227c44c489608f68523d5713f1ddadbd0de4570b8d5d629260a7bbfd7ab9 WHIRLPOOL 1091238cca0e55d8837a241408f3426b19bc1dd7b546434d9a585f7c00ebe1cb3d03d1af0dcd1a630240d5feae2202837b7c340217b9cfe2fd0db484d9970143
 DIST vdr-markad-0.1.4.tgz 118728 SHA256 f940765c5dd4a5d66e1ff2650fa0a2b7bda7138953782431230a6c7539334a85 SHA512 10121e72803f489cdcabb46c989ecf4ae2ced1893bbdaccefbeef412ca34b124952ddf4639b3f78da3413e7b784ead4a60034a70cbab43a7c27e0e41f9653ae1 WHIRLPOOL 9e926e44798c5449346b078cfb906341a15715be49bff52bbad7594c299edff5f2454f1f2de9f5f3dc05a85968a860baa3d7796e220461da2663ca897db87414
 EBUILD vdr-markad-0.1.2.ebuild 1328 SHA256 b56602961bc2050d449cdc12dca8d756d2549e929f6d78b98bdd9991af91d534 SHA512 884d2c81323c1072c37193848df7123650c4cb6ab7e8b2979211d0a186ca8430a9a222de25a761294bb0f2c5d201f78f9856a794c68106075eb03fd56c75e5ed WHIRLPOOL 8f6ae68f9771d28dd5d722ae2f266719c7c09c39c51d31cba74b5619193b105b8299159f2f2a93425d0145e09122985bcd50a97345e53e393997d667d6d33065
 EBUILD vdr-markad-0.1.3.ebuild 1288 SHA256 b70271cd11cb13d5ae2aadd2ef290cfe44a757a12a97b70a25ba5afcb9a29c05 SHA512 95f70f7c756c363998071146d420d0bfddb1f26aeefb516b6e2758df12d3ce30be15bff525d27612f54a6d1636b8bb7c8b097167de224146818d7fb4dca66d30 WHIRLPOOL 2bb65e93a47877a54566a8790378b6fb3ff1946467452640bc0e3e4caea4b11c43289d27272a552b6aa1e90e33249749211a3f341f00c779c0a70c82561712b8
-EBUILD vdr-markad-0.1.4.ebuild 1390 SHA256 b26b49ae9c7f2fa6aa9cc9644164cdbeb43e93f3719bf49748432768fea12d35 SHA512 f5668c7a09577222a75d12b048e2993d370fc7ec95ef1102931c925f6901b35b3c95b70514b3071e72411d5f32ad2f4df3b1e3aa7518597590ed92be2a795b5d WHIRLPOOL e8ea152bddc55c3e6e12ecbdeac50202514e488c431d2caa64ede44a7b3144f476d18fae5b98dea710555ae3b0c7b8fc5a8646481e359c84b197be13d2d4e1c1
-MISC ChangeLog 2030 SHA256 b26959687c88a1adc6f1bdd7f26793828880308328093d89b9997c5c6b5ee02e SHA512 3c983dab4c28b93f6d2a458a7a97cd3606678af4b3878ef4cca4b70473c3db1dc3b8029f072f561fa9cef9bbf8b3b8a7033336cbf6acd39efc50394e2072ce2f WHIRLPOOL 5a18a854f0c66f67c6f22279945715d6cfca2c244cc565d988730a0b350ee630b64e28204a5035f02d302375534e4dcf583727e23bf58d5df2f1f382f1255fcc
+EBUILD vdr-markad-0.1.4.ebuild 1437 SHA256 11fc02b38e974db905ea86d38707fcb796edd8b3918a5f43dde24f22193d2169 SHA512 950aad31c2f6d2bc7578d37fa29c826e7f5f867d0d1f2e1971a461c75e8bd46b58f8d5601f718a01aa4012fac9abd3e7c67ae1faa9ec00cbb3abea23dc8f3297 WHIRLPOOL eb8f04cbb7d182cde622ab5070e8902b6b4dc811e1ba883163c47a4c93801d10df33894ba10485210bb53559fa2361f794eadf3ffe16be183d739fb3613fe0a4
+MISC ChangeLog 2193 SHA256 a054d45bc5b80f3f983e50983a2a8d55ba222157457d53d0a122fec90ce5c7df SHA512 e47ff63eb0082386df391e98225c8c107e7cc13dba29c91aeba740ceecc52f0f5417b01faa661cb4479a3a977c4fc6726a8bb5005787604a4ac39e08116d9d52 WHIRLPOOL 6cc49f833882b05e061198934d72c25b755a0fce25ce67b3f8dfa82a4d82807f218dbb8eaa1b0844021c0b9cc392605836d293e4a5f06480dc7487f8f45cb365
 MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iD8DBQFQZKjvdn07HTTCgIoRCKR6AJ9po0YIhFi4AH9TtaecaMMU/U63vwCgoWIU
-xGcbmbRXe4ZF8hovuJNPzEk=
-=UBfP
+iQIcBAEBCAAGBQJRv2ovAAoJEOSiRoyO7jvos9oP/3JvtnUahLgsbQ4jI/umXgMv
+HcU43WQ/k2t+yBNqDka2MEMVd4tvD2q9OG5Q41J0IYEYR3DE5jtWltaLrC983bL6
+7ZfYWhQJydpjE4E0SRE0bSF2wqRseAOf0bdJDskK7OH7kj3mOvzSd9iAwYGcvOVJ
+G8NvvJQibGFMukJSrWKMy7SUCa6tPtjewXIK9QaJzSajPfqIPO8CUWLfbebbD5+L
+5uaI8Tx42VTLyT2t6hRywuOQWy5PwKo4L6PCCvLfp/HX3czUEGGRYZZgOEWafmkU
+XZQu8xcJ5qPu2/X+HiqNp1/+8lB9v/P9LHVi9LaW6Z3Mn4ANXGlwtjaH8HotjdIK
+5PIGJvWBaYX4x3R/4aZbdiEu4zVvAJWaSVmSdpBKtWRsbDopG9tbaNie/4imD0YY
+V7/ogOdjYJO/NMGf4eWHhxPFVQbo7X7bjkYTSsjm54+qWsmSeOeqfCfMhXdYDyD6
+me+B0Hz1+hrmcuJPjYzEoIuVDZoBnuezWoixPzvI+XAFtJfKR70T4UtBVOYEU9Wc
+MH55ikYrlZBvrgSOyImZMPA1gnaMMzK58HadqFeMzP/Q+xvHVasnn+0b3Bcjzg2Z
+gvpZXVGFWUHXgcBaCAn1LitRcSLnWPqRxZ86Ru5fvZpdEUOHDd3AES1mXtiUOJYn
+XI1q8ZzpUWFY12EVyYOc
+=Wmo8
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch b/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch
new file mode 100644
index 000000000000..fca9cbb49e35
--- /dev/null
+++ b/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch
@@ -0,0 +1,40 @@
+diff -urN markad-0.1.4.old/command/decoder.cpp markad-0.1.4/command/decoder.cpp
+--- markad-0.1.4.old/command/decoder.cpp	2013-06-17 21:52:44.333367552 +0200
++++ markad-0.1.4/command/decoder.cpp	2013-06-17 21:53:03.708366863 +0200
+@@ -11,6 +11,7 @@
+ #include <sys/types.h>
+ #include <string.h>
+ #include <cstdlib>
++#include <stdio.h>
+ 
+ #include "decoder.h"
+ 
+@@ -172,7 +173,7 @@
+ 
+     if (video_codec)
+     {
+-        video_context = avcodec_alloc_context();
++        video_context = avcodec_alloc_context3(NULL);
+         if (video_context)
+         {
+             if (video_codec->capabilities & CODEC_CAP_TRUNCATED)
+@@ -321,7 +322,7 @@
+     {
+         avcodec_flush_buffers(video_context);
+         AVCodecContext *dest;
+-        dest=avcodec_alloc_context();
++        dest=avcodec_alloc_context3(NULL);
+         if (dest)
+         {
+             if (avcodec_copy_context(dest,video_context)!=0) ret=false;
+diff -urN markad-0.1.4.old/command/decoder.h markad-0.1.4/command/decoder.h
+--- markad-0.1.4.old/command/decoder.h	2013-06-17 21:52:44.333367552 +0200
++++ markad-0.1.4/command/decoder.h	2013-06-17 21:53:03.708366863 +0200
+@@ -18,6 +18,7 @@
+ #include <avcodec.h>
+ #else
+ #include <libavcodec/avcodec.h>
++#include <libavutil/mem.h>
+ #endif
+ 
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
index bdd8dd3e238c..82d609cba381 100644
--- a/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
+++ b/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 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-markad/vdr-markad-0.1.4.ebuild,v 1.1 2012/09/27 19:28:37 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild,v 1.2 2013/06/17 19:57:45 scarabeus Exp $
 
 EAPI="4"
 
@@ -32,6 +32,7 @@ src_prepare() {
 	vdr-plugin-2_src_prepare
 
 	cd "${S2}"
+	epatch "${FILESDIR}/${PN}-0.1.4-libav9.patch"
 	sed -i Makefile \
 		-e "s:\$(CXXFLAGS) \$(OBJS):\$(CXXFLAGS) \$(LDFLAGS) \$(OBJS):" \
 		-e "s:\@\$(STRIP) \$(DESTDIR)/usr/bin/markad::"