Apply libav patch to build with libav9. Fixes bug#443196.

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

4 files changed, 65 insertions, 19 deletions

diff --git a/media-plugins/vdr-osdpip/ChangeLog b/media-plugins/vdr-osdpip/ChangeLog
index 221f66972cac..ff9173c649c3 100644
--- a/media-plugins/vdr-osdpip/ChangeLog
+++ b/media-plugins/vdr-osdpip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-osdpip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.21 2013/05/14 09:37:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.22 2013/06/17 19:04:32 scarabeus Exp $
+
+  17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/vdr-osdpip-libav-9.patch, vdr-osdpip-0.1.2.ebuild:
+  Apply libav patch to build with libav9. Fixes bug#443196.
 
   14 May 2013; Agostino Sarubbo <ago@gentoo.org> vdr-osdpip-0.1.1-r1.ebuild:
   Stable for x86, wrt bug #464542
diff --git a/media-plugins/vdr-osdpip/Manifest b/media-plugins/vdr-osdpip/Manifest
index d828632892fc..b43dcc6d51aa 100644
--- a/media-plugins/vdr-osdpip/Manifest
+++ b/media-plugins/vdr-osdpip/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX vdr-osdpip-0.1.1-ffmpeg-1.patch 856 SHA256 29901cf4773987d61296b2d0dbbdbb453c93c8f388ca0c99726734db24bc8d7a SHA512 e3fe8a83413e52abe36e6232f5326ccf27cbecfc2f7f4622411f9fb21807701a0fae72e72c1f431b0b32b2476db67266370ed4e9eb83a730d4d2300b260b6da1 WHIRLPOOL 3dd2ac100c1230b7a91dc97381a21678c2a386fb300e931ac7376ea003d84e419554f187ee82d627d89b02181bfe470163256a96f222ff474557617a7dec55b3
+AUX vdr-osdpip-libav-9.patch 1958 SHA256 1a79b2293ca3966de90a271cbe18394d2b450b4b2302fff8db6aedd1188d04f8 SHA512 a07ab81702153c2d2b5cba4f9227eef645103b9feea33da5d9af8c1dc157ab9c2e561da0c793bef09373e8bc7c771326c1cec09b71181799988040bc7e2f1613 WHIRLPOOL 164d1adce460385c3cc9c4c5ebb034a1b39feb2e2abbde4251f4a1ff782c5b70225ea14ce9cebc8a6756f37b512e612fe8e91662927c35b781249586e8dd1e13
 DIST vdr-osdpip-0.1.1.tgz 53272 SHA256 777f5fd9abbfbf43227c78eb2b363d3bdade2b368425ed78caa836d4c38bfef4 SHA512 176243cf8512abad764e3a35b7fb04dc023179c7b405596adbba36e8116831e9ff562f127d822a52d261576e2a166929af58852c6bff523c9796c22f93226420 WHIRLPOOL 25409c2d4e5b64dd9c8bbd9b3e389647810d710673891aecae80418b14775a10cadc117e0f63c32d46972d5b88ebad6207dc1a449654f319533661f1dc75a271
 DIST vdr-osdpip-0.1.2.tgz 50756 SHA256 08761f6474dd2e5bd4d3dc83b4d2d3b9169a04931cb8aca2e54fdb5ad979a0c6 SHA512 bc3345497e260d3249e1864a05181939b52a3fea115264af21d0efae10aa4406e9d4e5d348fce967a4fdb1adf2a3c7877b5b2d6840854f55f665800ac080a0eb WHIRLPOOL 0503bb4ed6b5838ee1ff7eca61507f79b14a9bf0824c69989cb73d4fa89b48dfb41197e8152d4798f775a288968679008bfbe9e851627447064fe8c1a6780aa2
 EBUILD vdr-osdpip-0.1.1-r1.ebuild 843 SHA256 93a3756f989cba66d2849565efa007fd67b72bbd6d77bc951c66c4adeb6809c8 SHA512 d2a51156d3190fae02e28e8954bd290899b65478553381d959546950d75fde7198a1486d32c280952f0e7bd343a2cef681c63055ed44c78bfc21f395849057ee WHIRLPOOL 75f19f75493aceb94e4c97a6732576e0100679879c33788114bba7c8dc1490b76dfcd0d234550b849faa919a5c6275bb81fccd62f96bba045224a415ea590b8c
 EBUILD vdr-osdpip-0.1.1.ebuild 789 SHA256 bf8d726ea0a354233b5495fb7f61417454b152467d56ad93b75be41feb815810 SHA512 0c330cdc99a887f0afa8320f7723e26c011dce78760ab321ef5c68972ca17a72920e59611e376b86b30c0bfa80c280233001b06fd90385617298b19c4b2797c3 WHIRLPOOL 5580b2c152d144ae805bfdb4547c2aa9f5f03f34678a230c93783861833cc7a3da5217d14863d041971385d112ce7fcffdc7140eed0fb6f849c39c0528895639
-EBUILD vdr-osdpip-0.1.2.ebuild 842 SHA256 8ffed593ba8661115d67310b8dbb08ab0e0338ee2b5ed62af5d42ca452d4a5c2 SHA512 debbfbc655b294cd7088b09de2dbbe7d8c17ab5ca355c33bc5e72e95fbe9fddd46d7cb74577d789fabfd92bd3fd2c619a7e22ca319c028a135b88d76b0a5e669 WHIRLPOOL 260cf4a9154c5f897a7f70b054825d2f9ede6d75087a723e306b9813e6fbd5fdad6ac34b6678fef0494b039bca67ac17a22e23bc42df952ca561cc56213c7c2a
-MISC ChangeLog 3568 SHA256 0a7f3b0c066409212733068dc2a2881ca352e3023253d8c119befaf5e6748ea5 SHA512 9b310ecc453e894d05ed5851e93d5dc9910eef2261da6e52ec1ef6b1e175ed215be41be5d75e8eaad0e363c7a88a246a2abb7a9e790a9058cbdeee522fa35050 WHIRLPOOL 1f9de268f2f7583c71da1bbc1073db8a0443b8a0b7cb41095e239da065291b862fe8ba124727c312821ddb0d6ec4a620832062dcc87d63877d5b2c62ccb7af38
+EBUILD vdr-osdpip-0.1.2.ebuild 885 SHA256 6af727376935149a36b67976ed4e2f346619128d8d883e43e2ec814210f4a39a SHA512 8e3b8f67f3a8aef368490128719c23e83838c1b648f8fbdef7d0e0b5de0f8e431e3bb034660f53710c707c255af95f5ae58e62bf4530c28fde0e7ad7a4c9f905 WHIRLPOOL 1d7a17091ba03cfe39b1a588a002b2fe4407de44bbb7dade12329383b130d875a716794b7735c68af42aeab4e85f9bd507e8a5e547c967d60683092b5e9edd8f
+MISC ChangeLog 3750 SHA256 8b4924f834ff1a3b8bb5f6d6d274029aae20909ad25198518676f04d5f6ad849 SHA512 9b2c4ac0f628d731b43027f4725616062e8d65b93301ba752558e3e0ec9385e0f78fbc31d224a849c6e6c81243786f9f1c18c2573d4212fe2769cb9cccdb7d8d WHIRLPOOL 4d3527ea1d779e0d77c5eed0767856212e4fb38dbb8b1f98fb16ca5fd8c090a87287e156023a5a8346a0d34cf13368dd66cbb5769bc0a96abde3063a035de083
 MISC metadata.xml 298 SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 SHA512 73724667e75fe7d8ca3b0d440e79d70f1a9fa900cf9ea9c3c03036cef44d5fe3e24ce745630e04e9a0a3776f4a73bc47d29f92a4bbe93af0ad544936f5e33b3c WHIRLPOOL e77dccdbffec743aaa54f4dd9529b70e22df631d1d93375274ef70022b8fd0e7d9c3f2f60d4fdbf6f6d72fac24c709357d6ca949068a3eca3558f8a377360913
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRkgXGAAoJELp701BxlEWfuXsQAIsdZqh4pHlzeBWXxB3/iGxH
-5xp8qJ//4GHgVHrFj4VNM8+Iyye/qtV1vjc8b1pI1BYPMPKQvHuo5G6P+ppO/Wvq
-5DLAxlWrfQT9wJuxDK/yLmOE35FpQ0QDJwJ24Do2kidAylNbMcowMNqCXU9xqx3p
-HuX77I2Kw1APUeLbgkt1ROKtMFXMW7HgKvqkB5pX3YEIha5VkCadysRZ899zbaSk
-40u8rcY34GNewHnHzI1il9NK/uLFqggoCfA2rV+YDqmYdj4kD4QjWkbCEB+zNsIZ
-P8ocVC9p3u7V2BYhOUCwqfVqXcsJeCIrxMOminWLJw/KKbTJbtE6kxkTWqDccx8n
-/W4bEIGwU3Q9xXFImoiSvBWxMUsRfs5FGo+GPGZCJEQ2RRVkNm0RWQ3bUSaVRATL
-3vDV47J3ypbsCXHQ24ehCeC8rhI3KVmY+1DhR1P/HnyecJb79W6S8KXsoSu8toxE
-GBO3PVWd2HqBVNvfUx2qFyqkM0dBXBd6H78+83RR5nzINkYaW0vUFcDMoEGp1Z3V
-zVG8AnCoO9YWalN/TVmjSU7nvO8fQKwh/WFLFYpuJZ85K7pg/NsMnECdYH/8Betf
-KTguLLm+cu0oPT2PqA4ricqJKd28UaLrJSiFWJq2A+ECS7dzfHEjM3p14onzef4l
-nHlELh+9Flk5a2QLZMti
-=EffJ
+iQIcBAEBCAAGBQJRv123AAoJEOSiRoyO7jvoQeMQAKww4k1lKtqfPMpgM9UB0KXy
+OUbUiJXwlwWLgFfpbNJ0/gA6FX/g3+04ItcDUdTvrp4gFLNTAOp7k01YKhBT6iQk
+6k3Awlb8SsbfXwsdI9Xj92VO+fpvfw/4nZcytvXdecvlWeXAGtPSVsD1/lfdoNSo
+vwaHE8Yh1s6EBQ5L20l1oVXCISweBFFpGB0ypmpOyn10DWWkZhT6jsbpc8RcZ9gy
+7R5nUOIAvX7z1SbQLVR4P2shQgzGkfCFffQnQIxeHDS4aDTNKG4WfaCDhVoxxI/I
+KguTyoMzbHHNLBYgBtM/ci4uLGPwEdj4QnTrGQG4TA/2eQH5oxFLUdDGuosQGz3I
+WOLRNp/5aI7TzniJY7+uqBy+KiFzfdrthmmfIdYen8X4X7sAwRv6ZHEAylZEZ2gZ
+sQ6E11Tan0luIjJ1zEIIrEEeh4SxG/LktB4CQg5R77KeJ/1VhkbOM7NxczQRddQw
+q+VAGtZ3Y32IzHSu3B/P2V1knxXCiiIEsfYZU3sD65Xg4MetlvDiFG8mjnYuilKs
+UqmBVzIvIzpRO6pU8LxUpI4qFTSYlb10gN0FM6Jbq4P4TokTWFcTHf8sBU570Eun
+8MAH//zOZslvn3lmlwvEtBpM7XbgUAlZTRXhpeWLIdO8oYaPVXh6trofc5afJXe0
+WswYgcc1viKxi3Rurhek
+=4HFS
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch b/media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch
new file mode 100644
index 000000000000..d1f531b325ce
--- /dev/null
+++ b/media-plugins/vdr-osdpip/files/vdr-osdpip-libav-9.patch
@@ -0,0 +1,40 @@
+diff -urN osdpip-0.1.2.old/decoder.c osdpip-0.1.2/decoder.c
+--- osdpip-0.1.2.old/decoder.c	2013-06-17 21:01:31.795476861 +0200
++++ osdpip-0.1.2/decoder.c	2013-06-17 21:01:57.153475959 +0200
+@@ -34,8 +34,8 @@
+         printf("codec not found\n");
+         return -1;
+     }
+-    m_Context = avcodec_alloc_context();
+-    if (avcodec_open(m_Context, m_Codec) < 0)
++    m_Context = avcodec_alloc_context3(m_Codec);
++    if (avcodec_open2(m_Context, m_Codec, NULL) < 0)
+     {
+         printf("could not open codec\n");
+         return -1;
+@@ -106,17 +106,17 @@
+         return -1;
+     }
+ 
+-    av_set_int(context, "srcw", m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight));
+-    av_set_int(context, "srch", m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom));
+-    av_set_int(context, "src_format", PIX_FMT_YUV420P);
+-    av_set_int(context, "dstw", m_Width);
+-    av_set_int(context, "dsth", m_Height);
++    av_opt_set_int(context, "srcw", m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight), 0);
++    av_opt_set_int(context, "srch", m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom), 0);
++    av_opt_set_int(context, "src_format", PIX_FMT_YUV420P, 0);
++    av_opt_set_int(context, "dstw", m_Width, 0);
++    av_opt_set_int(context, "dsth", m_Height, 0);
+ #ifdef USE_NEW_FFMPEG_HEADERS
+-    av_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P);
++    av_opt_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P, 0);
+ #else
+-    av_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P);
++    av_opt_set_int(context, "dst_format", ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P, 0);
+ #endif
+-    av_set_int(context, "sws_flags", SWS_LANCZOS);
++    av_opt_set_int(context, "sws_flags", SWS_LANCZOS, 0);
+ 
+     if (sws_init_context(context, NULL, NULL) < 0) {
+         printf("Error initializing conversion context.\n");
diff --git a/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild b/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild
index 3d56c9352a7f..1a62cce90091 100644
--- a/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild
+++ b/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.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-osdpip/vdr-osdpip-0.1.2.ebuild,v 1.2 2013/04/04 09:28:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2.ebuild,v 1.3 2013/06/17 19:04:32 scarabeus Exp $
 
 EAPI="4"
 
@@ -29,4 +29,5 @@ src_prepare() {
 	append-cxxflags -D__STDC_CONSTANT_MACROS
 
 	epatch "${FILESDIR}/${PN}-0.1.1-ffmpeg-1.patch"
+	epatch "${FILESDIR}/${PN}-libav-9.patch"
 }