r6186 - in /vdr/vdr-plugin-dxr3/trunk/debian: changelog patches/00list patches/03_vdr-1.5.9.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sun Feb 10 21:59:14 2008
New Revision: 6186

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6186
Log:
* NOT RELEASED YET
* Added 03_vdr-1.5.9.dpatch

Added:
    vdr/vdr-plugin-dxr3/trunk/debian/patches/03_vdr-1.5.9.dpatch
Modified:
    vdr/vdr-plugin-dxr3/trunk/debian/changelog
    vdr/vdr-plugin-dxr3/trunk/debian/patches/00list

Modified: vdr/vdr-plugin-dxr3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/debian/changelog?rev=6186&op=diff
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-dxr3/trunk/debian/changelog Sun Feb 10 21:59:14 2008
@@ -1,3 +1,10 @@
+vdr-plugin-dxr3 (0.2.7-6) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Added 03_vdr-1.5.9.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net>  Mon, 26 Nov 2007 19:49:25 +0100
+
 vdr-plugin-dxr3 (0.2.7-5) experimental; urgency=low
 
   * New version to force update with new VDR 1.4.7-2ctvdr4

Modified: vdr/vdr-plugin-dxr3/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/debian/patches/00list?rev=6186&op=diff
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/00list Sun Feb 10 21:59:14 2008
@@ -1,2 +1,3 @@
 01_Makefile-fPIC-fix
 02_debian_ffmpeg
+03_vdr-1.5.9

Added: vdr/vdr-plugin-dxr3/trunk/debian/patches/03_vdr-1.5.9.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-dxr3/trunk/debian/patches/03_vdr-1.5.9.dpatch?rev=6186&op=file
==============================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/03_vdr-1.5.9.dpatch (added)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/03_vdr-1.5.9.dpatch Sun Feb 10 21:59:14 2008
@@ -1,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_vdr-1.5.9.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes for VDR >= 1.5.9.
+
+ at DPATCH@
+diff -urNad vdr-plugin-dxr3-0.2.7~/dxr3osd.c vdr-plugin-dxr3-0.2.7/dxr3osd.c
+--- vdr-plugin-dxr3-0.2.7~/dxr3osd.c	2008-02-10 22:52:53.000000000 +0100
++++ vdr-plugin-dxr3-0.2.7/dxr3osd.c	2008-02-10 22:55:47.000000000 +0100
+@@ -35,9 +35,17 @@
+ 
+ // ==================================
+ // ! create osd at (Left, Top)
++#if VDRVERSNUM >= 10509
++cOsd *cDxr3OsdProvider::CreateOsd(int Left, int Top, uint Level)
++#else
+ cOsd *cDxr3OsdProvider::CreateOsd(int Left, int Top)
++#endif
+ {
++#if VDRVERSNUM >= 10509
++    return new cDxr3SubpictureOsd(Left, Top, Level);
++#else
+     return new cDxr3SubpictureOsd(Left, Top);
++#endif
+ }
+ 
+ // Local variables:
+diff -urNad vdr-plugin-dxr3-0.2.7~/dxr3osd.h vdr-plugin-dxr3-0.2.7/dxr3osd.h
+--- vdr-plugin-dxr3-0.2.7~/dxr3osd.h	2008-02-10 22:52:53.000000000 +0100
++++ vdr-plugin-dxr3-0.2.7/dxr3osd.h	2008-02-10 22:53:11.000000000 +0100
+@@ -10,7 +10,11 @@
+ {
+ public:
+     cDxr3OsdProvider() {}
++#if VDRVERSNUM >= 10509
++    virtual cOsd *CreateOsd(int Left, int Top, uint Level);
++#else
+     virtual cOsd *CreateOsd(int Left, int Top);
++#endif
+ };
+ 
+ #endif /*_DXR3_OSD_H_*/
+diff -urNad vdr-plugin-dxr3-0.2.7~/dxr3osd_subpicture.c vdr-plugin-dxr3-0.2.7/dxr3osd_subpicture.c
+--- vdr-plugin-dxr3-0.2.7~/dxr3osd_subpicture.c	2007-01-27 15:46:45.000000000 +0100
++++ vdr-plugin-dxr3-0.2.7/dxr3osd_subpicture.c	2008-02-10 22:55:12.000000000 +0100
+@@ -33,7 +33,11 @@
+ 
+ // ==================================
+ //! constructor
++#if VDRVERSNUM >= 10509
++cDxr3SubpictureOsd::cDxr3SubpictureOsd(int Left, int Top, uint Level) : cOsd(Left, Top, Level)
++#else
+ cDxr3SubpictureOsd::cDxr3SubpictureOsd(int Left, int Top) : cOsd(Left, Top)
++#endif
+ {
+     shown = false;
+     Palette = new cPalette(4);
+diff -urNad vdr-plugin-dxr3-0.2.7~/dxr3osd_subpicture.h vdr-plugin-dxr3-0.2.7/dxr3osd_subpicture.h
+--- vdr-plugin-dxr3-0.2.7~/dxr3osd_subpicture.h	2007-01-28 18:29:31.000000000 +0100
++++ vdr-plugin-dxr3-0.2.7/dxr3osd_subpicture.h	2008-02-10 22:56:14.000000000 +0100
+@@ -15,7 +15,11 @@
+     cTimeMs *last;
+ 
+ public:
++#if VDRVERSNUM >= 10509
++    cDxr3SubpictureOsd(int Left, int Top/*, int SpuDev*/, uint Level);
++#else
+     cDxr3SubpictureOsd(int Left, int Top/*, int SpuDev*/);
++#endif
+     ~cDxr3SubpictureOsd();
+ 
+     eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);