fixed compile with >=vdr-2.1.3, thx to E.Seifert on wrt bug 503452

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

3 files changed, 56 insertions, 1 deletions

diff --git a/media-plugins/vdr-vcd/ChangeLog b/media-plugins/vdr-vcd/ChangeLog
index 999e4fec40c8..cae0fc5a3d43 100644
--- a/media-plugins/vdr-vcd/ChangeLog
+++ b/media-plugins/vdr-vcd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-vcd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/ChangeLog,v 1.14 2014/02/23 21:28:09 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/ChangeLog,v 1.15 2014/03/08 21:42:20 hd_brummy Exp $
+
+*vdr-vcd-0.9-r2 (08 Mar 2014)
+
+  08 Mar 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-vcd-0.9_devicetrickspeed.patch, +vdr-vcd-0.9-r2.ebuild:
+  fixed compile with >=vdr-2.1.3, thx to E.Seifert on wrt bug 503452
 
   23 Feb 2014; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-vcd-0.9.ebuild:
   cleanup old, depended on vdr-plugin.eclass2
diff --git a/media-plugins/vdr-vcd/files/vdr-vcd-0.9_devicetrickspeed.patch b/media-plugins/vdr-vcd/files/vdr-vcd-0.9_devicetrickspeed.patch
new file mode 100644
index 000000000000..69aefba987a7
--- /dev/null
+++ b/media-plugins/vdr-vcd/files/vdr-vcd-0.9_devicetrickspeed.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=503452
+patch provided by E.Seifert
+
+--- vcd-0.9/player.c	2008-01-16 13:26:38.000000000 +0100
++++ vcd-0.9/player.c	2014-03-04 22:07:39.374281971 +0100
+@@ -161,7 +161,11 @@
+      int sp = (Speeds[nts] > 0) ? Mult / Speeds[nts] : -Speeds[nts] * Mult;
+      if (sp > MAX_VIDEO_SLOWMOTION)
+         sp = MAX_VIDEO_SLOWMOTION;
++#if VDRVERSNUM >= 20103
++     DeviceTrickSpeed(sp,true);
++#else
+      DeviceTrickSpeed(sp);
++#endif
+   }
+ }
+
diff --git a/media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild b/media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild
new file mode 100644
index 000000000000..671010cfd7b3
--- /dev/null
+++ b/media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vcd/vdr-vcd-0.9-r2.ebuild,v 1.1 2014/03/08 21:42:20 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR plugin: play video cds"
+
+HOMEPAGE="http://www.heiligenmann.de/"
+SRC_URI=" http://www.heiligenmann.de/vdr/download/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.5.9"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}_xgettext.diff"
+		"${FILESDIR}/${P}_vdr-1.7.2.diff"
+		"${FILESDIR}/${P}_devicetrickspeed.patch" )
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# Patch Makefile, as VDRDIR is no well known variable name
+	# to stop spare -I in gcc cmdline
+	sed -e 's:$(VDRINC):$(VDRDIR)/include:' -i Makefile
+}