# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1283608933 -7200
# Node ID 964f5d384827835d00405090e15d988133f7fdeb
# Parent  ae97a9aa5f66baacbd1e2399a1ba684a2d80dd45
cdparanoia-III, cdrdao, dmraid, hal, libburn, libcdio, lshw, testdisk, udev, util-linux-ng: fix scsi/scsi.h case

diff -r ae97a9aa5f66 -r 964f5d384827 cdparanoia-III/receipt
--- a/cdparanoia-III/receipt	Sat Sep 04 14:56:38 2010 +0200
+++ b/cdparanoia-III/receipt	Sat Sep 04 16:02:13 2010 +0200
@@ -13,6 +13,9 @@
 compile_rules()
 {
 	cd $src
+	grep -qs 'define u8' interface/low_interface.h ||
+	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
+		interface/low_interface.h
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
diff -r ae97a9aa5f66 -r 964f5d384827 cdrdao/receipt
--- a/cdrdao/receipt	Sat Sep 04 14:56:38 2010 +0200
+++ b/cdrdao/receipt	Sat Sep 04 16:02:13 2010 +0200
@@ -22,6 +22,9 @@
 	done
 	find -name '*.c' | xargs sed -i -e 's/getline/get_line/' \
 		-e 's/fexecve/fexec_ve/' scsilib/include/schily.h
+	grep -qs 'define u8' scsilib/libscg/scsi-linux-sg.c ||
+	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
+		scsilib/libscg/scsi-linux-sg.c
 	./configure --prefix=/usr --with-lame &&
 	make &&
 	make DESTDIR=$PWD/_pkg install
diff -r ae97a9aa5f66 -r 964f5d384827 dmraid/receipt
--- a/dmraid/receipt	Sat Sep 04 14:56:38 2010 +0200
+++ b/dmraid/receipt	Sat Sep 04 16:02:13 2010 +0200
@@ -17,6 +17,8 @@
 	mv $PACKAGE/$VERSION $src && rmdir $PACKAGE 2> /dev/null
 	cd $src
 	#sed -i 's/sed --quiet/sed/' configure configure.in
+	grep -qs 'define u8' lib/device/scsi.c ||
+	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' lib/device/scsi.c
 	./configure --prefix=/usr --infodir=/usr/share/info \
 	--mandir=/usr/share/man \
 	$CONFIGURE_ARGS &&
diff -r ae97a9aa5f66 -r 964f5d384827 hal/receipt
--- a/hal/receipt	Sat Sep 04 14:56:38 2010 +0200
+++ b/hal/receipt	Sat Sep 04 16:02:13 2010 +0200
@@ -29,6 +29,9 @@
 	zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids &&
 	patch -p1 < ../stuff/hal-scripts.u || exit 1 &&
 	#patch -p1 < ../stuff/hal-udev.patch || exit 1 &&
+	grep -qs 'define u8' hald/linux/probing/linux_dvd_rw_utils.c ||
+	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
+		hald/linux/probing/linux_dvd_rw_utils.c
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib/hal \
diff -r ae97a9aa5f66 -r 964f5d384827 libburn/receipt
--- a/libburn/receipt	Sat Sep 04 14:56:38 2010 +0200
+++ b/libburn/receipt	Sat Sep 04 16:02:13 2010 +0200
@@ -13,6 +13,8 @@
 compile_rules()
 {
 	cd $src
+	grep -qs 'define u8' libburn/sg-linux.c ||
+	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' libburn/sg-linux.c
 	./configure --prefix=/usr --infodir=/usr/share/info \
 	--mandir=/usr/share/man $CONFIGURE_ARGS &&
 	make &&
diff -r ae97a9aa5f66 -r 964f5d384827 libcdio/receipt
--- a/libcdio/receipt	Sat Sep 04 14:56:38 2010 +0200
+++ b/libcdio/receipt	Sat Sep 04 16:02:13 2010 +0200
@@ -15,6 +15,9 @@
 compile_rules()
 {
 	cd $src
+	grep -qs 'define u8' lib/driver/gnu_linux.c ||
+	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
+		lib/driver/gnu_linux.c
 	./configure --prefix=/usr --disable-vcd-info &&
 	make &&
 	make DESTDIR=$PWD/_pkg install
diff -r ae97a9aa5f66 -r 964f5d384827 lshw/receipt
--- a/lshw/receipt	Sat Sep 04 14:56:38 2010 +0200
+++ b/lshw/receipt	Sat Sep 04 16:02:13 2010 +0200
@@ -17,6 +17,9 @@
 	
 	cd $src
 	sed -i 's/hwNode::hwNode/hwNode/' src/core/scsi.cc
+	grep -qs 'define u8' src/core/scsi.cc src/core/burner.cc ||
+	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
+		src/core/scsi.cc src/core/burner.cc
 	make &&
 	make DESTDIR=$PWD/_pkg install
 }
diff -r ae97a9aa5f66 -r 964f5d384827 testdisk/receipt
--- a/testdisk/receipt	Sat Sep 04 14:56:38 2010 +0200
+++ b/testdisk/receipt	Sat Sep 04 16:02:13 2010 +0200
@@ -16,6 +16,8 @@
 compile_rules()
 {
 	cd $src
+	grep -qs 'define u8' src/hdaccess.c ||
+	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' src/hdaccess.c
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
diff -r ae97a9aa5f66 -r 964f5d384827 udev/receipt
--- a/udev/receipt	Sat Sep 04 14:56:38 2010 +0200
+++ b/udev/receipt	Sat Sep 04 16:02:13 2010 +0200
@@ -16,8 +16,10 @@
 compile_rules()
 {
 	gzip -d /usr/share/misc/pci.ids.gz
-	#sed -i s/u8/__u8/ /usr/include/scsi/scsi.h
 	cd $src
+	grep -qs 'define u8' extras/*_id/*.c ||
+	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
+		extras/scsi_id/scsi_serial.c extras/ata_id/ata_id.c
 	./configure \
 		--prefix=/usr \
 		--exec-prefix="" \
diff -r ae97a9aa5f66 -r 964f5d384827 util-linux-ng/receipt
--- a/util-linux-ng/receipt	Sat Sep 04 14:56:38 2010 +0200
+++ b/util-linux-ng/receipt	Sat Sep 04 16:02:13 2010 +0200
@@ -19,6 +19,8 @@
 	if ! grep 'tty:x:4:' /etc/group; then
 		addgroup -g 4 tty
 	fi
+	grep -qs 'define u8' fdisk/fdisksunlabel.c ||
+	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' fdisk/fdisksunlabel.c
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \