fix build with latest ffmpeg, bug #242068

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.6 x86_64

4 files changed, 29 insertions, 8 deletions

diff --git a/media-plugins/vdr-audiorecorder/ChangeLog b/media-plugins/vdr-audiorecorder/ChangeLog
index 5c3508de4805..1e59ea43acb5 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.9 2008/04/21 10:56:40 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.10 2008/10/18 09:35:15 aballier Exp $
+
+  18 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/vdr-audiorecorder-0.1.0_pre6-avcodec52.patch,
+  vdr-audiorecorder-0.1.0_pre6.ebuild:
+  fix build with latest ffmpeg, bug #242068
 
   21 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
   +files/vdr-audiorecorder-0.1.0_pre6-ffmpeg-0.4.9_p20080326-new_header.diff
diff --git a/media-plugins/vdr-audiorecorder/Manifest b/media-plugins/vdr-audiorecorder/Manifest
index ccc48e4448a2..857c33039b6c 100644
--- a/media-plugins/vdr-audiorecorder/Manifest
+++ b/media-plugins/vdr-audiorecorder/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 AUX confd 366 RMD160 a1ed9617f2d0022a478158992472536eabc3e40a SHA1 ab6296de955c7ef8e0210313cb502c592fa5e5f9 SHA256 ea6e7e5ab5cbe6e527ea0d0cf5c566a36c7d758060e0fa0652e3eacf4dc827d5
 AUX rc-addon.sh 336 RMD160 c87e6bcccc5f8632a82198dc88a7ffb957fc405d SHA1 c8ce4b7fed469fb38af7f2eec13d71781abd1864 SHA256 51e8b2f3a2382e047a97b1132cf56aa043e7852c3c470e824c0c5aabc42cc017
+AUX vdr-audiorecorder-0.1.0_pre6-avcodec52.patch 581 RMD160 7504a5c409ec9af879fdc6a6cfd8fbc6e21db98a SHA1 14592a2e41b4ca8e85c132992dbf56e51b14b64b SHA256 66d34f1bde3a9e928c7a59e0e6ff25e8c12c3220def0b9c53437ac48c72c4918
 AUX vdr-audiorecorder-0.1.0_pre6-ffmpeg-0.4.9_p20080326-new_header.diff 1823 RMD160 7638ad52e92695f0fa03ab3a713d0fd3166d615f SHA1 f1d828b1245b8e8f6f95a47e06df6fe49afe8ec0 SHA256 16dbb5060e8c76009f23ebdc035320c0b7c7b5e17f6d5072e72db1d900fa5e7b
 AUX vdr-audiorecorder-0.1.0_pre6-vdr-1.5.0.diff 644 RMD160 e6869e96a41c2ac637505059b580853034ed3a9b SHA1 4eb79c69f0a117b842566f86f93b4b9a5701332c SHA256 22b6266dfdebe2e3a9304535c84833884a30af90757fe5129289f6714ba1c511
 DIST vdr-audiorecorder-0.1.0-pre6.tgz 73409 RMD160 91d442fe764494f147c96041f669f7ed4271f9cc SHA1 47bd8861787e13c1424374603447cecf54a8d1d4 SHA256 f4f3f413d66facab193b4181fb1c9f0d8b81a4a3bb12fa3eb71d0cf8dd8e4cd7
-EBUILD vdr-audiorecorder-0.1.0_pre6.ebuild 1020 RMD160 d5104f68b21f2f50265291e98c0c28461f21a61e SHA1 6690450eac0a6725d5a31acd68063f2ab4754cf7 SHA256 9bc05a150fe57a5590275fec4b42927285f8bc55229b1a4d15ec47828f385100
-MISC ChangeLog 2224 RMD160 8f74e69cd92816ac5dc29d42834f91946990ff17 SHA1 ec2286ceb39f51acda61770eb994d3e5edefc26b SHA256 2a80853c565092d4549467593f2bb2755634897128b004035349eee06e4eab74
+EBUILD vdr-audiorecorder-0.1.0_pre6.ebuild 1061 RMD160 08f1ef25e865c8c04612a6a9b7bbfc9d74738bed SHA1 9c26a310d9fb57501287b4ae6389c0dc51894e0c SHA256 84fbecdfb81575fec24ddbd80db7fd16a9562c4c7b1897be5868d2484f421e0b
+MISC ChangeLog 2420 RMD160 ae68c8d5a25c47885b0f2bf87cfec677f37dd7f6 SHA1 d52c35e765ffafa99cbe625211588108e78894b1 SHA256 2d4eecbf74cc1da3446808e14d2ac7ca018772c5c7b06a9baac242ffbe2770c2
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgMcu4ACgkQt2vP6XvVdOcqvACeOq0OAgK5nzRUcN71UK/ZyEbN
-vIMAoIki61kT8Ix2lpIlkIbWC8Mqdrzz
-=N4Q9
+iEYEARECAAYFAkj5rdsACgkQvFcC4BYPU0o6PwCcD2KM4GCnzVkBN7aBEP6KNJ+U
+HmIAn2dj+EGyV5Tsz4iwtsOewVVY9y8X
+=305O
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-avcodec52.patch b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-avcodec52.patch
new file mode 100644
index 000000000000..f14f92ccac32
--- /dev/null
+++ b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-avcodec52.patch
@@ -0,0 +1,14 @@
+Index: audiorecorder-0.1.0-pre6/convert.c
+===================================================================
+--- audiorecorder-0.1.0-pre6.orig/convert.c
++++ audiorecorder-0.1.0-pre6/convert.c
+@@ -107,7 +107,8 @@ void cConvert::decode_mpa_frame(mpeg_aud
+                 return;
+         }
+         
+-        avcodec_decode_audio(decoder_ctx, (short *)decoder_buf.data,
++        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);
+ }
+ 
diff --git a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild
index 2f924f2ad0f9..df104a25e74d 100644
--- a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild
+++ b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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_pre6.ebuild,v 1.5 2008/04/21 10:56:40 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild,v 1.6 2008/10/18 09:35:15 aballier Exp $
 
 inherit vdr-plugin
 
@@ -24,7 +24,8 @@ DEPEND=">=media-video/vdr-1.3.31
 
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}/${P}-vdr-1.5.0.diff")
+PATCHES=("${FILESDIR}/${P}-vdr-1.5.0.diff"
+	"${FILESDIR}/${P}-avcodec52.patch" )
 
 src_unpack() {
 	vdr-plugin_src_unpack