Make it compile with vdr-1.5.9

Package-Manager: portage-2.1.3.11

4 files changed, 128 insertions, 15 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/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 1673746caf9d..5e36bf4c1cb1 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -9,20 +9,24 @@ AUX vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712 RMD160 520c285cb48887ae496d12
 MD5 e0e62c99b3a20fcd36b86c92028bcf31 files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712
 RMD160 520c285cb48887ae496d12a598cf356bf9b02843 files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712
 SHA256 a453eb5692f6e85bec1cc7297dd61e25405fac09a01504508262aa7f5246d668 files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712
+AUX vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff 2852 RMD160 58f70d95046ae634fa2415643a05df2a395d7cf0 SHA1 4376acebfeed2c9ea35e076778a89c217da15ddb SHA256 6ac4301424dbeaf1227004824e744af3067e4fd69d8f8c6ce1ea187c5f303e09
+MD5 8568428df65b45e8480ea006b09f86b6 files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff 2852
+RMD160 58f70d95046ae634fa2415643a05df2a395d7cf0 files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff 2852
+SHA256 6ac4301424dbeaf1227004824e744af3067e4fd69d8f8c6ce1ea187c5f303e09 files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff 2852
 DIST vdr-xineliboutput-1.0.0rc1.tgz 263435 RMD160 cd6d0ba5271c40be814b9dff2d6c929872138521 SHA1 051239137b7a6598863172cbcb4fcb186a5ae198 SHA256 367f6113aa8d762be7f28d758af11111d62ed9c85d89d897582c8fb954d44a6f
 DIST vdr-xineliboutput-1.0.0rc2.tgz 266010 RMD160 406e48f343258c07e337460754181cd10c180b29 SHA1 867c090a3fd1c8d8c78d7021b2eef0821c71b776 SHA256 e92f2bbc67acd6b5d16ff249055848c0afd4dea04b62e7323c2b2230c8826d08
 EBUILD vdr-xineliboutput-1.0.0_rc1.ebuild 2010 RMD160 d7afde324b0d09a4c4529b367743bc7f03dd85ad SHA1 5c7c3202c5f61a9ddedc75892eb58f779787289f SHA256 154cbb0f2769d4a3e132e3898091dd2ad3c32571be6e36250b4fe6ed3e8ee4a2
 MD5 a76c733b24f680b09954b18427b08ab1 vdr-xineliboutput-1.0.0_rc1.ebuild 2010
 RMD160 d7afde324b0d09a4c4529b367743bc7f03dd85ad vdr-xineliboutput-1.0.0_rc1.ebuild 2010
 SHA256 154cbb0f2769d4a3e132e3898091dd2ad3c32571be6e36250b4fe6ed3e8ee4a2 vdr-xineliboutput-1.0.0_rc1.ebuild 2010
-EBUILD vdr-xineliboutput-1.0.0_rc2.ebuild 2066 RMD160 e4062d6691097f35bbe281e0372d361c053628c7 SHA1 abc11fa64acc4a8ae2e5b862630037a88ade80cf SHA256 627ef92baeb8a9fccf21013cdf106a041a069b2549593d27ba29cc3acd6ba4e4
-MD5 6ab0b31a7c18c644890aae7da27b779f vdr-xineliboutput-1.0.0_rc2.ebuild 2066
-RMD160 e4062d6691097f35bbe281e0372d361c053628c7 vdr-xineliboutput-1.0.0_rc2.ebuild 2066
-SHA256 627ef92baeb8a9fccf21013cdf106a041a069b2549593d27ba29cc3acd6ba4e4 vdr-xineliboutput-1.0.0_rc2.ebuild 2066
-MISC ChangeLog 6553 RMD160 32bedc2277a79e54d9e82a7ccd4378fdf4895794 SHA1 d42c7078f99f5bc67307446c179fae0043a0a6e8 SHA256 bc62f55ea36c1687f84c2b26b944cf1baa42fcde26c407c891e1fcf5982b4895
-MD5 a3cb3bbe0b21fe0d17be402d686a9c32 ChangeLog 6553
-RMD160 32bedc2277a79e54d9e82a7ccd4378fdf4895794 ChangeLog 6553
-SHA256 bc62f55ea36c1687f84c2b26b944cf1baa42fcde26c407c891e1fcf5982b4895 ChangeLog 6553
+EBUILD vdr-xineliboutput-1.0.0_rc2.ebuild 2099 RMD160 6cfe320e1ce7d879c25d3879f404b9d3e591710e SHA1 47de5a857235514612a09d87badc3f5d5fbf4e66 SHA256 a2c06646052f9987bfbb4b1e76470d107f8cff278950e51c4d4828aeb6c25f4c
+MD5 17e938cc578804947fc2d9ed9215f8b2 vdr-xineliboutput-1.0.0_rc2.ebuild 2099
+RMD160 6cfe320e1ce7d879c25d3879f404b9d3e591710e vdr-xineliboutput-1.0.0_rc2.ebuild 2099
+SHA256 a2c06646052f9987bfbb4b1e76470d107f8cff278950e51c4d4828aeb6c25f4c vdr-xineliboutput-1.0.0_rc2.ebuild 2099
+MISC ChangeLog 6731 RMD160 989238167101c86bc7b5995a32df2d523e09b079 SHA1 446c0fb97b999e54f752762326c1816cc90090df SHA256 b6a8b75c2453adb25c4678d1abeb1daa0c504277485fce7f4ba74f6daed6bd84
+MD5 18fdb14ebb14f75daa60e4b10a53e9ff ChangeLog 6731
+RMD160 989238167101c86bc7b5995a32df2d523e09b079 ChangeLog 6731
+SHA256 b6a8b75c2453adb25c4678d1abeb1daa0c504277485fce7f4ba74f6daed6bd84 ChangeLog 6731
 MISC metadata.xml 353 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e SHA1 a8466ebe913ea08351d9415bca28ee107e54a7cb SHA256 48731babb71989233956af5f82f8bd1b24625eab7b26493e43d753621c9ec359
 MD5 3ca7be3c0a30822246151344759d8d7e metadata.xml 353
 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e metadata.xml 353
@@ -34,9 +38,9 @@ MD5 be82a3fb0969db05e62c50b64a532e5f files/digest-vdr-xineliboutput-1.0.0_rc2 27
 RMD160 754c74a00dc483dd1d9770a487a314393e043a00 files/digest-vdr-xineliboutput-1.0.0_rc2 271
 SHA256 5eb4a95a21798033d2dfe5bec56b58704c5efd9a48abd906b3391e7743ae742e files/digest-vdr-xineliboutput-1.0.0_rc2 271
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGxJCEt2vP6XvVdOcRAhoiAJ45GSoDLsLZRFEx16hIzSuRfbwR5wCeNtuZ
-3+VOyzThesXDvpfrUXhAR5s=
-=aLhj
+iD8DBQFG/7KAt2vP6XvVdOcRAgyZAJ9FeBZGwtYjThFtbRyFaswPEp9AYACffNfo
+Iy1V7djuOVo9//crBJfQWuA=
+=W5gk
 -----END PGP SIGNATURE-----
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