SPECS: kernel-plustek-sane.spec - inline-in-header patch - yet mor...

[sparky]

Author: sparky                       Date: Sat Jan  7 03:03:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- inline-in-header patch
- yet more Makefile fixes, and add version definitions to CFLAGS
- still it is not building:
-- image.c:261,289,331,313: error: invalid lvalue in increment
   looks like unnecessary cast, or it's because of gcc4, but when I patched
   it I get:
-- misc.c:855: error: 'struct parport' has no member named 'next'
   THIS MODULE IS TOTALLY BROKEN !!!

---- Files affected:
SPECS:
   kernel-plustek-sane.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/kernel-plustek-sane.spec
diff -u SPECS/kernel-plustek-sane.spec:1.15 SPECS/kernel-plustek-sane.spec:1.16
--- SPECS/kernel-plustek-sane.spec:1.15	Sat Jan  7 02:27:14 2006
+++ SPECS/kernel-plustek-sane.spec	Sat Jan  7 04:03:09 2006
@@ -17,6 +17,7 @@
 # Source0-md5:	ca8f7b1f7ee35b3c09caf0cb16dc6b88
 Patch0:		%{name}-Makefile.patch
 Patch1:		%{name}-alpha.patch
+Patch2:		%{name}-inline-in-header.patch
 URL:		http://www.gjaeger.de/scanner/plustek.html
 %{?with_dist_kernel:BuildRequires:	kernel-headers}
 #BuildRequires:	%{kgcc_package}
@@ -66,14 +67,16 @@
 %setup -q -c
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cd backend/plustek_driver/src
 ## generate new makefile
 echo "obj-m := pt_drv.o" >Makefile
-echo "pt_drv-objs := dac.o detect.o generic.o image.o map.o misc.o models.o" \
+echo "pt_drv-objs := dac.o detect.o genericio.o image.o map.o misc.o models.o" \
 	"io.o procfs.o motor.o p9636.o ptdrv.o scale.o tpa.o p48xx.o p12.o" \
 	"p12ccd.o" >> Makefile
+echo "CFLAGS += -D_PTDRV_V1=0 -D_PTDRV_V0=42 -D_PTDRV_BUILD=10" >> Makefile
 cp ../h/*.h .
 cp ../../plustek-share.h .
 # kernel module(s)
@@ -142,6 +145,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/01/07 03:03:09  sparky
+- inline-in-header patch
+- yet more Makefile fixes, and add version definitions to CFLAGS
+- still it is not building:
+-- image.c:261,289,331,313: error: invalid lvalue in increment
+   looks like unnecessary cast, or it's because of gcc4, but when I patched
+   it I get:
+-- misc.c:855: error: 'struct parport' has no member named 'next'
+   THIS MODULE IS TOTALLY BROKEN !!!
+
 Revision 1.15  2006/01/07 01:27:14  sparky
 - fixed Makefile
 - copy all neaded headers to build directory
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-plustek-sane.spec?r1=1.15&r2=1.16&f=u