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

Package-Manager: portage-2.1.10.11/cvs/Linux i686

5 files changed, 122 insertions, 7 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/Manifest b/media-plugins/vdr-audiorecorder/Manifest
index 0d9c59fb5fee..8950a3eb6aa1 100644
--- a/media-plugins/vdr-audiorecorder/Manifest
+++ b/media-plugins/vdr-audiorecorder/Manifest
@@ -4,14 +4,18 @@ Hash: SHA1
 AUX confd 366 RMD160 a1ed9617f2d0022a478158992472536eabc3e40a SHA1 ab6296de955c7ef8e0210313cb502c592fa5e5f9 SHA256 ea6e7e5ab5cbe6e527ea0d0cf5c566a36c7d758060e0fa0652e3eacf4dc827d5
 AUX rc-addon.sh 371 RMD160 aae201d98de8b91f38be9b4ea5ea7eee43e3b6a2 SHA1 3d42b741edb36c2f9b3d09fa3b12afcd598d427c SHA256 69e156962332b610270a02464cb3b2b164224a3da9741cfa14efdcfcedd2d282
 AUX vdr-audiorecorder-0.1.0_pre14-shared-tinyxml.diff 5274 RMD160 87833447f139fef55df12b50878ac2832fc403e9 SHA1 3c654679fb1ea5e5dcc1ed433c2f78a0de8e123d SHA256 c7d78ae65c8367b5a5f5876a79e1440c2a8f8732d7c0637398d91babcfa777f5
+AUX vdr-audiorecorder-0.1.0_pre14_ffmpeg.diff 1045 RMD160 1d3504f59e3e2620a4317dd633eca17a55ffd692 SHA1 818dc67d8dc7cf0777ed5b49d9ffc35aa709feb8 SHA256 3c952fc26472e5f2eacddb17d48f208d6d4607875b6b641562caa6e832f35f15
+AUX vdr-audiorecorder-0.1.0_pre14_obsolete-i18n.diff 1337 RMD160 1d915fa663fe951bbe601bb126410ae1a2ab99fa SHA1 1904159cd78bdf263dd929d15a03c5f8841854f7 SHA256 4c95a438f388d1c84e3e2f64237ee6e570b3293f1d5a7dbf5f4291765a4ddf59
 DIST vdr-audiorecorder-0.1.0-pre14.tgz 101437 RMD160 ffac124c4e2d93ef94ba72485d938bf3bf2d6602 SHA1 20c4b766cbf7e169190e9297e3f1c25cb669d968 SHA256 18b0dfd023e5bda4785cab832478aae205ca02548b32de4458d628672d6fb8e9
 EBUILD vdr-audiorecorder-0.1.0_pre14-r1.ebuild 1278 RMD160 77be04245ec3c622c4c7e68f59c5dd8e67fccd10 SHA1 98331297272690c026541cb6a84d8e6eb7b00573 SHA256 594ac2babcebabc228dabb9187e5a497e9a16c09e7eddeb5459866a185716d8d
-MISC ChangeLog 3470 RMD160 04816e9bf9b60596ff7400d83e647114b6afdda6 SHA1 1b6303e2457fcc0c3e8c69a986655ae4ffdb48fe SHA256 cb6720277e03344291dd895ba3a4c0001f27ad072149891e469142f2b002c6eb
+EBUILD vdr-audiorecorder-0.1.0_pre14-r2.ebuild 1372 RMD160 c471e9d4304b30b5b6cb28651b28e6074a961c0c SHA1 0941d704c541205138c2c5519b86ccaa16101139 SHA256 bb0e4f60b24376aa34b57a0ce8a864382e030930bd739e9113effb6777108e7b
+MISC ChangeLog 3787 RMD160 0f2640cd55a20d8608c24c41b6554e6434e5d003 SHA1 e9389dd3c97e6362b3f23e86cd0fd2dc9dde4a8e SHA256 7a52859ca953ef70bf46efe1c41aa3e8008f7ca60761b7cc02c27d18d8ae76bb
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAk2YxZAACgkQHB6c3gNBRYd7AACgmnZuDxAX3JWHp+VICsNYL5Qk
-fuMAoIzJXB1nEDJCspFwvs1oBL4FquGx
-=9aoo
+iD8DBQFP8DWKdn07HTTCgIoRAgVnAKCL2Fl4xp551v+Sy8ouqqyvJs3l0gCfcOx8
+suayho6p0deycCocAqrwtGE=
+=6Chn
 -----END PGP SIGNATURE-----
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
+}