patch to fix compile probs on vdr up from 1.7.13 added, thx to M.Bürge

(Portage version: 2.1.8.3/cvs/Linux i686)

4 files changed, 50 insertions, 7 deletions

diff --git a/media-plugins/vdr-rotor/ChangeLog b/media-plugins/vdr-rotor/ChangeLog
index 66e8ddcc54eb..9ea6802be8f7 100644
--- a/media-plugins/vdr-rotor/ChangeLog
+++ b/media-plugins/vdr-rotor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-rotor
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/ChangeLog,v 1.8 2009/11/15 22:54:52 zzam Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/ChangeLog,v 1.9 2010/12/01 14:54:17 hd_brummy Exp $
+
+  01 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-rotor-0.1.4.ebuild, vdr-rotor-0.1.5.ebuild,
+  +files/vdr-rotor-0.1.5_vdr-1.7.13.diff:
+  patch to fix compile probs on vdr up from 1.7.13 added, thx to M.Bürge
 
 *vdr-rotor-0.1.5 (15 Nov 2009)
 
diff --git a/media-plugins/vdr-rotor/files/vdr-rotor-0.1.5_vdr-1.7.13.diff b/media-plugins/vdr-rotor/files/vdr-rotor-0.1.5_vdr-1.7.13.diff
new file mode 100644
index 000000000000..7e24f08d2e53
--- /dev/null
+++ b/media-plugins/vdr-rotor/files/vdr-rotor-0.1.5_vdr-1.7.13.diff
@@ -0,0 +1,30 @@
+http://www.forum.free-x.de/wbb/index.php?page=Thread&postID=13727#post13727
+
+fix compile problems vdr up 1.7.13
+diff -u orig/rotor-0.1.5/menu.c rotor-0.1.5/menu.c
+--- orig/rotor-0.1.5/menu.c	2009-10-04 14:54:22.000000000 +0300
++++ rotor-0.1.5/menu.c	2010-03-06 22:42:23.000000000 +0200
+@@ -139,7 +139,8 @@
+   RotorPos=RotorPositions.GetfromSource(OldChannel->Source());
+   Position=RotorPos->GetPos();
+   Frequenz=OldChannel->Frequency();
+-  if ((*OldChannel).Polarization() == 'v' || (*OldChannel).Polarization() == 'V')
++  cDvbTransponderParameters dtp((*OldChannel).Parameters());
++  if (dtp.Polarization() == 'v' || dtp.Polarization() == 'V')
+     Pol='V';
+   else
+     Pol='H';
+Общие подкаталоги: orig/rotor-0.1.5/patches и rotor-0.1.5/patches
+Общие подкаталоги: orig/rotor-0.1.5/po и rotor-0.1.5/po
+diff -u orig/rotor-0.1.5/rotor.c rotor-0.1.5/rotor.c
+--- orig/rotor-0.1.5/rotor.c	2009-10-04 15:10:26.000000000 +0300
++++ rotor-0.1.5/rotor.c	2010-03-05 23:07:52.000000000 +0200
+@@ -93,7 +93,7 @@
+   {
+     if ((source->Code() & 0xC000) != 0x8000)
+       continue;
+-    if ((diseqc=Diseqcs.Get(source->Code(),12000,'h')) || (diseqc=Diseqcs.Get(source->Code(),12000,'v')) || (diseqc=Diseqcs.Get(source->Code(),12000,'l')) || (diseqc=Diseqcs.Get(source->Code(),12000,'r'))) 
++    if ((diseqc=Diseqcs.Get(0,source->Code(),12000,'h')) || (diseqc=Diseqcs.Get(0,source->Code(),12000,'v')) || (diseqc=Diseqcs.Get(0,source->Code(),12000,'l')) || (diseqc=Diseqcs.Get(0,source->Code(),12000,'r'))) 
+     {
+       char *c=strdup(diseqc->Commands());
+       while (c = strchr(c, '['))
diff --git a/media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild b/media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild
index d83afa85d0af..570a3422b47a 100644
--- a/media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild
+++ b/media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild,v 1.5 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/vdr-rotor-0.1.4.ebuild,v 1.6 2010/12/01 14:54:17 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -29,6 +29,6 @@ pkg_setup() {
 src_unpack() {
 	vdr-plugin_src_unpack
 
-	sed -i ${S}/filter.c \
+	sed -i "${S}"/filter.c \
 		-e "s:libsi/:vdr/libsi/:"
 }
diff --git a/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild b/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild
index f6216f56b14f..fc89df00f043 100644
--- a/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild
+++ b/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild,v 1.1 2009/11/15 22:54:52 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rotor/vdr-rotor-0.1.5.ebuild,v 1.2 2010/12/01 14:54:17 hd_brummy Exp $
 
 EAPI="2"
 
@@ -27,3 +27,11 @@ pkg_setup() {
 		die "Unpatched vdr detected!"
 	fi
 }
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	if has_version ">=media-video/vdr-1.7.13"; then
+		epatch "${FILESDIR}/${P}_vdr-1.7.13.diff"
+	fi
+}