r1979 - in vdr/vdr/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2006-03-04 22:51:25 +0000 (Sat, 04 Mar 2006)
New Revision: 1979

Added:
   vdr/vdr/trunk/debian/patches/01_IA64-FTBFS-fix.dpatch
Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/patches/00list
Log:
vdr: Added 01_IA64-FTBFS-fix.dpatch

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-03-03 23:30:15 UTC (rev 1978)
+++ vdr/vdr/trunk/debian/changelog	2006-03-04 22:51:25 UTC (rev 1979)
@@ -4,6 +4,7 @@
 
   * Thomas Schmidt <tschmidt at debian.org>
     - New upstream release
+      + Added 01_IA64-FTBFS-fix - fixes FTBFS of vdr>=1.3.38 on ia64
       + Removed 13_epgfix.dpatch
       + Added 99_epg-fix.dpatch
       + Added 19_vdr-1.3.41-no-title-fix.dpatch

Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list	2006-03-03 23:30:15 UTC (rev 1978)
+++ vdr/vdr/trunk/debian/patches/00list	2006-03-04 22:51:25 UTC (rev 1979)
@@ -1,3 +1,4 @@
+01_IA64-FTBFS-fix.dpatch
 02_Makefile-CFGDIR
 03_cmdsubmenu
 04_newplugin

Added: vdr/vdr/trunk/debian/patches/01_IA64-FTBFS-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/01_IA64-FTBFS-fix.dpatch	2006-03-03 23:30:15 UTC (rev 1978)
+++ vdr/vdr/trunk/debian/patches/01_IA64-FTBFS-fix.dpatch	2006-03-04 22:51:25 UTC (rev 1979)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 01_IA64-FTBFS-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes FTBFS of vdr >= 1.3.38 on ia64 by using to old behaviour
+## DP: to determine the thread-id on ia64, because the gettid syscall
+## DP: is not available on ia64
+
+ at DPATCH@
+diff -urNad vdr-1.3.41/thread.c /tmp/dpep.xP5Coq/vdr-1.3.41/thread.c
+--- vdr-1.3.41/thread.c	2006-01-28 12:34:35.000000000 +0100
++++ /tmp/dpep.xP5Coq/vdr-1.3.41/thread.c	2006-03-04 23:49:42.376137750 +0100
+@@ -316,12 +316,19 @@
+   return emergencyExitRequested = true; // yes, it's an assignment, not a comparison!
+ }
+ 
++#ifndef __ia64__
+ _syscall0(pid_t, gettid)
+ 
+ tThreadId cThread::ThreadId(void)
+ {
+   return gettid();
+ }
++#else
++tThreadId cThread::ThreadId(void)
++{
++  return pthread_self();
++}
++#endif
+ 
+ void cThread::SetMainThreadId(void)
+ {


Property changes on: vdr/vdr/trunk/debian/patches/01_IA64-FTBFS-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *