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

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

5 files changed, 59 insertions, 14 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/Manifest b/media-plugins/vdr-rotor/Manifest
index c25e2d36e3a6..298fac3d1234 100644
--- a/media-plugins/vdr-rotor/Manifest
+++ b/media-plugins/vdr-rotor/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA1
 
 AUX vdr-rotor-0.1.4_vdr-1.5.10.diff 4142 RMD160 f1fb29721fca68b1094d50ab59883df9902061c9 SHA1 79c827c0ccfe8254a2551528f6003ceb756c2e17 SHA256 5540695a98dc72b8e19f6a40bffed9e35660a5ce71aaf2f791489c07867f5255
+AUX vdr-rotor-0.1.5_vdr-1.7.13.diff 1611 RMD160 b21d1f4752dc25a06f68ddb567abf24ef658a235 SHA1 b243a5589c73470446fb24e55f41c148b49b7194 SHA256 1607325c2c8a1f6c77f16dc861c7dd9897085aaf768b5aaac5d2b8ff0d8ac8e7
 DIST vdr-rotor-0.1.4-vdr1.5.7.tgz 39572 RMD160 8e541ea64bb0d1cd7e72ca42795bd1665ef30e95 SHA1 df6ca6d6ee5dc832cb919b157e997e74aac3fcd7 SHA256 aad69f61af21e9438ed9d7e65efdb7c60b2f1f4291c0583767b6e8e30d6669a2
 DIST vdr-rotor-0.1.4.tgz 34968 RMD160 7811c14da307383254c9e32639cf3b258372aede SHA1 b82ff493e39b0c4be4ab204df007f0130b9a648f SHA256 eadb0c241c310fca4af3e23cb1476d19744156b011bce4cc94a69f25706247fa
 DIST vdr-rotor-0.1.5.tgz 40027 RMD160 89806b83fe0d37e661401425890524b49fc7e49e SHA1 8da30583b3d5ff06422c7d3a522325af5de9ab68 SHA256 fa13b710a1d547d9df841b881c40c9fb301aaf969fca9e71f50360a9edfabab6
 EBUILD vdr-rotor-0.1.4-r1.ebuild 973 RMD160 f1775ebd87b04ded6ea6d861e9c0196076c3664b SHA1 59d2b7d1b7727cff3e4a6f34c9f56c26662a716c SHA256 f915bae8941ccc921d899daa6544655bf34edfe10322393e2e0a3e65c70077f2
-EBUILD vdr-rotor-0.1.4.ebuild 823 RMD160 3a77f8050b88b2cae7b1964ddd018c86b00bcf9c SHA1 666044d3ac4c4baeb668b1442bf5ad4944a9de48 SHA256 761d0de5cb8a51f6a1fe9abe6a42e52ebbc734659ee31fc3856ebbd821e97999
-EBUILD vdr-rotor-0.1.5.ebuild 777 RMD160 281ed8dd22eb4aaf5d6bda865d18156df39ba06d SHA1 65f1b177fcaeeb802c04067c555ca52f42ea22fd SHA256 9062967f2ad7f1fca51da40351bf07c539290c2700da5fbdb2edaa54c22bba8b
-MISC ChangeLog 1321 RMD160 a7f8a0f4b463249fa2f387bd3bbf2ad0c5a2879b SHA1 e22ef60d7a4b8333bc1034a20152f729c918e9ee SHA256 97c7193fc08cabdc6a5b59099ba7e48110dcb3dd3f1ea014a24d34edd3a48b62
+EBUILD vdr-rotor-0.1.4.ebuild 825 RMD160 aa1773fd83fecabb4a223a90dc6fddba83752dee SHA1 0ab4dff7d5ecca9c094ed30ecbc9be077a97af6f SHA256 239adaf26d21422ce213ddf5210d79cd0be92b9be9449cfba7e1103afac0c273
+EBUILD vdr-rotor-0.1.5.ebuild 923 RMD160 2c6fa616149bee33c547fbd2b21fa35f6602fca0 SHA1 7ad9f4ec2c9945b134c5c88df8032df8997d2db5 SHA256 5296e0568b43361f56551a72a17723e0dda2ec7ccc8a2cfa3efe5b40485eeff9
+MISC ChangeLog 1548 RMD160 9aa86a93c8c68de3c5ee26e0033710e76d8166eb SHA1 177b9b103d722ea09d866da6ba87adb3e12a1690 SHA256 8c6d3e5fedc8947f9e6aa8d174456c123595df109bf29075c2643278cca76419
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAksAhsEACgkQt2vP6XvVdOcEpQCgvpQmSj+v8kOKnkqMexaV8p8E
-pH0AmwXFdvUPK1urjCE/yVAMpdtVMQGH
-=Dero
+iD8DBQFM9mGwdn07HTTCgIoRAnMoAJ478RqPzkqWvnoi8jYS/0vKE/lI0gCfezha
+1TS8hbY1g9fySeFmsqq6SLo=
+=plJ0
 -----END PGP SIGNATURE-----
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
+}