r5411 - in /vdr/vdr-plugin-xineliboutput/branches/etch/debian: changelog copyright patches/00list patches/91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Thu Sep 6 23:08:25 UTC 2007
Author: tom-guest
Date: Thu Sep 6 23:08:24 2007
New Revision: 5411
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5411
Log:
Added 91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch
Added:
vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch
Modified:
vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog
vdr/vdr-plugin-xineliboutput/branches/etch/debian/copyright
vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list
Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog?rev=5411&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/changelog Thu Sep 6 23:08:24 2007
@@ -1,3 +1,13 @@
+vdr-plugin-xineliboutput (1.0.0~rc2-2etch3) unstable; urgency=low
+
+ [ Thomas Günther ]
+ * Added 91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch
+
+ [ Tobias Grimm ]
+ * Reformatted debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de> Fri, 7 Sep 2007 01:03:36 +0200
+
vdr-plugin-xineliboutput (1.0.0~rc2-2etch2) unstable; urgency=low
* Release for vdrdevel 1.5.8
Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/copyright?rev=5411&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/copyright (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/copyright Thu Sep 6 23:08:24 2007
@@ -1,9 +1,7 @@
-This package was debianized by Tobias Grimm <tg at e-tobi.net> on
-Sun, 4 Jun 2006 16:45:16 +0200.
+Upstream Homepage:
+ http://www.sourceforge.net/projects/xineliboutput
-It was downloaded from http://www.sourceforge.net/projects/xineliboutput
-
-Upstream Author:
+Upstream Authors:
Petri Hintukainen <phintuka at users.sourceforge.net>
Steven J. Robinson (cathbard) <stevenjrobinson at yahoo.com> (NoSignal-Image)
@@ -14,9 +12,12 @@
Copyright:
(C) 2003 - 2007 Petri Hintukainen
- (C) 2003 Dirk Meyer (post.c)
- (C) 2006 The Xine Project
- (C) 2000 Carsten Koch (original lirc code from VDR)
+ (C) 2003 Dirk Meyer (post.c)
+ (C) 2006 The Xine Project
+ (C) 2000 Carsten Koch (original lirc code from VDR)
+
+Copyright (Debian packaging):
+ (C) 2003 - 2007 Tobias Grimm, Thomas Günther, Thomas Schmidt
License:
This program is free software; you can redistribute it and/or modify
@@ -36,3 +37,7 @@
The complete text of the GNU General Public License can be found
in /usr/share/common-licenses/GPL on most Debian systems.
+
+License (Debian packaging):
+ The Debian packaging is licensed under the GPL, version 2 or any
+ later version, see /usr/share/common-licenses/GPL.
Modified: vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list?rev=5411&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list (original)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/00list Thu Sep 6 23:08:24 2007
@@ -1,3 +1,4 @@
02_vdr-include-path
10_nosignal
90_xineliboutput-1.0.0rc2-1.5.3
+91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix
Added: vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch?rev=5411&op=file
==============================================================================
--- vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch (added)
+++ vdr/vdr-plugin-xineliboutput/branches/etch/debian/patches/91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch Thu Sep 6 23:08:24 2007
@@ -1,0 +1,111 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.dpatch by Petri Hintukainen <phintuka at users.sourceforge.net>
+## http://phivdr.dyndns.org/vdr/vdr-xineliboutput/vdr-xineliboutput-1.0.0rc2-vdr-1.5.9-compile-fix.patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.9.
+
+ at DPATCH@
+--- xineliboutput-1.0.0~rc2/osd.c.~1.7.~ 2007-03-14 19:51:01.000000000 +0200
++++ xineliboutput-1.0.0~rc2/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();
+--- xineliboutput-1.0.0~rc2/osd.h.~1.3.~ 2007-01-06 13:42:58.000000000 +0200
++++ xineliboutput-1.0.0~rc2/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);
+ };
+--- xineliboutput-1.0.0~rc2/equalizer.c.~1.2.~ 2006-08-22 06:45:34.000000000 +0300
++++ xineliboutput-1.0.0~rc2/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) {
+--- xineliboutput-1.0.0~rc2/setup_menu.c.~1.34.~ 2007-06-19 09:06:22.000000000 +0300
++++ xineliboutput-1.0.0~rc2/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) {
More information about the pkg-vdr-dvb-changes
mailing list