compile fixes

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

4 files changed, 100 insertions, 5 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/Manifest b/media-plugins/vdr-audiorecorder/Manifest
index 839c72024147..fc4bbc924cfb 100644
--- a/media-plugins/vdr-audiorecorder/Manifest
+++ b/media-plugins/vdr-audiorecorder/Manifest
@@ -6,16 +6,18 @@ AUX rc-addon.sh 371 SHA256 69e156962332b610270a02464cb3b2b164224a3da9741cfa14efd
 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_compilefix.diff 1311 SHA256 7c18ef8a9925bc5464e65c91ec0181193e5297ed5673a68c16a9ddf9e6066b37 SHA512 7780175de56f1ddfe2bfd03c56aa4f28b4b20caff00fc5130e1e755daf4ba2f28818dd5b736e6013f8d2a0f4e68409d67e58b2a13f9dd4e2e7942234c0d6e38a WHIRLPOOL 39ee36c3f00a1e67bba567f925ebdb379dcee80a62a86bc30146db520b7cc6338c77d62ede7da3254059276f917ce944235480236122443bc85b7a369091a7b6
 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-r2.ebuild 1418 SHA256 3e7f464291c75b1b92cb8c05d995d76b1f1f578be8298a29547e7fe49e92b565 SHA512 fa8da15b4a4e11735719e28d880083bb26edf76ca12e058b47b2ee3232dc005f2325154ddee639357d3e7728a010dda96b1556cf9769fd24a4f65e79f6995a75 WHIRLPOOL 7e68ee9ca5cad8e63f9c2c8769caa2ee142c60e4877e0cb7fcc744f1c31125da838f8fa543e3e31a9a9fd100508e91de3632df4c7e6e87ebae5ce1a2e1a22a40
-MISC ChangeLog 4546 SHA256 58aa744464d0b350654349ce0aca9f51c1352bd143bf8a086b8df1dde6ce1d3f SHA512 10ebe362298cfd42bf52167cdef68e806b3474dc60fdaf21397a707ea438b61d481a17b9eb8d37c4bb43b74400cb7d4fefca8cd9a8575432e686f5d70e39108e WHIRLPOOL 089d0a2224636b0e6bbeda4dbdfba2579f4c166c6938ce14b6e166c11e0c092fea781e291666cc4baccc4d4a05e30e089e7d3b4de18138cfe46f3311fa26a1f4
+EBUILD vdr-audiorecorder-0.1.0_pre14-r3.ebuild 1618 SHA256 a4f412e2bd7efefca944728eb890bc043e4809776b670add46d0b12d430ef4ea SHA512 9697ad149d09603e4bb12bf83f02bad2ffed793de883597ecf0595d75e18da1250033695dbda20256fb5a2058ad0a8b5087691f4acb705475840ef467bd26ad0 WHIRLPOOL a9171658da99b06a767015345ea0ed9dff98214d0d953cacf4112b01e8b747334fb2ec64606ef0337df9a35165e2514e06e7ee8ad2542d342ec7832650891ae3
+MISC ChangeLog 4767 SHA256 b02c368e0a5ca97df999971b50c3cb1835b097a73d89901d2afe754e29b4d546 SHA512 77dfab5a25aabe13e49f6bcb5cc2c78589572519b7e145a7ec9beec2aac13eed14e883aa2c1a4e54ad06afac44ea1363d628db84f8035d94169817e66a32fabf WHIRLPOOL d9d8beaffb1638d9dde75bfa4872527db7300c87fae8253fc7369c3265bb4509f9a73119b991a1825206b898a8a825b601e51686618654f5b3ffaa572e1bfeef
 MISC metadata.xml 298 SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 SHA512 73724667e75fe7d8ca3b0d440e79d70f1a9fa900cf9ea9c3c03036cef44d5fe3e24ce745630e04e9a0a3776f4a73bc47d29f92a4bbe93af0ad544936f5e33b3c WHIRLPOOL e77dccdbffec743aaa54f4dd9529b70e22df631d1d93375274ef70022b8fd0e7d9c3f2f60d4fdbf6f6d72fac24c709357d6ca949068a3eca3558f8a377360913
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFTUg8pdn07HTTCgIoRCKBEAKCkd/4FNmc6vqtmf5JTLB+7o/92AACgiTqX
-XjQhdYosPsfBx92DoupDpC0=
-=+tZm
+iD8DBQFTUkW6dn07HTTCgIoRCFA3AJ9LT1EhYmX8zNvdEuwhVkhzxDerVwCgnTGv
+B4pYoiqqG0P5agigd87RrVg=
+=bu4d
 -----END PGP SIGNATURE-----
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
+}