vdr/vdr-plugin-bitstreamout/debian/patches 00list 01_FTBFS-fix.dpatch

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Sat, 10 Jul 2004 12:59:11 +0000


Update of /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/debian/patches
In directory haydn:/tmp/cvs-serv32264/vdr/vdr-plugin-bitstreamout/debian/patches

Added Files:
	00list 01_FTBFS-fix.dpatch 
Log Message:
* use dpatch
* add possible fix for #258449

--- NEW FILE: 00list ---
01_FTBFS-fix

--- NEW FILE: 01_FTBFS-fix.dpatch ---
#! /bin/sh -e
## 01_FTBFS-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: possible fix for #258449?

if [ $# -lt 1 ]; then
    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"

case "$1" in
    -patch) patch -p1 ${patch_opts} < $0;;
    -unpatch) patch -R -p1 ${patch_opts} < $0;;
    *)
        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
        exit 1;;
esac

exit 0

@DPATCH@
diff -urNad /home/chelli/vdr/cvs/vdr/vdr-plugin-bitstreamout/types.h vdr-plugin-bitstreamout/types.h
--- /home/chelli/vdr/cvs/vdr/vdr-plugin-bitstreamout/types.h	2004-06-16 17:44:43.000000000 +0200
+++ vdr-plugin-bitstreamout/types.h	2004-07-10 14:56:19.000000000 +0200
@@ -26,7 +26,6 @@
 #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,11 @@
 #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))
 
+// Defines to get rid of <asm/bitops.h>
+#define clear_bit(n,addr)  (*(addr) &= ~(1 << (n)))
+#define set_bit(n,addr)    (*(addr) |= (1 << (n)))
+#define test_bit(n,addr)   (*(addr) & (1 << (n)))
+
 #ifndef DEBUG
 # include <linux/rtc.h>
 # include <sys/ioctl.h>