diff --git a/.cvsignore b/.cvsignore index 44da284..a778e13 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ sane-backends-1.0.20.tar.gz -sane-backends-1.0.20-autoreconf.patch.bz2 +sane-backends-1.0.20-11-autoreconf.patch.bz2 diff --git a/sane-backends-1.0.20-genesys-gl841-registers.patch b/sane-backends-1.0.20-genesys-gl841-registers.patch new file mode 100644 index 0000000..61c4c43 --- /dev/null +++ b/sane-backends-1.0.20-genesys-gl841-registers.patch @@ -0,0 +1,42 @@ +commit 4d9d166a3ae830c62bb7341efe886c99e614199a +Author: Nils Philippsen +Date: Tue Dec 29 11:43:24 2009 +0100 + + patch: genesys-gl841-registers + + Squashed commit of the following: + + commit 8bb82ba231bec01377e28a4f7f635dca61c34fbb + Author: Pierre Willenbrock + Date: Wed Jun 3 00:16:16 2009 +0200 + + Always send registers before trying to acquire a line + (cherry picked from commit a0ea955e91837156d2112c0ffd12c8afebe86efa) + + Signed-off-by: Nils Philippsen + Resolves: rhbz#527935 + +diff --git a/backend/genesys_gl841.c b/backend/genesys_gl841.c +index 2810865..c9facc4 100644 +--- a/backend/genesys_gl841.c ++++ b/backend/genesys_gl841.c +@@ -4948,9 +4948,6 @@ gl841_offset_calibration (Genesys_Device * dev) + return status; + } + +- RIE (gl841_bulk_write_register +- (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS)); +- + used_res = dev->current_setup.xres; + num_pixels = dev->current_setup.pixels; + +@@ -4999,6 +4996,9 @@ gl841_offset_calibration (Genesys_Device * dev) + + do { + ++ RIE (gl841_bulk_write_register ++ (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS)); ++ + for (j=0; j < channels; j++) { + off[j] = (offh[j]+offl[j])/2; + dev->frontend.offset[j] = off[j]; diff --git a/sane-backends-1.0.20-lockdir.patch b/sane-backends-1.0.20-lockdir.patch new file mode 100644 index 0000000..8839976 --- /dev/null +++ b/sane-backends-1.0.20-lockdir.patch @@ -0,0 +1,30 @@ +commit 1e12605eac293b12809ca2933622acc54515c237 +Author: Nils Philippsen +Date: Mon Dec 28 17:00:25 2009 +0100 + + patch: lockdir + + Squashed commit of the following: + + commit 7d26ebc2c0c0c8a8e3254834a700951b49648eeb + Author: Nils Philippsen + Date: Mon Dec 28 16:58:36 2009 +0100 + + improve install-lockpath target + + make robust against problems with setting group on sane lock dir + +diff --git a/backend/Makefile.am b/backend/Makefile.am +index 5165423..3c22cd4 100644 +--- a/backend/Makefile.am ++++ b/backend/Makefile.am +@@ -137,7 +137,8 @@ install-firmware-path: + done + + install-lockpath: +- $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) ++ $(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir) || \ ++ $(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir) + + uninstall-hook: + rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir) diff --git a/sane-backends-1.0.20-rpath.patch b/sane-backends-1.0.20-rpath.patch index ba3cd73..3e564f9 100644 --- a/sane-backends-1.0.20-rpath.patch +++ b/sane-backends-1.0.20-rpath.patch @@ -1,11 +1,17 @@ -commit e0de6eaee11254667eb6abb6e2ccb7768bd2de4f +commit fe1456e2431a3b8bd27aadc5bbc6998ebc8cd00c Author: Nils Philippsen -Date: Tue Jun 16 16:59:43 2009 +0200 +Date: Mon Aug 31 16:38:23 2009 +0200 patch: rpath Squashed commit of the following: + commit c37206c9fa724e19f6929d8a77e5399ca6b87f1f + Author: Nils Philippsen + Date: Mon Aug 31 16:34:42 2009 +0200 + + fix --enable-rpath + commit be2982b2d1ae4d889b4cecec289336b4b03579aa Author: Nils Philippsen Date: Tue Jun 2 16:12:23 2009 +0200 @@ -15,10 +21,10 @@ Date: Tue Jun 16 16:59:43 2009 +0200 make using runtime library search path configurable diff --git a/acinclude.m4 b/acinclude.m4 -index 6413b60..c6f5800 100644 +index 6413b60..b2bb065 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -383,19 +383,31 @@ dnl +@@ -383,19 +383,29 @@ dnl AC_DEFUN([SANE_LINKER_RPATH], [dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !! @@ -38,9 +44,7 @@ index 6413b60..c6f5800 100644 + AC_MSG_CHECKING([whether runtime link path should be used]) + AC_ARG_ENABLE([rpath], + [AS_HELP_STRING([--enable-rpath], -+ [use runtime library search path @<:@default=yes@:>@])] -+ [], -+ [enable_readline=yes]) ++ [use runtime library search path @<:@default=yes@:>@])]) + + LINKER_RPATH= + AS_IF([test "x$enable_rpath" != xno], diff --git a/sane-backends-1.0.20-udev.patch b/sane-backends-1.0.20-udev.patch new file mode 100644 index 0000000..da38a52 --- /dev/null +++ b/sane-backends-1.0.20-udev.patch @@ -0,0 +1,75 @@ +commit 9ba88134bd6d296ccbcf253c6ade3e646dc286b9 +Author: Nils Philippsen +Date: Thu Oct 22 17:05:30 2009 +0200 + + patch: udev + + Squashed commit of the following: + + commit a7541ac649bea3f352a249dfc569f3bc18b5a968 + Author: Nils Philippsen + Date: Thu Oct 22 17:02:52 2009 +0200 + + don't set owner, group or mode + + setting owner, group or mode may interfere with setting ACLs + + commit e385558cf214d263af93147995f1f8b729d2dabe + Author: Nils Philippsen + Date: Thu Oct 22 14:19:53 2009 +0200 + + fix device file ownership and mode + + commit fe874d6f9873598e8bcd9201508bc2c89365e821 + Author: Nils Philippsen + Date: Thu Oct 22 11:16:16 2009 +0200 + + adapt generated udev rules for Fedora + +diff --git a/tools/sane-desc.c b/tools/sane-desc.c +index c317700..2a410b2 100644 +--- a/tools/sane-desc.c ++++ b/tools/sane-desc.c +@@ -56,9 +56,9 @@ + #define COLOR_NEW "\"#F00000\"" + #define COLOR_UNKNOWN "\"#000000\"" + +-#define DEVMODE "0664" ++#define DEVMODE "0644" + #define DEVOWNER "root" +-#define DEVGROUP "scanner" ++#define DEVGROUP "root" + + #ifndef PATH_MAX + # define PATH_MAX 1024 +@@ -3475,8 +3475,8 @@ print_udev (void) + } + } + printf ("\n"); +- printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n", +- usbid->usb_vendor_id + 2, usbid->usb_product_id + 2, DEVMODE, DEVGROUP); ++ printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n", ++ usbid->usb_vendor_id + 2, usbid->usb_product_id + 2); + usbid = usbid->next; + } + +@@ -3488,7 +3488,7 @@ print_udev (void) + printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n"); + printf ("LABEL=\"libsane_scsi_rules_begin\"\n"); + printf ("# Generic: SCSI device type 6 indicates a scanner\n"); +- printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP); ++ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", ENV{libsane_matched}=\"yes\"\n"); + printf ("# Some scanners advertise themselves as SCSI device type 3\n"); + + while (scsiid) +@@ -3521,8 +3521,8 @@ print_udev (void) + } + } + printf ("\n"); +- printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n", +- scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP); ++ printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", ENV{libsane_matched}=\"yes\"\n", ++ scsiid->scsi_vendor_id, scsiid->scsi_product_id); + scsiid = scsiid->next; + } + printf ("LABEL=\"libsane_scsi_rules_end\"\n\n"); diff --git a/sane-backends.spec b/sane-backends.spec index ba8ba11..7b3711b 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,21 @@ +# Use the following --with/--without