vdr/vdr-plugin-bitstreamout/debian/patches 01_FTBFS-fix.dpatch
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Thu, 22 Jul 2004 21:23:15 +0000
Update of /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/debian/patches
In directory haydn:/tmp/cvs-serv19581/vdr/vdr-plugin-bitstreamout/debian/patches
Modified Files:
01_FTBFS-fix.dpatch
Log Message:
* use #ifdef i386 ...
* updated changelog
Index: 01_FTBFS-fix.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/debian/patches/01_FTBFS-fix.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 01_FTBFS-fix.dpatch 16 Jul 2004 14:58:01 -0000 1.2
+++ 01_FTBFS-fix.dpatch 22 Jul 2004 21:23:10 -0000 1.3
@@ -24,20 +24,16 @@
@DPATCH@
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-bitstreamout/vdr-plugin-bitstreamout-0.61b/types.h vdr-plugin-bitstreamout-0.61b/types.h
---- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-bitstreamout/vdr-plugin-bitstreamout-0.61b/types.h 2004-07-16 16:53:12.000000000 +0200
-+++ vdr-plugin-bitstreamout-0.61b/types.h 2004-07-16 16:53:33.000000000 +0200
-@@ -26,7 +26,6 @@
+--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-bitstreamout/vdr-plugin-bitstreamout-0.61b/types.h 2004-07-22 23:18:20.000000000 +0200
++++ vdr-plugin-bitstreamout-0.61b/types.h 2004-07-22 23:18:37.000000000 +0200
+@@ -26,7 +26,31 @@
#include <sys/mman.h>
#include <asm/types.h>
#include <sys/types.h>
--#include <asm/bitops.h>
-
- #ifndef AARONS_TYPES
- #define AARONS_TYPES
-@@ -64,6 +63,27 @@
- #define SPDIF_SAMPLE_MAGIC B2F(8) // 64 bits are required for IEC60958 magic
- #define SPDIF_SAMPLE_ALIGN(x) (((x)+(SPDIF_SAMPLE_MAGIC-1))&~(SPDIF_SAMPLE_MAGIC-1))
-
++
++#ifdef i386
+ #include <asm/bitops.h>
++#else
+// Defines to get rid of <asm/bitops.h>
+#define clear_bit(n,addr) (*(addr) &= ~(1 << (n)))
+#define set_bit(n,addr) (*(addr) |= (1 << (n)))
@@ -58,7 +54,7 @@
+ clear_bit(n, addr);
+ return result;
+}
-+
- #ifndef DEBUG
- # include <linux/rtc.h>
- # include <sys/ioctl.h>
++#endif
+
+ #ifndef AARONS_TYPES
+ #define AARONS_TYPES