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

[Tobias Grimm]

Author: tiber-guest
Date: 2006-10-04 18:53:25 +0000 (Wed, 04 Oct 2006)
New Revision: 3549

Added:
   vdr/vdr-plugin-softdevice/trunk/debian/patches/07_amd64.dpatch
Modified:
   vdr/vdr-plugin-softdevice/trunk/debian/changelog
   vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
Log:
Added 07_amd_64.dpatch to fix AMD64 compilation problem as reported
by Ingo Theiss <cthulhu at planet-multiplayer.de>


Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog	2006-10-02 20:47:41 UTC (rev 3548)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2006-10-04 18:53:25 UTC (rev 3549)
@@ -1,3 +1,11 @@
+vdr-plugin-softdevice (0.2.3a-8) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Added 07_amd_64.dpatch to fix AMD64 compilation problem as reported
+    by Ingo Theiss <cthulhu at planet-multiplayer.de>
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sun,  1 Oct 2006 17:15:36 +0200
+
 vdr-plugin-softdevice (0.2.3a-7) unstable; urgency=low
 
   * Added 05_FFMPEG_VERSION.dpatch

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2006-10-02 20:47:41 UTC (rev 3548)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2006-10-04 18:53:25 UTC (rev 3549)
@@ -3,3 +3,4 @@
 04_debian_ffmpeg
 05_FFMPEG_VERSION
 06_dfb++
+07_amd64

Added: vdr/vdr-plugin-softdevice/trunk/debian/patches/07_amd64.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/07_amd64.dpatch	                        (rev 0)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/07_amd64.dpatch	2006-10-04 18:53:25 UTC (rev 3549)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_amd64.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Removed incompatibility between header and implementation,
+## DP: which causes compilation errors on AMD64.
+## DP: (reported by Ingo Theiss <cthulhu at planet-multiplayer.de>)
+
+ at DPATCH@
+diff -urNad vdr-plugin-softdevice-0.2.3a~/setup-softdevice.c vdr-plugin-softdevice-0.2.3a/setup-softdevice.c
+--- vdr-plugin-softdevice-0.2.3a~/setup-softdevice.c	2006-04-23 22:21:27.000000000 +0200
++++ vdr-plugin-softdevice-0.2.3a/setup-softdevice.c	2006-10-04 19:58:22.000000000 +0200
+@@ -408,7 +408,7 @@
+ 
+ /* ---------------------------------------------------------------------------
+  */
+-bool cSetupStore::CatchRemoteKey(const char *remoteName, uint64 key)
++bool cSetupStore::CatchRemoteKey(const char *remoteName, uint64_t key)
+ {
+ #ifndef STAND_ALONE
+     char  buffer[32];