Apply libav patch to build with libav9 too. Fixes bug#443248.

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

4 files changed, 84 insertions, 11 deletions

diff --git a/media-plugins/vdr-audiorecorder/ChangeLog b/media-plugins/vdr-audiorecorder/ChangeLog
index dfb8a8d2621e..fb40d514ae9c 100644
--- a/media-plugins/vdr-audiorecorder/ChangeLog
+++ b/media-plugins/vdr-audiorecorder/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-audiorecorder
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.16 2013/01/18 16:22:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.17 2013/06/17 19:46:02 scarabeus Exp $
+
+  17 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/vdr-audiorecorder-0.1.0_pre14-libav9.patch,
+  vdr-audiorecorder-0.1.0_pre14-r2.ebuild:
+  Apply libav patch to build with libav9 too. Fixes bug#443248.
 
   18 Jan 2013; Alexis Ballier <aballier@gentoo.org>
   vdr-audiorecorder-0.1.0_pre14-r2.ebuild,
@@ -103,4 +108,3 @@
   05 Jul 2006; Matthias Schwarzott <zzam@gentoo.org> +files/confd,
   +files/rc-addon.sh, +metadata.xml, +vdr-audiorecorder-0.1.0_pre3.ebuild:
   Initial import of ebuild written by me.
-
diff --git a/media-plugins/vdr-audiorecorder/Manifest b/media-plugins/vdr-audiorecorder/Manifest
index d0b324cba17b..4748c7b7b90f 100644
--- a/media-plugins/vdr-audiorecorder/Manifest
+++ b/media-plugins/vdr-audiorecorder/Manifest
@@ -4,18 +4,29 @@ Hash: SHA256
 AUX confd 366 SHA256 ea6e7e5ab5cbe6e527ea0d0cf5c566a36c7d758060e0fa0652e3eacf4dc827d5 SHA512 ae1455c5ceccc59415d68d6ff15dc2f614003f8f285d1f1c91cf8f0de81164eec37e79d7a4e0839ff04ba02f46fb17aef7e8c45815a5a7847487fbcc04045f81 WHIRLPOOL 322f2b55c6015bffdf8f7a755001f99db22a42712f2ef731d7d1f37f6760062391c6b6b34ce5a0440407aa7893d4d27f9cc31629ba99309f0649f82cffa69d1d
 AUX rc-addon.sh 371 SHA256 69e156962332b610270a02464cb3b2b164224a3da9741cfa14efdcfcedd2d282 SHA512 e625745a4912947351ef4bfecaf20d3f98a275bbca8c8eac15f08ad64edfb5155a98f9de905b50b8ab23055660160ece274703f1b2b973beb99a3be729927524 WHIRLPOOL b8e713b2a78e9ebc2f28460f085495468088f8d1a4da6e854865d2ef88d381a2289c146dd3e8d1ca11c395535ee19446fbaa0d7a4854be38ab9d31a45a26297c
 AUX vdr-audiorecorder-0.1.0_pre14-ffmpeg-1.patch 537 SHA256 7f52468f8ca65a6ea9dc4075ad4abb0298130ae945a5e6ff7a80fa2dda92419d SHA512 fc248ba2193575d37185c0f29c4a5d93671cf915eb9ad530bdc8bc8985bf58b19d103714a1319903c94eb6e22dd32e62ea053d680048dd69e81718426a446d09 WHIRLPOOL 6849ce548aad2fa5ba170d14a6d3b284a1895ad13ae6f8c5957b688bdc2defdf1f05c7226dfc9130513c5d85e3d0961d5390b1de9678aa55b5d3a1752e7b8d70
+AUX vdr-audiorecorder-0.1.0_pre14-libav9.patch 2246 SHA256 417065b2e76501d03c19251e2b7389f9177b6c50a3cb777aea3ee050176c2df3 SHA512 45da5d76daff2dc16e11deb7a5745b8ae0f447427fa864d9520918956260fe53a36e608b5bd78b509776c40402c3ab06ee4865fd53bb578ae5ae7ef4f6fe82e7 WHIRLPOOL a4ef4b87210287161622a46ca492bda9e012fb7e5c6f3f7e0e746136dccb5cbfc739d3de090444a9ce943c64ca8333bd611c0e135a0e20d113fd0d0484a2c1a5
 AUX vdr-audiorecorder-0.1.0_pre14-shared-tinyxml.diff 5274 SHA256 c7d78ae65c8367b5a5f5876a79e1440c2a8f8732d7c0637398d91babcfa777f5 SHA512 850f440e0a3b529377ff75b44146472a69f38ad92a6aeb3c5ff4a5d11716e8a52e1687a43a861b37e434b25bc60c1bf52eaf158066f1d3bd1b9e692c1a7214bb WHIRLPOOL 0eb239490c1c1cbe9fac932f4f70f6d67c99e49f2acd448ea18a18b40b1571b8055fbd7811a132c260a7f4aaa11281ab92f7861c9a337c51cd232fa67e8f1879
 AUX vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff 1045 SHA256 3c952fc26472e5f2eacddb17d48f208d6d4607875b6b641562caa6e832f35f15 SHA512 f21a40fe9d19a7c86bb6e32c219e976262a2bf70bab4db52d8513583f8b9447218d242bee52fe35c0d313c41d7c52a5ed5541d73ed6f82f87bdf38b437db31b0 WHIRLPOOL db4cfa7d9493a4824ebf2817375a2a895e90dda9eae5d2a76e4bf3e440348733d091c1d8374765a631dd73da4bd2861dbec8c326bfd8d803c555357c6e98c3b1
 AUX vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff 1337 SHA256 4c95a438f388d1c84e3e2f64237ee6e570b3293f1d5a7dbf5f4291765a4ddf59 SHA512 5c1ea0d0b5f26411a5b2ad4683933e3b222af44a0e9fa6e584efa504586bdc63294161084d8d74a0c5c9a95961438a6c24e5c945b05eb7d6cd53f91e172fc59e WHIRLPOOL 06ebf0499952f0ee92b4609556dd00af4f392a3445ae7f8cc787bffdf5996bff3dc9a1f3c0af17b243933e337088d5ea670ff44e975a4bf7e464fc0540b32e9b
 DIST vdr-audiorecorder-0.1.0-pre14.tgz 101437 SHA256 18b0dfd023e5bda4785cab832478aae205ca02548b32de4458d628672d6fb8e9 SHA512 bd5a12426ec45f7242f1c912ef916c794be69504ed7e0971373fdbee9d664646b4e42e79919489d9aae7bc8b140fee50ea2601f3bdb4f4b260180474879e99f6 WHIRLPOOL dded93a4d7792c8ea522d65aa082a2230ff4c87a8f88f59f65b3733c950c70c8157f96492d048dadb106e2095124a86c8e1794a3e7a369a656ddcdd0d2338549
 EBUILD vdr-audiorecorder-0.1.0_pre14-r1.ebuild 1278 SHA256 594ac2babcebabc228dabb9187e5a497e9a16c09e7eddeb5459866a185716d8d SHA512 57d8c3dab8797e6c1e271cd049b125bf8d53d037162480dbb80d558da5283e5028113888fbc82a0b35a78ec3ebab65185b157033eb8d1f1ea8217d9d43ceaf0b WHIRLPOOL 2aa6afafa352f851b629897b55e6388818ecbc68b74befe1d68826c58451436723b9e53e610adaa27bbce1e84d7d3b5cc1d353e5d16d192c9f30e6fb90563e37
-EBUILD vdr-audiorecorder-0.1.0_pre14-r2.ebuild 1413 SHA256 047a05b1bc40e589f9987b29745800c4307405a46cbfb5ded2c3f0f562a4c835 SHA512 35fb1011bcf296a373caebe6e6491b0ab1c21bfe061c701b8ff802e2e1e80dd9777153e023afa5d7da9e03d2e313595b38c9da160d90b7971c343428ce620217 WHIRLPOOL d5788ae1b504f63d6f78c28d2cbff4da7a8a8524727b74dcb3fc91cffca137b45e1cf5801f40b5bc44cb4dc3bda448ce6456b3ba9409382a2033e79d984136ca
-MISC ChangeLog 3990 SHA256 1863a11488f64fd2c90fa4ba1ded85a5089bd0fea7ca7d154ea81fd024bc4c27 SHA512 1b1ac7655913848ac51eab4c3fc10bcceb2f774accba6b778155855fad5bf5cf41c5a76b95e43dc197c3979650dd026e2ce8e4e0faee1dfe36c307d66c9275ad WHIRLPOOL 2b4e320de4cd421fa0d82b19b2dab997ebe094b06f6eeafe4f55a2fec6b1759238c72600f0a5eff52f6b0fc599f44fdf5e5d2bb9fd6a2b5ba81c4b880f19aaa6
+EBUILD vdr-audiorecorder-0.1.0_pre14-r2.ebuild 1418 SHA256 5561cd69965d4ec55013e7a1aa5ad4fe238f44542335391b97d7b801bfa84a2d SHA512 293e88276cbefeaaa230c3dd5480ce635073574366df415f297b714c45f07bf605cd91d7983c7601a324229cfa11d04814d8abbca52e76b48f839e28809236ee WHIRLPOOL 32c27c27ee1d321d572c741c1b9f1ebdaeef43831efcbaf9f5ac2b9227a2c93a8a557ae791fd870efef1a162ce2cfc8556c633a7d143f1485e9ee8eb523181b3
+MISC ChangeLog 4206 SHA256 15fdbf65e6dd76f323a7a0d5bdd9ed27872e01f4ddbf4293d6f72d0f688ba69b SHA512 b41550b9c3a52f796bdafb48e9e662e10c3e8b86067fdb45ea7959fc1ac2528cc9c56b9dbdef0cb8f1e1a1c44737374adbc45d8f1b66b90c48ddf78f8f6d1d1d WHIRLPOOL 994692995dbd58472e828e081295c3ac6e02da87e1aa51c65d47a35498a607bab710fb64d3a6a92d0b86738721aacbafa3f94cc58dad85e2aa729ab2bd607b40
 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)
 
-iEYEAREIAAYFAlD5dt4ACgkQvFcC4BYPU0qDpgCgv7Hd9VeSiaKOCSNCwlRYqfiv
-CHYAoI1jOF2ittbFMpO7MI2HdXHzCBUT
-=NEgL
+iQIcBAEBCAAGBQJRv2dxAAoJEOSiRoyO7jvoGGEP/R6hHSviA66pw+CPK+XCb18H
+Il8/DM2pnS6C2KNHerrU82zbyjVgmkQ/BT3lItoy8dk4xft7g3OJfJFL453wxGjZ
+b0GaHA44FUGuSa5ILfUubgLxA0aqnb7OouKt284wwCgLfRFM0WTDXxDbzO/BQ1dL
+31lg0VVyc69F00A28HRc8cHVJb8LPDmJfCY+VbA2Axb4E3+j5nSc+lToKm+iPLLr
+MO+s+Z8bvZ4yzll9XbQ/us8s/Qqly6ew731ZdXY7iyJVUemXpz7nOhCBd6M3z3Oq
+nKfOLrK2uSZqfiL/TCfEn3VdEHEujt+wTyJrKyf5NRaCVH6fUsle8KTR8G5oApwC
+j2mhE33CbaiIfDEKnWCPpiwMImTaa09A3llB5TFsBOcaxB5swTGTOFGTkLqwy3eR
+oOPVk1I/Aq3f30hhT09tB035rKCVswMLf7UDsBG/rO9sQih9zuqtRYloX2UHyGmO
+Wk6ccTY8koj7z0eSDUVPiYr/Ady5n3NDol3N2uRV1GqCuB0RcVS0prY/g+NF6BgP
+miOWxmtQyrH4IITGKYge4VGnJ8y0YLCe5NhYY/LfMYtx5UgW16JMVsajOmaaXdXw
+PNqRuAPFM95tZ8MvcbbFr6vdmxGXf5TnTXg4VZhfeocnTTuT+y6GSsMAk04wGpk+
+fA72dVCuH3TGk+VTkRKA
+=XLV8
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14-libav9.patch b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14-libav9.patch
new file mode 100644
index 000000000000..70512e5c1e48
--- /dev/null
+++ b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14-libav9.patch
@@ -0,0 +1,58 @@
+diff -urN audiorecorder-0.1.0-pre14.old/convert.c audiorecorder-0.1.0-pre14/convert.c
+--- audiorecorder-0.1.0-pre14.old/convert.c	2013-06-17 21:31:31.670412829 +0200
++++ audiorecorder-0.1.0-pre14/convert.c	2013-06-17 21:35:18.387404763 +0200
+@@ -51,8 +51,8 @@
+                 return;
+         }
+ 
+-        decoder_ctx = avcodec_alloc_context();
+-        decoder_open = avcodec_open(decoder_ctx, decoder_codec);
++        decoder_ctx = avcodec_alloc_context3(NULL);
++        decoder_open = avcodec_open2(decoder_ctx, decoder_codec, 0);
+ 
+         if (decoder_open < 0) {
+                 dsyslog("[audiorecorder]: could not open codec mp2 (%s, "
+@@ -77,13 +77,13 @@
+                 return;
+         }
+ 
+-        encoder_ctx = avcodec_alloc_context();
++        encoder_ctx = avcodec_alloc_context3(NULL);
+ 
+         encoder_ctx->bit_rate = bit_rate;
+         encoder_ctx->sample_rate = sample_rate;
+         encoder_ctx->channels = channels;
+ 
+-        encoder_open = avcodec_open(encoder_ctx, encoder_codec);
++        encoder_open = avcodec_open2(encoder_ctx, encoder_codec, 0);
+ 
+         if (encoder_open < 0) {
+                 dsyslog("[audiorecorder]: could not open codec %s (%s, %s())", codec, __FILE__, __func__);
+@@ -111,9 +111,13 @@
+         avcodec_decode_audio(decoder_ctx, (short *)decoder_buf.data,
+                 &decoder_buf.length, mpa_frame->data, mpa_frame->length);
+ #else
++        AVPacket avpkt;
++        av_init_packet(&avpkt);
++        avpkt.data = mpa_frame->data;
++        avpkt.size = mpa_frame->length;
+         decoder_buf.length = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+-        avcodec_decode_audio2(decoder_ctx, (short *)decoder_buf.data,
+-                &decoder_buf.length, mpa_frame->data, mpa_frame->length);
++        int len = avcodec_decode_audio3(decoder_ctx, (short *)decoder_buf.data,
++                &decoder_buf.length, &avpkt);
+ #endif
+ }
+ 
+diff -urN audiorecorder-0.1.0-pre14.old/convert.h audiorecorder-0.1.0-pre14/convert.h
+--- audiorecorder-0.1.0-pre14.old/convert.h	2013-06-17 21:31:31.670412829 +0200
++++ audiorecorder-0.1.0-pre14/convert.h	2013-06-17 21:41:17.056392003 +0200
+@@ -10,7 +10,8 @@
+ #include "a-tools.h"
+ 
+ extern "C" {
+ #include <libavcodec/avcodec.h>
++#include <libavutil/mem.h>
+ }
+ 
+ 
diff --git a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r2.ebuild b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r2.ebuild
index b11dd35939b2..d119c60c9fff 100644
--- a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r2.ebuild
+++ b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r2.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-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r2.ebuild,v 1.2 2013/01/18 16:22:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r2.ebuild,v 1.3 2013/06/17 19:46:02 scarabeus Exp $
 
 EAPI="4"
 
@@ -35,11 +35,11 @@ src_prepare() {
 	sed -i "s:RegisterI18n:// RegisterI18n:" audiorecorder.c
 
 	# UINT64_C is needed by ffmpeg headers
-	append-flags -D__STDC_CONSTANT_MACROS
+	append-cppflags -D__STDC_CONSTANT_MACROS
 
-	epatch "${FILESDIR}/${P}_ffmpeg.diff"
 	epatch "${FILESDIR}/${P}_obsolete-i18n.diff"
 	epatch "${FILESDIR}/${P}-ffmpeg-1.patch"
+	epatch "${FILESDIR}/${P}-libav9.patch"
 }
 
 src_install() {