summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-10-18 09:35:15 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-10-18 09:35:15 +0000
commite6f1d2717f3c99c526af14b695306989287fcb64 (patch)
treeb4af7640f930121718508ac76bf1f22f96248533 /media-plugins
parentCorrected SRC_URI for xerces-c-3.0.0 (bug #242264) (diff)
downloadgentoo-2-e6f1d2717f3c99c526af14b695306989287fcb64.tar.gz
gentoo-2-e6f1d2717f3c99c526af14b695306989287fcb64.tar.bz2
gentoo-2-e6f1d2717f3c99c526af14b695306989287fcb64.zip
fix build with latest ffmpeg, bug #242068
(Portage version: 2.2_rc12/cvs/Linux 2.6.26.6 x86_64)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-audiorecorder/ChangeLog7
-rw-r--r--media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre6-avcodec52.patch14
-rw-r--r--media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild5
3 files changed, 23 insertions, 3 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/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