r3432 - in vdr/vdr-plugin-bitstreamout/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2006-09-27 18:17:08 +0000 (Wed, 27 Sep 2006)
New Revision: 3432

Added:
   vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_bitops-FTBFS-fix.dpatch
Modified:
   vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
   vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list
Log:
* Added 01_bitops-FTBFS-fix.dpatch to fix FTBFS with linux-kernel-headers
  2.6.18-1 from unstable (may result in a small performance loss on i386 and
  amd64)

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/changelog	2006-09-26 19:42:48 UTC (rev 3431)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/changelog	2006-09-27 18:17:08 UTC (rev 3432)
@@ -1,8 +1,11 @@
 vdr-plugin-bitstreamout (0.85-8) unstable; urgency=low
 
   * Build-Depend on vdr-dev (>=1.4.3-1)
+  * Added 01_bitops-FTBFS-fix.dpatch to fix FTBFS with linux-kernel-headers
+    2.6.18-1 from unstable (may result in a small performance loss on i386 and
+    amd64)
 
- -- Thomas Schmidt <tschmidt at debian.org>  Tue, 26 Sep 2006 21:41:45 +0200
+ -- Thomas Schmidt <tschmidt at debian.org>  Wed, 27 Sep 2006 08:18:40 +0200
 
 vdr-plugin-bitstreamout (0.85-7) unstable; urgency=low
 

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list	2006-09-26 19:42:48 UTC (rev 3431)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list	2006-09-27 18:17:08 UTC (rev 3432)
@@ -1 +1,2 @@
 90_APIVERSION.dpatch
+01_bitops-FTBFS-fix

Added: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_bitops-FTBFS-fix.dpatch
===================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_bitops-FTBFS-fix.dpatch	                        (rev 0)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_bitops-FTBFS-fix.dpatch	2006-09-27 18:17:08 UTC (rev 3432)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 01_bitops-FTBFS-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes FTBFS with linux-kernel-header 2.6.18-1 by removing the include
+## DP: to <asm/bitops.h> (may result in a performance loss on i386 and amd64)
+
+ at DPATCH@
+diff -urNad vdr-plugin-bitstreamout-0.85~/types.h vdr-plugin-bitstreamout-0.85/types.h
+--- vdr-plugin-bitstreamout-0.85~/types.h	2006-09-27 07:53:49.000000000 +0200
++++ vdr-plugin-bitstreamout-0.85/types.h	2006-09-27 08:14:55.000000000 +0200
+@@ -26,9 +26,9 @@
+ #include <sys/mman.h>
+ #include <asm/types.h>
+ #include <sys/types.h>
+-#if defined(__i386__) || defined(__x86_64__)
+-# include <asm/bitops.h>
+-#else
++//#if defined(__i386__) || defined(__x86_64__)
++//# include <asm/bitops.h>
++//#else
+ # define clear_bit(n,addr)  (*(addr) &= ~(1 << (n)))
+ # define set_bit(n,addr)    (*(addr) |= (1 << (n)))
+ # define test_bit(n,addr)   (*(addr) & (1 << (n)))
+@@ -47,7 +47,7 @@
+     clear_bit(n, addr);
+     return result;
+ }
+-#endif
++//#endif
+ 
+ #ifndef AARONS_TYPES
+ #define AARONS_TYPES


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