Make plugin compatible to vdr-1.6.0

(Portage version: 2.1.4.4)

4 files changed, 79 insertions, 7 deletions

diff --git a/media-plugins/vdr-pvr350/ChangeLog b/media-plugins/vdr-pvr350/ChangeLog
index 942a3509a8fb..c9bd8e70fe2b 100644
--- a/media-plugins/vdr-pvr350/ChangeLog
+++ b/media-plugins/vdr-pvr350/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-pvr350
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/ChangeLog,v 1.8 2007/08/19 11:42:06 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/ChangeLog,v 1.9 2008/04/01 17:09:13 zzam Exp $
+
+  01 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff,
+  vdr-pvr350-0.0.4_pre1.ebuild, vdr-pvr350-0.0.4.20070807.ebuild:
+  Make plugin compatible to vdr-1.6.0
 
 *vdr-pvr350-0.0.4.20070807 (19 Aug 2007)
 
diff --git a/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff b/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff
new file mode 100644
index 000000000000..0e247b01cee3
--- /dev/null
+++ b/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff
@@ -0,0 +1,55 @@
+Nur in pvr350-2007-08-07: libvdr-pvr350.so.
+Nur in pvr350-2007-08-07: libvdr-pvr350.so.1.6.0.
+Nur in pvr350-2007-08-07: patches.
+Nur in pvr350-2007-08-07: pvr350audio.o.
+Nur in pvr350-2007-08-07: pvr350device.o.
+Dateien pvr350-2007-08-07-orig/pvr350.o und pvr350-2007-08-07/pvr350.o sind verschieden.
+diff -ru pvr350-2007-08-07-orig/pvr350osd.c pvr350-2007-08-07/pvr350osd.c
+--- pvr350-2007-08-07-orig/pvr350osd.c	2007-07-28 22:43:32.000000000 +0200
++++ pvr350-2007-08-07/pvr350osd.c	2008-04-01 13:54:20.315786872 +0200
+@@ -24,8 +24,8 @@
+ #include "pvr350device.h"
+ 
+ #if VDRVERSNUM >= 10307
+-cPvr350Osd::cPvr350Osd(int Left, int Top,int fbfd, unsigned char *osdbuf)
+-    :cOsd(Left, Top) 
++cPvr350Osd::cPvr350Osd(int Left, int Top, uint level, int fbfd, unsigned char *osdbuf)
++    :cOsd(Left, Top, level) 
+ {
+     fd = fbfd;
+     osd = osdbuf; 
+@@ -130,9 +130,9 @@
+     osdfd  = fd;
+ }
+ 
+-cOsd *cPvr350OsdProvider::CreateOsd(int Left, int Top)
++cOsd *cPvr350OsdProvider::CreateOsd(int Left, int Top, uint level)
+ {
+-  return new cPvr350Osd(Left, Top, osdfd, osdBuf);
++  return new cPvr350Osd(Left, Top, level, osdfd, osdBuf);
+ }
+ 
+ #else
+diff -ru pvr350-2007-08-07-orig/pvr350osd.h pvr350-2007-08-07/pvr350osd.h
+--- pvr350-2007-08-07-orig/pvr350osd.h	2007-07-26 23:11:20.000000000 +0200
++++ pvr350-2007-08-07/pvr350osd.h	2008-04-01 13:40:03.000000000 +0200
+@@ -20,7 +20,7 @@
+     unsigned char *osd;
+ 
+ public:
+-    cPvr350Osd(int Left, int Top,int fbfd, unsigned char *osdbuf);
++    cPvr350Osd(int Left, int Top, uint level, int fbfd, unsigned char *osdbuf);
+     ~cPvr350Osd();
+     eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
+     void Flush(void);
+@@ -36,7 +36,7 @@
+     int            osdfd; 
+ public:
+     cPvr350OsdProvider(int fd, unsigned char *buf);
+-    virtual cOsd *CreateOsd(int Left, int Top);
++    virtual cOsd *CreateOsd(int Left, int Top, uint level);
+ };
+ 
+ #else
+Nur in pvr350-2007-08-07: pvr350osd.o.
+Nur in pvr350-2007-08-07: pvr350tools.o.
diff --git a/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4.20070807.ebuild b/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4.20070807.ebuild
index 6a902a697836..2eaf1604ac20 100644
--- a/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4.20070807.ebuild
+++ b/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4.20070807.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4.20070807.ebuild,v 1.2 2007/08/20 03:16:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4.20070807.ebuild,v 1.3 2008/04/01 17:09:13 zzam Exp $
 inherit vdr-plugin eutils versionator
 
 IUSE="yaepg"
@@ -40,3 +40,15 @@ pkg_setup() {
 		VDRPLUGIN_MAKE_TARGET="all SET_VIDEO_WINDOW=1"
 	fi
 }
+
+src_unpack() {
+	vdr-plugin_src_unpack unpack
+
+	cd "${S}"
+	if has_version ">=media-video/vdr-1.6.0"; then
+		epatch "${FILESDIR}/${P}-vdr-1.6.0.diff"
+	fi
+
+	vdr-plugin_src_unpack all_but_unpack
+}
+
diff --git a/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild b/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild
index 101760b1d6b0..bb51d99262dc 100644
--- a/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild
+++ b/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild,v 1.7 2007/07/10 23:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/vdr-pvr350-0.0.4_pre1.ebuild,v 1.8 2008/04/01 17:09:13 zzam Exp $
 inherit vdr-plugin eutils
 
 IUSE="yaepg"
@@ -36,5 +36,5 @@ src_unpack() {
 
 	sed -e 's/-I$(LIBAVCODEC)//' -i Makefile
 
-	epatch ${FILESDIR}/${P}-vdr-1.3.42.diff
+	epatch "${FILESDIR}/${P}-vdr-1.3.42.diff"
 }