fixed ffmpeg compile, bug 423671; vdr-plugin-2.eclass

(Portage version: 2.1.10.11/cvs/Linux i686)

4 files changed, 113 insertions, 2 deletions

diff --git a/media-plugins/vdr-audiorecorder/ChangeLog b/media-plugins/vdr-audiorecorder/ChangeLog
index feb6f3686113..4212329b14d9 100644
--- a/media-plugins/vdr-audiorecorder/ChangeLog
+++ b/media-plugins/vdr-audiorecorder/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-audiorecorder
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.14 2011/04/03 19:13:12 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.15 2012/07/01 11:33:15 hd_brummy Exp $
+
+*vdr-audiorecorder-0.1.0_pre14-r2 (01 Jul 2012)
+
+  01 Jul 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-audiorecorder-0.1.0_pre14-r2.ebuild,
+  +files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff,
+  +files/vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff:
+  fixed ffmpeg compile, bug 423671; vdr-plugin-2.eclass
+
 
   03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   -vdr-audiorecorder-0.1.0_pre14.ebuild,
diff --git a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff
new file mode 100644
index 000000000000..96523b1f5024
--- /dev/null
+++ b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/show_bug.cgi?id=423671
+fixed compile newer ffmepg
+
+signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/07/01)
+diff -Naur audiorecorder-0.1.0-pre14.orig/convert.c audiorecorder-0.1.0-pre14/convert.c
+--- audiorecorder-0.1.0-pre14.orig/convert.c	2012-07-01 11:38:56.000000000 +0200
++++ audiorecorder-0.1.0-pre14/convert.c	2012-07-01 11:41:12.000000000 +0200
+@@ -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 --git a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff
new file mode 100644
index 000000000000..e062703359d5
--- /dev/null
+++ b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff
@@ -0,0 +1,28 @@
+fixed for obsolet i18n handling, up from vdr-1.7.27
+vdr-plugin-2.eclass will not help in this case
+
+signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/07/01)
+
+diff -Naur audiorecorder-0.1.0-pre14.orig/audiorecorder_i18n.h audiorecorder-0.1.0-pre14/audiorecorder_i18n.h
+--- audiorecorder-0.1.0-pre14.orig/audiorecorder_i18n.h	2012-07-01 12:49:17.000000000 +0200
++++ audiorecorder-0.1.0-pre14/audiorecorder_i18n.h	2012-07-01 12:49:59.000000000 +0200
+@@ -11,6 +11,6 @@
+ 
+ #include <vdr/i18n.h>
+ 
+-extern const tI18nPhrase Phrases[];
++//extern const tI18nPhrase Phrases[];
+ 
+ #endif //__I18N__H
+diff -Naur audiorecorder-0.1.0-pre14.orig/Makefile audiorecorder-0.1.0-pre14/Makefile
+--- audiorecorder-0.1.0-pre14.orig/Makefile	2012-07-01 12:49:17.000000000 +0200
++++ audiorecorder-0.1.0-pre14/Makefile	2012-07-01 12:49:44.000000000 +0200
+@@ -70,7 +70,7 @@
+ 
+ ### The object files (add further files here):
+ 
+-OBJS = $(PLUGIN).o mainmenu.o browse.o browse-item.o column.o dispatcher.o audioreceiver.o postdata.o trackinfo.o postproc.o rds.o convert.o cache.o xml-cache.o xml-base.o setup.o mpa-frame.o audiorecorder_
++OBJS = $(PLUGIN).o mainmenu.o browse.o browse-item.o column.o dispatcher.o audioreceiver.o postdata.o trackinfo.o postproc.o rds.o convert.o cache.o xml-cache.o xml-base.o setup.o mpa-frame.o
+ 
+ ### Implicit rules:
+ 
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
new file mode 100644
index 000000000000..ab6d5fefb86d
--- /dev/null
+++ b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 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.1 2012/07/01 11:33:15 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin-2 flag-o-matic
+
+MY_P=${P/_pre/-pre}
+
+DESCRIPTION="VDR plugin: automatically record radio-channels and split it into tracks according to RadioText-Info"
+HOMEPAGE="http://www.a-land.de/audiorecorder/"
+SRC_URI="http://www.zulu-entertainment.de/files/${PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+S=${WORKDIR}/${MY_P#vdr-}
+
+DEPEND=">=media-video/vdr-1.6.0
+		media-libs/taglib
+		virtual/ffmpeg[encode,mp3]
+		>=dev-libs/tinyxml-2.6.1[stl]"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-shared-tinyxml.diff"
+
+	vdr-plugin-2_src_prepare
+
+	sed -i "s:include <avcodec.h>:include <libavcodec/avcodec.h>:" convert.h audiorecorder.c
+	sed -i "s:RegisterI18n:// RegisterI18n:" audiorecorder.c
+
+	# UINT64_C is needed by ffmpeg headers
+	append-flags -D__STDC_CONSTANT_MACROS
+
+	epatch "${FILESDIR}/${P}_ffmpeg.diff"
+	epatch "${FILESDIR}/${P}_obsolete-i18n.diff"
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+	keepdir /var/vdr/audiorecorder
+	chown -R vdr:vdr "${D}"/var/vdr
+
+	insinto /etc/vdr/plugins/audiorecorder
+	doins "${S}"/contrib/audiorecorder.conf
+}