fixed compile probs gcc-4.3.x #bug 251186, thanks to Diego E. Petteno; added compile fix for vdr-1.7.x

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.21-xen-main-r1 i686

5 files changed, 52 insertions, 12 deletions

diff --git a/media-plugins/vdr-channelscan/ChangeLog b/media-plugins/vdr-channelscan/ChangeLog
index 9f680017a998..fd03798fa324 100644
--- a/media-plugins/vdr-channelscan/ChangeLog
+++ b/media-plugins/vdr-channelscan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-channelscan
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/ChangeLog,v 1.10 2008/04/23 09:00:03 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/ChangeLog,v 1.11 2009/01/06 20:22:30 hd_brummy Exp $
+
+  06 Jan 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-channelscan-0.1.0-vdr-1.7.x.diff,
+  +files/vdr-channelscan-0.1.0_gcc-4.3.x.diff, vdr-channelscan-0.1.0.ebuild:
+  fixed compile probs gcc-4.3.x #bug 251186, thanks to Diego E. Petteno;
+  added compile fix for vdr-1.7.x
 
   23 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
   +files/vdr-channelscan-0.1.0-vdr-1.5.10.diff,
diff --git a/media-plugins/vdr-channelscan/Manifest b/media-plugins/vdr-channelscan/Manifest
index 8c937de7bec5..321cce87c26d 100644
--- a/media-plugins/vdr-channelscan/Manifest
+++ b/media-plugins/vdr-channelscan/Manifest
@@ -5,14 +5,17 @@ AUX vdr-channelscan-0.1.0-gcc4.diff 545 RMD160 9d6cb85b5c6014243ad043927c87237cf
 AUX vdr-channelscan-0.1.0-shared-data.diff 3922 RMD160 e8889c7daf399bf60b1184d5a9cdb98c1d06182a SHA1 240667219b58098012ab3cbb25da7a78ae0a30b7 SHA256 0f2e4c6198d19d3c3191ae68c381a86cc362de418d74a66b91d60246e0ffa21e
 AUX vdr-channelscan-0.1.0-show-only-basename.diff 881 RMD160 6f1c7e4477fd324bf50b0c55b11d341b2f65e325 SHA1 a4600681503ecbb932fa4e7bcfe76853e560750d SHA256 7ec4e190a25f9f31b98dea8f06056d44698d7a8f8e519e0af02918159dd0a454
 AUX vdr-channelscan-0.1.0-vdr-1.5.10.diff 1440 RMD160 5bbce45dfd0dda8847af066251aa78016d027fc4 SHA1 7d2872a32affe2f0fdde6cfedcf5b0afaaea130c SHA256 1e1966cc014339abcfb45e2a2a0daa858d10d641d6ce28347ec136a611b38a52
+AUX vdr-channelscan-0.1.0-vdr-1.7.x.diff 751 RMD160 4e6738d64384f50c1e780ea24ae964cc474c3206 SHA1 68b7a33404ae46ba3c9ee3ad82afff6fea4cbfdf SHA256 6e17c8de8fdb5f5ac5fde263fbfb880df8b50a506cd34384f2d1f4a94f085a6f
+AUX vdr-channelscan-0.1.0_gcc-4.3.x.diff 496 RMD160 b20132c8d4a3c713d71b8dafb23998250b04c3fa SHA1 ae443d48e008e4a964ba9a3cad9160c78646b815 SHA256 a532daee19f9e63c929059196e98709a373ab86548d002242f73004512306fa9
 DIST vdr-channelscan-0.1.0.tgz 48928 RMD160 d5dabd8aa7b82ace69be5e72ed9e914b0987b7fd SHA1 f6b5f34f671200cc3f4571166375cc5f26e3b5f7 SHA256 13b9398e2c9d449cf6f8a3c7c07416d0ecae7b2e6f5102978b341d3db5b1a0ab
-EBUILD vdr-channelscan-0.1.0.ebuild 972 RMD160 1347e47df46ad7802534b649f58dffc692b5a131 SHA1 c2177ca9ff386d1e712aa246f913365a3b116e29 SHA256 4949d26e9e723e5e8a7d59917d27be99e6224d3f461ab9426865ce4f2d297d4f
-MISC ChangeLog 1915 RMD160 2f27aba018a4981fa566477acbc7a84df27b4309 SHA1 01efe179e207e76763f834bf968532a86146b38f SHA256 8c8b2417644990f2893fa87e5913b08dbddf6bf88931515eaa1a215255868fb7
+EBUILD vdr-channelscan-0.1.0.ebuild 1102 RMD160 77a1439deadcb6854a87f8f1984030da9d71b13d SHA1 f667a349d48b189f0645c023fa12fba3d11e759c SHA256 2ae370631a0a7730ce1d4a4d4e60f4444755e43d423400424ff7bcc3968d56a0
+MISC ChangeLog 2207 RMD160 58f6c5336177ddfe3d1fdb9e3641d88e785f2497 SHA1 6ddf13323b497d992e59a90ab0efeaf9f2c9e1aa SHA256 9d2d57857e364dc2c4bda7ae16b0f83698a5ec4bd78c12594572f5a797fdfd1e
 MISC metadata.xml 309 RMD160 2564df04af9eead2fe189df8286f0d005570353a SHA1 71c4e367ebc6e1bce1311c0e6fbdf5f773f75256 SHA256 25af13f1c33d3a0935e1d3c71c5db29bc069f2692cd50e053a5215e70940a231
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkgO+z0ACgkQt2vP6XvVdOfuhACff8OhBAfofqsuVXQ2r3Ea3eOr
-J0kAnjF93Ovgm/LIx+Q8ExEIIz30SwmV
-=QoGZ
+iD8DBQFJY72Sdn07HTTCgIoRAuQ7AJwJUWCKj07/WQ72jP76HuOIY8xqeQCdF+hI
+XA9Mp08ZDHFkGr7YoEEDFno=
+=TsFu
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.7.x.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.7.x.diff
new file mode 100644
index 000000000000..b98784f00985
--- /dev/null
+++ b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0-vdr-1.7.x.diff
@@ -0,0 +1,12 @@
+diff -Naur channelscan-0.1.0.orig/channelscan.c channelscan-0.1.0/channelscan.c
+--- channelscan-0.1.0.orig/channelscan.c	2009-01-06 20:46:26.000000000 +0100
++++ channelscan-0.1.0/channelscan.c	2009-01-06 20:48:32.000000000 +0100
+@@ -170,7 +170,7 @@
+ 		Pol = &cTemp;
+ 		Symbolrate = oTransp.iSymbolrate[i];
+                 *SChannel=*OldChannel;
+-                SChannel->cChannel::SetSatTransponderData(oTransp.iSource,Frequenz,*Pol,Symbolrate,FEC_AUTO);
++                SChannel->cChannel::SetSatTransponderData(oTransp.iSource,Frequenz,*Pol,Symbolrate,FEC_AUTO,0,0,0);
+                 cDevice::GetDevice(cardnr)->SwitchChannel(SChannel,HasSwitched);
+                 PFilter = new PatFilter();
+                 SFilter = new SdtFilter(PFilter);
diff --git a/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0_gcc-4.3.x.diff b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0_gcc-4.3.x.diff
new file mode 100644
index 000000000000..bda2f179f9bb
--- /dev/null
+++ b/media-plugins/vdr-channelscan/files/vdr-channelscan-0.1.0_gcc-4.3.x.diff
@@ -0,0 +1,15 @@
+missing includes for gcc-4.3.x
+https://bugs.gentoo.org/show_bug.cgi?id=251186
+diff -Naur channelscan-0.1.0.orig/transponders.h channelscan-0.1.0/transponders.h
+--- channelscan-0.1.0.orig/transponders.h	2009-01-06 20:40:37.000000000 +0100
++++ channelscan-0.1.0/transponders.h	2009-01-06 20:41:10.000000000 +0100
+@@ -7,7 +7,8 @@
+ #include <iostream>
+ #include <fstream>
+ #include <dirent.h>  
+-#include <string>
++#include <string.h>
++#include <stdlib.h>
+ 
+ using std::string;
+ using std::ifstream;
diff --git a/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild
index 07b203544c69..3a5dc037ad73 100644
--- a/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild
+++ b/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild,v 1.4 2008/04/23 09:00:03 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-channelscan/vdr-channelscan-0.1.0.ebuild,v 1.5 2009/01/06 20:22:30 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -20,16 +20,20 @@ RDEPEND="${DEPEND}"
 PATCHES=("${FILESDIR}/${P}-shared-data.diff"
 		"${FILESDIR}/${P}-show-only-basename.diff"
 		"${FILESDIR}/${P}-gcc4.diff"
-		"${FILESDIR}/${P}-vdr-1.5.10.diff")
+		"${FILESDIR}/${P}-vdr-1.5.10.diff"
+		"${FILESDIR}/${P}_gcc-4.3.x.diff")
 
 src_unpack() {
 	vdr-plugin_src_unpack
 	fix_vdr_libsi_include filter.c
+
+	has_version ">=media-video/vdr-1.7.0" && \
+	epatch "${FILESDIR}/${P}-vdr-1.7.x.diff"
 }
 
 src_install() {
 	vdr-plugin_src_install
 
 	insinto /usr/share/vdr/channelscan-transponders
-	doins ${S}/transponders/*.ini
+	doins "${S}"/transponders/*.ini
 }