Make it compile with vdr-1.5.9

(Portage version: 2.1.3.11)

3 files changed, 112 insertions, 3 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 23a6fce26db6..d9a904870efd 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.29 2007/08/16 17:59:24 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.30 2007/09/30 14:28:07 zzam Exp $
+
+  30 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff,
+  vdr-xineliboutput-1.0.0_rc2.ebuild:
+  Make it compile with vdr-1.5.9
 
   16 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-xineliboutput-1.0.0_rc2.ebuild:
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff
new file mode 100644
index 000000000000..8b0bdd6727e6
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff
@@ -0,0 +1,103 @@
+--- osd.c.~1.7.~	2007-03-14 19:51:01.000000000 +0200
++++ osd.c	2007-09-01 11:47:04.000000000 +0300
+@@ -148,8 +148,12 @@
+   }
+ }
+ 
+-cXinelibOsd::cXinelibOsd(cXinelibDevice *Device, int x, int y)
++cXinelibOsd::cXinelibOsd(cXinelibDevice *Device, int x, int y, uint Level)
++#if VDRVERSNUM >= 10509
++    : cOsd(x, y, Level), m_IsVisible(true)
++#else
+     : cOsd(x, y), m_IsVisible(true)
++#endif
+ {
+   TRACEF("cXinelibOsd::cXinelibOsd");
+ 
+@@ -341,7 +345,11 @@
+   }
+ }
+ 
++#if VDRVERSNUM >= 10509
++cOsd *cXinelibOsdProvider::CreateOsd(int Left, int Top, uint Level)
++#else
+ cOsd *cXinelibOsdProvider::CreateOsd(int Left, int Top)
++#endif
+ {
+   TRACEF("cXinelibOsdProvider::CreateOsd");
+ 
+@@ -350,7 +358,11 @@
+   if(cXinelibOsd::m_OsdStack.First())
+     LOGMSG("cXinelibOsdProvider::CreateOsd - OSD already open !");
+ 
++#if VDRVERSNUM >= 10509
++  cXinelibOsd *m_OsdInstance = new cXinelibOsd(m_Device, Left, Top, Level);
++#else
+   cXinelibOsd *m_OsdInstance = new cXinelibOsd(m_Device, Left, Top);
++#endif
+ 
+   if(cXinelibOsd::m_OsdStack.First())
+     cXinelibOsd::m_OsdStack.First()->Hide();
+--- osd.h.~1.3.~	2007-01-06 13:42:58.000000000 +0200
++++ osd.h	2007-09-01 11:47:04.000000000 +0300
+@@ -45,7 +45,7 @@
+     friend class cXinelibOsdProvider;
+ 
+   public:
+-    cXinelibOsd(cXinelibDevice *Device, int x, int y);
++    cXinelibOsd(cXinelibDevice *Device, int x, int y, uint Level = 0);
+     virtual ~cXinelibOsd();
+ };
+ 
+@@ -59,7 +59,11 @@
+     cXinelibOsdProvider(cXinelibDevice *Device);
+     virtual ~cXinelibOsdProvider();
+ 
++#if VDRVERSNUM >= 10509
++    virtual cOsd *CreateOsd(int Left, int Top, uint Level);
++#else
+     virtual cOsd *CreateOsd(int Left, int Top);
++#endif
+ 
+     static void RefreshOsd(void);
+ };
+--- equalizer.c.~1.2.~	2006-08-22 06:45:34.000000000 +0300
++++ equalizer.c	2007-09-01 11:47:04.000000000 +0300
+@@ -46,7 +46,11 @@
+ {
+   tArea areas [] = { {0, 0, OSD_W - 1, OSD_H - 1, 4} };
+ 
++#if VDRVERSNUM >= 10509
++  m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0);
++#else
+   m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y);
++#endif
+ 
+   if(m_Osd) {
+     if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) {
+--- setup_menu.c.~1.34.~	2007-06-19 09:06:22.000000000 +0300
++++ setup_menu.c	2007-09-01 11:47:04.000000000 +0300
+@@ -1537,7 +1537,11 @@
+   int i;
+ 
+   if(!m_Osd)
++#if VDRVERSNUM >= 10509
++    m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0);
++#else
+     m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y);
++#endif
+ 
+   if(m_Osd) {
+     if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) {
+@@ -1636,7 +1640,11 @@
+   int x, y, bit = 0;
+ 
+   if(!m_Osd) {
++#if VDRVERSNUM >= 10509
++    m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0);
++#else
+     m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y);
++#endif
+ 
+     if(m_Osd) {
+       if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) {
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild
index 4467bd5d29cb..b5ac16d93b6e 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild,v 1.5 2007/08/16 17:59:24 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2.ebuild,v 1.6 2007/09/30 14:28:07 zzam Exp $
 
 inherit vdr-plugin eutils multilib
 
@@ -40,7 +40,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/xineliboutput-${MY_PV}
 
 VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-PATCHES="${FILESDIR}/${P}-vdr-1.5.3.diff"
+PATCHES="${FILESDIR}/${P}-vdr-1.5.3.diff
+	${FILESDIR}/${P}-vdr-1.5.9.diff"
 
 NO_GETTEXT_HACK=1