compile problems fixed by use VDR with bigpatch; reported by Quacks @ #gentoo-vdr

Package-Manager: portage-2203-svn

4 files changed, 57 insertions, 8 deletions

diff --git a/media-plugins/vdr-ffnetdev/ChangeLog b/media-plugins/vdr-ffnetdev/ChangeLog
index 021d63a5028d..c375875006c0 100644
--- a/media-plugins/vdr-ffnetdev/ChangeLog
+++ b/media-plugins/vdr-ffnetdev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-ffnetdev
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.1 2006/04/02 15:50:28 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.2 2006/05/06 21:25:22 hd_brummy Exp $
+
+  06 May 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff,
+  vdr-ffnetdev-0.1.0.ebuild:
+  compile problems fixed by use VDR with bigpatch; reported by Quacks @
+  #gentoo-vdr
 
 *vdr-ffnetdev-0.1.0 (02 Apr 2006)
 *vdr-ffnetdev-0.0.5 (02 Apr 2006)
diff --git a/media-plugins/vdr-ffnetdev/Manifest b/media-plugins/vdr-ffnetdev/Manifest
index 2a64377d0184..32d4b2fde5d4 100644
--- a/media-plugins/vdr-ffnetdev/Manifest
+++ b/media-plugins/vdr-ffnetdev/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e98c4d49a6152d2e69241995be2e0af5 ChangeLog 519
+MD5 3bb807374c71da9e2a2a2af4712a66cf ChangeLog 741
 MD5 e6e465b4bb0965b1aac11a0a4593f159 files/confd 878
 MD5 45304980f0e620c0898fdc2132d2e7a1 files/digest-vdr-ffnetdev-0.0.5 70
 MD5 ab9ffdebbbee935befd1e314001ae333 files/digest-vdr-ffnetdev-0.1.0 70
 MD5 fea860de4df26202a983ae2ecaeadad4 files/rc-addon.sh 545
+MD5 9745931e3717cc19f99414b2039775dc files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff 1174
 MD5 6ed3a923400dbba2390463cc6d5c8313 metadata.xml 465
 MD5 cfb54b90eb28a8d13f77574685881989 vdr-ffnetdev-0.0.5.ebuild 610
-MD5 20d8322f0393f3ede4ece984463acfc0 vdr-ffnetdev-0.1.0.ebuild 627
+MD5 2abb7000dc731dfdc4fbc055bd62bdd9 vdr-ffnetdev-0.1.0.ebuild 798
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 Comment: no further Information
 
-iD8DBQFEL/LSdn07HTTCgIoRAjHzAJ9qIZALD2L2utH9VWW64UeoQQISaACghiJa
-q7UxNuHrlSri+v1XdCv0zSU=
-=0Fiz
+iD8DBQFEXRRVdn07HTTCgIoRAocpAJ4qy3o2QKmZrWprLY7vHiTlQv8bTQCfRKpL
+DIb96m4k33FKQwEUHn2GIsQ=
+=sBr9
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff
new file mode 100644
index 000000000000..fd6ccef926c2
--- /dev/null
+++ b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-bigpatch-headers.diff
@@ -0,0 +1,34 @@
+fix compile Problems if you VDR compiled with bigpatch
+
+Joerg Bornkessel <hd_brummy@gentoo.org> (06 May 2006)
+
+diff -Naur vdr-ffnetdev-0.1.0.orig/ffnetdev.c vdr-ffnetdev-0.1.0/ffnetdev.c
+--- vdr-ffnetdev-0.1.0.orig/ffnetdev.c	2006-05-06 21:00:39.433264204 +0000
++++ vdr-ffnetdev-0.1.0/ffnetdev.c	2006-05-06 21:02:31.248100382 +0000
+@@ -127,8 +127,12 @@
+   return true;
+ }
+ 
+-bool cPluginFFNetDev::Active(void) {
+-	return (cOSDWorker::Active() || cTSWorker::Active());
++cString cPluginFFNetDev::Active(void) {
++	if(cOSDWorker::Active() || cTSWorker::Active())
++		{
++			return tr("Null Ahnung");
++		}
++	return NULL;
+ }
+ 
+ bool cPluginFFNetDev::Start(void)
+diff -Naur vdr-ffnetdev-0.1.0.orig/ffnetdev.h vdr-ffnetdev-0.1.0/ffnetdev.h
+--- vdr-ffnetdev-0.1.0.orig/ffnetdev.h	2006-05-06 21:00:39.437264878 +0000
++++ vdr-ffnetdev-0.1.0/ffnetdev.h	2006-05-06 21:01:09.062255117 +0000
+@@ -40,7 +40,7 @@
+   virtual cOsdObject *MainMenuAction(void);
+   virtual cMenuSetupPage *SetupMenu(void);
+   virtual bool SetupParse(const char *Name, const char *Value);
+-  virtual bool Active(void);
++  virtual cString Active(void);
+   
+   void SetPrimaryDevice();
+   void RestorePrimaryDevice();
diff --git a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild
index 38e66047f1f6..4fd99dddb77a 100644
--- a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild
+++ b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild,v 1.1 2006/04/02 15:50:28 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0.ebuild,v 1.2 2006/05/06 21:25:22 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -17,4 +17,12 @@ S=${WORKDIR}/${P}
 
 DEPEND=">=media-video/vdr-1.3.7
 		!media-plugins/vdr-ffnetdev-svn"
-# dont remove last line, it will fix a depend problem on gentoo.de overlay cvs
\ No newline at end of file
+# dont remove last line, it will fix a depend problem on gentoo.de overlay cvs
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	if grep -q "virtual cString Active" ${ROOT}/usr/include/vdr/plugin.h; then
+	  epatch ${FILESDIR}/${P}-bigpatch-headers.diff
+	fi
+}
\ No newline at end of file