summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsparky2006-01-07 03:03:09 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commitcd40a9c087afb1de62c1bcfdd14e0d15dc1aeba4 (patch)
treebf8ddea8bd3faa4801054b12054d803e8290742d
parent299c478cadb9849fe24da28519008b96ac909109 (diff)
downloadkernel-plustek-sane-cd40a9c087afb1de62c1bcfdd14e0d15dc1aeba4.zip
kernel-plustek-sane-cd40a9c087afb1de62c1bcfdd14e0d15dc1aeba4.tar.gz
- 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 !!! Changed files: kernel-plustek-sane.spec -> 1.16
-rw-r--r--kernel-plustek-sane.spec5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel-plustek-sane.spec b/kernel-plustek-sane.spec
index 4f43cef..7537a0f 100644
--- a/kernel-plustek-sane.spec
+++ b/kernel-plustek-sane.spec
@@ -16,6 +16,7 @@ Source0: http://www.gjaeger.de/scanner/current/plustek-sane-%{bver}-%{sver}.tar.
# 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}
@@ -65,14 +66,16 @@ Pakiet zawiera moduł jądra SMP sterujący skanerami Plustek.
%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)