r4075 - in vdr/vdr-plugin-softdevice/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2007-01-17 02:21:16 +0100 (Wed, 17 Jan 2007)
New Revision: 4075

Added:
   vdr/vdr-plugin-softdevice/trunk/debian/patches/91_softdevice-0.3.1-1.5.0.dpatch
Modified:
   vdr/vdr-plugin-softdevice/trunk/debian/changelog
   vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
Log:
Added 91_softdevice-0.3.1-1.5.0.dpatch

Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog	2007-01-17 00:47:50 UTC (rev 4074)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2007-01-17 01:21:16 UTC (rev 4075)
@@ -1,3 +1,10 @@
+vdr-plugin-softdevice (0.3.1-3) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Added 91_softdevice-0.3.1-1.5.0.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Wed, 17 Jan 2007 02:20:19 +0100
+
 vdr-plugin-softdevice (0.3.1-2) experimental; urgency=low
 
   [ Thomas Günther ]

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2007-01-17 00:47:50 UTC (rev 4074)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2007-01-17 01:21:16 UTC (rev 4075)
@@ -1,2 +1,3 @@
 04_debian_ffmpeg
 06_dfb++
+91_softdevice-0.3.1-1.5.0

Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/91_softdevice-0.3.1-1.5.0.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/91_softdevice-0.3.1-1.5.0.dpatch	2007-01-17 00:47:50 UTC (rev 4074)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/91_softdevice-0.3.1-1.5.0.dpatch	2007-01-17 01:21:16 UTC (rev 4075)
@@ -0,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_softdevice-0.3.1-1.5.0.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.0 (applicable to VDR >= 1.4.5).
+
+ at DPATCH@
+--- softdevice-0.3.1/setup-softdevice.c
++++ softdevice-0.3.1/setup-softdevice.c
+@@ -416,13 +416,13 @@
+ 
+ /* ---------------------------------------------------------------------------
+  */
+-bool cSetupStore::CatchRemoteKey(const char *remoteName, uint64 key)
++bool cSetupStore::CatchRemoteKey(const char *remoteName, uint64_t key)
+ {
+ #ifndef STAND_ALONE
+     char  buffer[32];
+     eKeys keySym;
+ 
+-  snprintf(buffer, sizeof(buffer), "%016LX", (uint64) key);
++  snprintf(buffer, sizeof(buffer), "%016LX", (uint64_t) key);
+   keySym = Keys.Get(remoteName, buffer);
+   if (keySym >= kUser1 && keySym <= kUser9)
+   {
+--- softdevice-0.3.1/setup-softdevice.h
++++ softdevice-0.3.1/setup-softdevice.h
+@@ -121,7 +121,7 @@
+     char          *getPPValue(void);
+     void          CropModeNext(void);
+ 
+-    virtual bool  CatchRemoteKey(const char *remoteName, uint64 key);
++    virtual bool  CatchRemoteKey(const char *remoteName, uint64_t key);
+ 
+     int   xvAspect;
+     int   xvMaxArea;
+--- softdevice-0.3.1/ShmClient.c
++++ softdevice-0.3.1/ShmClient.c
+@@ -41,11 +41,11 @@
+                 ~cShmRemote()
+                 {};
+ 
+-                virtual bool PutKey(uint64 Code, bool Repeat = false,
++                virtual bool PutKey(uint64_t Code, bool Repeat = false,
+                                 bool Release = false);
+ };
+ 
+-bool cShmRemote::PutKey(uint64 Code, bool Repeat,
++bool cShmRemote::PutKey(uint64_t Code, bool Repeat,
+                                 bool Release) {
+         if (ctl)
+         {
+--- softdevice-0.3.1/VdrReplacements.h
++++ softdevice-0.3.1/VdrReplacements.h
+@@ -30,7 +30,7 @@
+ 
+ #define tr(out) out
+ 
+-typedef unsigned long long int uint64;
++typedef unsigned long long int uint64_t;
+ typedef int eKeys;
+ 
+ class cSoftRemote {
+--- softdevice-0.3.1/video.h
++++ softdevice-0.3.1/video.h
+@@ -60,7 +60,7 @@
+   public:
+           cSoftRemote(const char *Name) : cRemote(Name) {};
+           virtual ~cSoftRemote() {};
+-          virtual bool PutKey(uint64 Code, bool Repeat = false,
++          virtual bool PutKey(uint64_t Code, bool Repeat = false,
+                           bool Release = false)
+           { return Put(Code,Repeat,Release); };
+ };