Update ffmpeg patch to fix libav9 build too. Fixes bug#443428.

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

4 files changed, 58 insertions, 28 deletions

diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog
index 0ec363b8f2a6..c0c3e7ba0a92 100644
--- a/media-plugins/vdr-image/ChangeLog
+++ b/media-plugins/vdr-image/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-image
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.41 2013/05/14 09:37:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.42 2013/06/17 19:29:23 scarabeus Exp $
+
+  17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/vdr-image-0.3.1-ffmpeg-1.patch, vdr-image-0.3.1.ebuild:
+  Update ffmpeg patch to fix libav9 build too. Fixes bug#443428.
 
   14 May 2013; Agostino Sarubbo <ago@gentoo.org> vdr-image-0.3.1.ebuild:
   Stable for x86, wrt bug #464540
diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest
index fdae0ab2eb73..9b6e5976eda9 100644
--- a/media-plugins/vdr-image/Manifest
+++ b/media-plugins/vdr-image/Manifest
@@ -1,31 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX rc-addon-0.3.0.sh 712 SHA256 713cd7048618c14e63b78da9921e9e178b3860adb5a6deea7808471363b4b766 SHA512 33cc5ed0be638f00c1b3ac7f89a8e6b88c6e5196c7439355e71e6f0919c1f1871fb2033eecd11c4512cc11ddf7d4d58acb178c782fc85bf9899172b772f97880 WHIRLPOOL 3a8ce83b3802834a2778b4c3a36f88b27f8493834affd80ffe7dfb5da2cb40f14a6a45445f413ee65bd9997288a730ba96eebdb31ee68fe85325a159bb6678ac
 AUX rc-addon.sh 672 SHA256 1d8a77095882d5b63ddeec7b422cd775b883b8ade3504a22e79d2e463f3eeb17 SHA512 2e7e08dc8f5e5e2efac78cf2a849172cfdfefa606c26bb817e8163abbd07690aada62707f8160df5911350acb722585b2e8934a26fe42d925a32d5438274823a WHIRLPOOL 50eb1f701867804072de6f062d08b9fb6ad5dff528f98b0192ec22b6a2f718380a75972e15394d654207154398e68949969a4581350ab01e0139d638bd0f0579
 AUX vdr-image-0.3.0-gentoo.diff 2348 SHA256 45024beab8174cdd2ac6f0a880fb1a5cefabdfd2781ef8511d71e49592e0357e SHA512 ca6932ae0da10bf1037297dfe4eb1b667ecf78d660479fe332e474746cc1b2afcb6d1a048c511735d5e354dbd8867ee68be75a010eb31fd132382869dd98025c WHIRLPOOL 706b19f7420b8b4f115ac20aba34260884cd8c7393a38b9f1c8afb0190d3130f5b24413be3d2e27cfdc71ea30a2be708530a697967744eefd31a1dd43ac3f929
-AUX vdr-image-0.3.1-ffmpeg-1.patch 440 SHA256 0af1ba7272fb33c926bad850d424fb3cb54df32b0f41503c16f2b00c54d9d93b SHA512 bbe693e7c1618b0fc57441fdcdfc305b21a0dac6c301f9e8789f6640221e71920b15c4299bb17fdf909325f7e36bc93a9221a9a3e83624c6967ca84085c6e490 WHIRLPOOL 33dcd96861bac1c5042114083ad30fe12febb865645b1e2c2749257ea223b6ba35f1759333b69629d960652a707b275ac7ff82324e0183e9036a9ecca5e0c138
+AUX vdr-image-0.3.1-ffmpeg-1.patch 1307 SHA256 50778e97a4186d462248a5c014a8f6d4065beb341659bb773bec7b64c0347de5 SHA512 ffc0e3f130f0f30b5ac2f5055ba9fbc91d9f67ae855da3ff8c26408ae24ee55e0027d7c086f24d94fe341c0f3764c24e1980a4f5408ffad927621c3697e5c825 WHIRLPOOL c708413afa0615e32e2f2479f2c44ffd8dc0b443bc5582d959367628063c5918c58fa528418517d28ce1ef2d0b3faaec6c44632043376a390b861938d0fe8c27
 AUX vdr-image-0.3.1-gentoo.diff 2348 SHA256 45024beab8174cdd2ac6f0a880fb1a5cefabdfd2781ef8511d71e49592e0357e SHA512 ca6932ae0da10bf1037297dfe4eb1b667ecf78d660479fe332e474746cc1b2afcb6d1a048c511735d5e354dbd8867ee68be75a010eb31fd132382869dd98025c WHIRLPOOL 706b19f7420b8b4f115ac20aba34260884cd8c7393a38b9f1c8afb0190d3130f5b24413be3d2e27cfdc71ea30a2be708530a697967744eefd31a1dd43ac3f929
 DIST vdr-image-0.3.0.tar.gz 122950 SHA256 73efc58729fdbf8860841af2f168e952e4ad0885e4d530e9075561233ccdd7f6
 DIST vdr-image-0.3.1.tar.gz 124587 SHA256 953c27a6fbebb17590cc6ffe367720d92fb0f256da934bd06bd86aabfaa8e15b SHA512 a5a3b9d29958abc486d5fce4a6423d574894a604f792fe6e73b49daf3c02fe2df1ec7d7538db2a950482a77c7d47ebd8dd498ae55f265a0a7ef013b607dd0efb WHIRLPOOL 6541b2a1f1a7e8da241878d46c0976b2d688522c2143a2d66e6c2b124343a068b000bd2a2df647bd82db858ec73e3db136ea61f77fba28d5369fcbce5dd3d1bb
 EBUILD vdr-image-0.3.0.ebuild 1591 SHA256 285cb64d352eacca53b47a753ba45f84647ecc0ba5bef9a091eacd1b530430ba SHA512 f1e6ea632a2eb9ecf5f516a99a03a4936c1a7dd9b8f1cb1e94df9cd0d8e36828100007fc640be17984809892c15d73e477786126f88fff3f19a49935375cb0e4 WHIRLPOOL f502b9b80f7ec1f4119a9dfce75e3a516b4c3f235001533ff9a1224eaed367ceb135f2c8f260406d4105d21eace7d099f98310de73a28957a4dafb451ad804cc
-EBUILD vdr-image-0.3.1.ebuild 1714 SHA256 657638ab52b5c21e7e6b0038117ca9774a4175b29d567fe0785ee5746dec7ef6 SHA512 ac98bb086a05adb3075a78ba6c412e0fbf3548d313a3c52049ab51a3373793f413937d0d2e02f4a0863a28e9411d42a0a6081458adc51a5ca49729729714c7f3 WHIRLPOOL e8830cb3e88e4d467b224a351c8af15a2516d09b894fb1bf168eeed23c7f924b4fbbd45a9a1168fed7ef2db052391c47dc5db2987a05929fc92c3184a092a08e
-MISC ChangeLog 6900 SHA256 b48293a9db6258a2decf91126aba967fdfb94991b3cf6cf1110986f60812eb39 SHA512 5f50be43161568b33a31bc9d5055df4fa3b51f3f59bff10eae21724d307114aa5edfde9af1580a11691c76a4501c7a707e6ebbc993c168b745043d11779f307b WHIRLPOOL 5733351f6809c6f866721fea617b9886e020cbbb6dd319d8781b2291d1019135af18cbbd535a3072015e852074826188a2ee586e8d7f803d0a41ea15a0f25169
+EBUILD vdr-image-0.3.1.ebuild 1723 SHA256 4a75894abca07990ffab739c810d9974f51e1ecec40ec3f8060b5023a4d10c2c SHA512 134d9a4c0290dc5080e56d1f9726d5442ea9eef48025dcba06806432bc472da3599a2d67fba14c2977c692a80bc82c3cc7afea3993feaf05c4b055ebfbad2a01 WHIRLPOOL db644b45f7355253fba9d8681fd9dae323de140f2c58ebf9da943e7f8f8ffbdab76094abfe8c204cb264736429a4a5477b08e8b66ae12f28704bc821d50031ad
+MISC ChangeLog 7091 SHA256 b63f7bb094ffee9365362c57513d881e3fa04fe819a15bd1b429da2ecbc9cd15 SHA512 067c6e80e8933dae00154a72578551d29d02d712992f486b62a5825cb7f1c68e86ab84d71a25a488523d8c8295ead44482a16afcdf36bad63a078a3813cdbad4 WHIRLPOOL ade08f27ef543ed75369a0af5627c0f346603e8923f0a696248b1d4c27ec25baedfa0b15361be720091f994a422ebb0b1a7dd455d15ce82113fc358a30413d64
 MISC metadata.xml 435 SHA256 2339bf531037284f03317b33d6fcf743c6ffe74bd48c916e2db2e34c569f6bee SHA512 a92e61c4fda550adf44941a5acc4e9a9bd2a7f7de3e54857c619725a5cc88d3e1fc84ff99584377e2e4062677ed222d92cb8ca926404a118aa8552090f9fda6d WHIRLPOOL 48698d6ba1267dc029dc15061ed9e841b8664fbe6e66e27a331ebb51699910d69a47c93cb498863bbcd367de6e86e5892223eec80002ef1ba82ed54affcf3c1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRkgW+AAoJELp701BxlEWfs08QAJmbQ6qkwCK48FPHgc2+6/zf
-2audnjafvC65Cy2skUSsNEm/j22yMDGZVQ4VV57Y97y1bb5zDhM/PRzaWwURo2nf
-JdXEv2ixL1Aha3DkpOZGNm4btqgeybj6mAUv9ama472OmtpYKSwjxA5shGahcFZ7
-qV+gzas/NRk2QCqgekC+5XvNKqpCtqyyKst+hWt0GvIXrEFXJV9rrBpASYWOB7K6
-cJS5xlFo/fXZufvihCOtwrzKrgc+hGDVsQHDrbTSvxMrvCikvC3J+98BeyVHXCGo
-yAyFpvjxzn9h7bLVFMVTgdDLVZt2/QL6UQ7t+s+wyh5lxPaXnpY86GRU9+yrgWbP
-omPepdOjvhO2O3ST+7c4/PC+ae3rBOpcQEW6H1oburhjn37wAD/sWaMjch7ILp8a
-QybQnAhW3memahkNlazL1tQC8XmeQ9+pDa8q2AdMGeRNrpbfiaWO/EGkpgNvPuMV
-jvPlzDgFLxD3ukC5sY9OyPCVeBuu0gQQmgJT6FjdD5Ns52mTfY8k3M/mcygru0V/
-4682JjVOpbExvwUyUBnh32Dk0311KapyyiywLcmp7yvu1Bo1GgQy/UjblT5py+n0
-k/UehCIqPGmCLFDF43uV6xbvBiNfB17jtZrn0Q0Eu7xVZ55wWmItAnUU23TB4iX4
-/HTCB7h+wy39SkWvGqL5
-=tgp/
+iQIcBAEBCAAGBQJRv2OJAAoJEOSiRoyO7jvo6G8P+wfHMuKviLhWGniovEdeflcZ
+PpOqLEb0n/iBNoR89Hd0X3UjzUerp+aDeq5rdrYaiDrPoCbm2q08a31/aexpK7UN
+XbGy/mh6dPO6O51TivWTls86VWxXzqTt05VEviKgN2TwU+IZjwtGHTBhu/cdbjTx
+JEAtNNJctKOU9J3QgpHt4YjgPP8DiHIxngvBAsWVdVa3Z9F7UDE2TvF6TrmOy8sO
+w+kfcrD9JiGlpiWwxYuMgzEPE/Uui8kg5lu4aztMSGUDMXmMpMZQjj20mWmWohAV
+R4IwKUzTEsdNEqU+wcpKVGg8jMXFGujj8230FiDJshIPUMXhcPQZ4MJS34+NNppM
+gCzDuVaXS4c7SY9HAn3UrPaIoGP3J8b7owQstfdpsKReL7Y7ILHIQ3RHC05cLxcg
+NPKzCnnCYZCtPKwsJg6nC/xHguxLIvaPBYZZ3HEqQZNr9DfATQdyARJ+JplHKNFx
+e0B5iiFrAkT9YndiLajhvZYiKl9LD2UlBu0a0JJjyP0zxmfcW//ki8BQM7JFXzvI
+rU0qCzSeyX66IZrZdT1PcYDv0j/QY0dgeKIlHxUB3f2OFZR3BFHDGjc2FcWzzZiH
+IVRn+E+ygmLBhV2qMlb0arI//ZDvRiWihix+O+NwN+QixYHqcFZdyP2AbO4xkhkm
+cpOSQVk7mm9ZjTJScTeP
+=SZi2
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch b/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch
index d4a193869b9f..78fd1d384435 100644
--- a/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch
+++ b/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch
@@ -1,10 +1,7 @@
-https://bugs.gentoo.org/show_bug.cgi?id=443428
-
-Index: image-0.3.1/liboutput/encode.c
-===================================================================
---- image-0.3.1.orig/liboutput/encode.c
-+++ image-0.3.1/liboutput/encode.c
-@@ -49,7 +49,6 @@ cEncode::cEncode(unsigned int nNumberOfF
+diff -urN image-0.3.1.old/liboutput/encode.c image-0.3.1/liboutput/encode.c
+--- image-0.3.1.old/liboutput/encode.c	2013-06-17 21:23:23.308430203 +0200
++++ image-0.3.1/liboutput/encode.c	2013-06-17 21:27:37.126421173 +0200
+@@ -49,7 +49,6 @@
  
  bool cEncode::Register()
  {
@@ -12,3 +9,32 @@ Index: image-0.3.1/liboutput/encode.c
  #if 0 
      // XXX to resolv: dosen't work with osdpip
      register_avcodec(&mpeg2video_encoder);
+@@ -100,7 +99,7 @@
+     AVCodecContext  *pAVCC = NULL;
+     AVFrame         *pAVF = NULL;
+ 
+-    pAVCC = avcodec_alloc_context();
++    pAVCC = avcodec_alloc_context3(NULL);
+     if (! pAVCC) 
+     {
+         esyslog("imageplugin: Failed to alloc memory for AVCodecContext.");
+@@ -116,7 +115,7 @@
+         {
+             SetupEncodingParameters(pAVCC);
+ 
+-            if (avcodec_open(pAVCC, m_pavCodec) < 0) 
++            if (avcodec_open2(pAVCC, m_pavCodec, NULL) < 0) 
+             {
+                 esyslog("imageplugin: Couldn't open Codec.");
+             }
+diff -urN image-0.3.1.old/liboutput/encode.h image-0.3.1/liboutput/encode.h
+--- image-0.3.1.old/liboutput/encode.h	2013-06-17 21:23:23.308430203 +0200
++++ image-0.3.1/liboutput/encode.h	2013-06-17 21:27:37.127421173 +0200
+@@ -14,6 +14,7 @@
+ 
+ extern "C" {
+ #include <libavcodec/avcodec.h>
++#include <libavutil/mem.h>
+ }
+ 
+ #include "../setup-image.h"
diff --git a/media-plugins/vdr-image/vdr-image-0.3.1.ebuild b/media-plugins/vdr-image/vdr-image-0.3.1.ebuild
index 272d9c13ce71..d5d657550217 100644
--- a/media-plugins/vdr-image/vdr-image-0.3.1.ebuild
+++ b/media-plugins/vdr-image/vdr-image-0.3.1.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-plugins/vdr-image/vdr-image-0.3.1.ebuild,v 1.7 2013/05/14 09:37:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.1.ebuild,v 1.8 2013/06/17 19:29:23 scarabeus Exp $
 
 EAPI="5"
 
@@ -47,7 +47,7 @@ src_prepare() {
 	fi
 
 	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
+	append-cppflags -D__STDC_CONSTANT_MACROS
 }
 
 src_install() {