compile fixes

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)

3 files changed, 94 insertions, 1 deletions

diff --git a/media-plugins/vdr-audiorecorder/ChangeLog b/media-plugins/vdr-audiorecorder/ChangeLog
index e5ee6582dda9..459f87f1383a 100644
--- a/media-plugins/vdr-audiorecorder/ChangeLog
+++ b/media-plugins/vdr-audiorecorder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-audiorecorder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.19 2014/04/19 05:52:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.20 2014/04/19 09:45:24 hd_brummy Exp $
+
+*vdr-audiorecorder-0.1.0_pre14-r3 (19 Apr 2014)
+
+  19 Apr 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-audiorecorder-0.1.0_pre14-r3.ebuild,
+  +files/vdr-audiorecorder-0.1.0_pre14_compilefix.diff:
+  compile fixes
 
   19 Apr 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-audiorecorder-0.1.0_pre14-r2.ebuild:
diff --git a/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_compilefix.diff b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_compilefix.diff
new file mode 100644
index 000000000000..841007fc18c0
--- /dev/null
+++ b/media-plugins/vdr-audiorecorder/files/vdr-audiorecorder-0.1.0_pre14_compilefix.diff
@@ -0,0 +1,30 @@
+diff -Naur audiorecorder-0.1.0-pre14.orig/audioreceiver.c audiorecorder-0.1.0-pre14/audioreceiver.c
+--- audiorecorder-0.1.0-pre14.orig/audioreceiver.c	2014-04-19 11:16:11.038099054 +0200
++++ audiorecorder-0.1.0-pre14/audioreceiver.c	2014-04-19 11:20:39.847541064 +0200
+@@ -9,9 +9,12 @@
+ 
+ /* --- cAudioReceiver ------------------------------------------------------- */
+ 
+-cAudioReceiver::cAudioReceiver(const cChannel *_channel)
+-:cReceiver(_channel->GetChannelID(), -2, _channel->Apid(0)), cThread()
++cAudioReceiver::cAudioReceiver(const cChannel* _channel)
++:cReceiver(_channel, -2), cThread("audiorecorder-receiver")
+ {
++	SetPids(NULL);
++	AddPid(_channel->Apid(0));
++
+         channel = _channel;
+ 
+         active = false;
+diff -Naur audiorecorder-0.1.0-pre14.orig/audioreceiver.h audiorecorder-0.1.0-pre14/audioreceiver.h
+--- audiorecorder-0.1.0-pre14.orig/audioreceiver.h	2014-04-19 11:16:10.982099587 +0200
++++ audiorecorder-0.1.0-pre14/audioreceiver.h	2014-04-19 11:21:18.453173527 +0200
+@@ -44,7 +44,7 @@
+         virtual void Action(void);
+         virtual void Activate(bool on);
+ public:
+-        cAudioReceiver(const cChannel *_channel);
++        cAudioReceiver(const cChannel* _channel);
+         ~cAudioReceiver();
+         
+         void set_device_number(int _device_number) { device_number =
diff --git a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r3.ebuild b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r3.ebuild
new file mode 100644
index 000000000000..a496b2ee1d94
--- /dev/null
+++ b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre14-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 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-r3.ebuild,v 1.1 2014/04/19 09:45:24 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+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() {
+	# remove untranslated po files
+	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,es_ES,et_EE,fi_FI,fr_FR,hr_HR,hu_HU,it_IT,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+
+	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-cxxflags -D__STDC_CONSTANT_MACROS
+
+	epatch "${FILESDIR}/${P}_obsolete-i18n.diff"
+	epatch "${FILESDIR}/${P}-ffmpeg-1.patch"
+	epatch "${FILESDIR}/${P}-libav9.patch"
+	epatch "${FILESDIR}/${P}_compilefix.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
+}