rpms/sane-backends
7
0
Fork 0
Code Issues Pull Requests Releases Activity

version 1.0.23

Browse Source 
update udev patch, remove obsolete patches
This commit is contained in:
Nils Philippsen 2012-08-31 16:22:37 +02:00
parent 4dc04cebff
commit c3a3750c07
14 changed files with 58 additions and 1175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
sane-backends-1.0.21.tar.gz
/sane-backends-1.0.22.tar.gz
/sane-backends-1.0.23.tar.gz

39
sane-backends-1.0.22-Lexmark-X1100.patch
View File

@ -1,39 +0,0 @@
From d273b1d34fe3fe7407457499aa1c0bafacae7e7e Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 4 Jan 2012 10:49:02 +0100
Subject: [PATCH] patch: Lexmark-X1100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Squashed commit of the following:
commit 62bef64fb903a94711eb160d38eaed03ad4b27cc
Author: Stéphane Voltz <stef.dev@free.fr>
Date: Thu Jun 9 22:22:57 2011 +0200
X1100 device regression fix
(cherry picked from commit cef28b4d46a0faa4d4acb60d815ac9a49036ba85)
Conflicts:
ChangeLog
---
backend/lexmark_models.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/backend/lexmark_models.c b/backend/lexmark_models.c
index 0a6d300..7819a8d 100644
--- a/backend/lexmark_models.c
+++ b/backend/lexmark_models.c
@@ -50,6 +50,7 @@ static Lexmark_Model model_list[] = {
"Lexmark X1100", /* name */
"Lexmark", /* vendor */
"X1100/rev. B2", /* model */
+ X1100_MOTOR,
/* X1100 series has 2 sensors */
X1100_B2_SENSOR,
1235, /* first x-coordinate of Home Point */
--
1.7.7.5

26
sane-backends-1.0.22-av220-gray-modes.patch
View File

@ -1,26 +0,0 @@
From c648a4411e5eacf19da2de726dac06ec07dae302 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Fri, 18 Nov 2011 12:17:22 +0100
Subject: [PATCH] avision: reenable grayscale and lineart modes for AV220
See https://bugzilla.redhat.com/show_bug.cgi?id=700725
---
backend/avision.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/backend/avision.c b/backend/avision.c
index 3398e08..426d913 100644
--- a/backend/avision.c
+++ b/backend/avision.c
@@ -248,7 +248,7 @@ static Avision_HWEntry Avision_Device_List [] =
{ NULL, NULL,
0x0638, 0x0A23,
"Avision", "AV220",
- AV_INT_BUTTON,0},
+ AV_INT_BUTTON | AV_GRAY_MODES,0},
/* comment="duplex! sheetfed scanner" */
/* status="complete" */
--
1.7.7.1

91
sane-backends-1.0.22-avision-init-devices.patch
View File

@ -1,91 +0,0 @@
From c688c041b21f955e420e0f1fb7807253d4f4035c Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Tue, 17 Apr 2012 11:42:54 +0200
Subject: [PATCH] patch: avision-init-devices
Squashed commit of the following:
commit ff9cb7dad86822147bc51a5cef9688603cbbcfa4
Author: Mike Kelly <mike@piratehaven.org>
Date: Wed Mar 21 21:03:00 2012 -0700
Added sane_reload_devices() to sane_init().
Adding sane_reload_devices() to sane_init() required sane_init() to be moved
below the sane_reload_devices() declaration. This restores the original
functionality present before I split the sane_reload_devices() code out of
sane_init() so that it could be called from sane_get_devices().
(cherry picked from commit 33bb529c5f8ca013fb499addc14c7fb229203ea8)
---
backend/avision.c | 48 +++++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 23 deletions(-)
diff --git a/backend/avision.c b/backend/avision.c
index 3398e08..8c066d7 100644
--- a/backend/avision.c
+++ b/backend/avision.c
@@ -7526,29 +7526,6 @@ attach_one_usb (const char* dev)
attach (dev, AV_USB, 0);
return SANE_STATUS_GOOD;
}
-
-SANE_Status
-sane_init (SANE_Int* version_code, SANE_Auth_Callback authorize)
-{
- authorize = authorize; /* silence gcc */
-
- DBG_INIT();
-
-#ifdef AVISION_STATIC_DEBUG_LEVEL
- DBG_LEVEL = AVISION_STATIC_DEBUG_LEVEL;
-#endif
-
- DBG (3, "sane_init:(Version: %i.%i Build: %i)\n",
- SANE_CURRENT_MAJOR, V_MINOR, BACKEND_BUILD);
-
- /* must come first */
- sanei_thread_init ();
-
- if (version_code)
- *version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BACKEND_BUILD);
-
- return SANE_STATUS_GOOD;
-}
static SANE_Status
sane_reload_devices (void)
@@ -7722,6 +7699,31 @@ sane_reload_devices (void)
return SANE_STATUS_GOOD;
}
+SANE_Status
+sane_init (SANE_Int* version_code, SANE_Auth_Callback authorize)
+{
+ authorize = authorize; /* silence gcc */
+
+ DBG_INIT();
+
+#ifdef AVISION_STATIC_DEBUG_LEVEL
+ DBG_LEVEL = AVISION_STATIC_DEBUG_LEVEL;
+#endif
+
+ DBG (3, "sane_init:(Version: %i.%i Build: %i)\n",
+ SANE_CURRENT_MAJOR, V_MINOR, BACKEND_BUILD);
+
+ /* must come first */
+ sanei_thread_init ();
+
+ if (version_code)
+ *version_code = SANE_VERSION_CODE (SANE_CURRENT_MAJOR, V_MINOR, BACKEND_BUILD);
+
+ sane_reload_devices ();
+
+ return SANE_STATUS_GOOD;
+}
+
void
sane_exit (void)
{
--
1.7.10

566
sane-backends-1.0.22-docs-utf8.patch
View File

@ -1,566 +0,0 @@
From e387e2de4d657001b24ac242dfe8465aa209de02 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 16 Mar 2011 18:07:02 +0100
Subject: [PATCH] patch: docs-utf8
Squashed commit of the following:
commit c4a52aad8fb3cc933aea08af8add000fd1f3af74
Author: Nils Philippsen <nils@redhat.com>
Date: Wed Mar 16 18:00:55 2011 +0100
encode to UTF-8
---
AUTHORS | 20 ++++----
ChangeLog | 90 +++++++++++++++++-----------------
NEWS | 2 +-
doc/descriptions.txt | 2 +-
doc/gt68xx/gt68xx.CHANGES | 2 +-
doc/mustek/mustek.CHANGES | 2 +-
doc/plustek/Plustek-PARPORT-TODO.txt | 2 +-
doc/plustek/Plustek-PARPORT.txt | 2 +-
doc/plustek/Plustek-USB.txt | 2 +-
doc/u12/U12.changes | 2 +-
doc/u12/U12.todo | 2 +-
doc/umax/sane-umax-parport-doc.html | 2 +-
12 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index c7a5b36..b07e737 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,7 +9,7 @@ Java API:
Backends:
abaton: David Huggins-Daines
- agfafocus: Karl Anders Øygard
+ agfafocus: Karl Anders Øygard
apple: Milon Firikis
artec: Chris Pinkham
artec_eplus48u:Sergey Vlasov, Andreas Nowack, David Stevenson, and
@@ -38,7 +38,7 @@ Backends:
fujitsu: Randolph Bentson, Frederik Ramm, Oliver Schirrmeister (*),
m. allan noah (*)
gphoto2: Peter Fales (*)
- genesys: Henning Geinitz (*), Gerhard Jaeger (*), Stéphane Voltz (*),
+ genesys: Henning Geinitz (*), Gerhard Jaeger (*), Stéphane Voltz (*),
Pierre Willenbrock (*)
gt68xx: Sergey Vlasov, Andreas Nowack, David Stevenson, and
Henning Geinitz (*)
@@ -51,11 +51,11 @@ Backends:
Frank Zago, Henning Geinitz (*)
hp5400: Martijn van Oosterhout, Thomas Soumarmon (*)
hp5590: Ilia Sotnikov (*)
- hpljm1005: Philippe Rétornaz
+ hpljm1005: Philippe Rétornaz
hs2p: Jeremy Johnson
ibm: M.F., Henning Geinitz (*)
leo: Frank Zago (*)
- lexmark: Fred Odendaal, Stéphane Voltz (*)
+ lexmark: Fred Odendaal, Stéphane Voltz (*)
ma1509: Henning Geinitz (*)
magicolor: Reinhold Kainhofer (based on epson2 backend)
matsushita: Frank Zago (*)
@@ -69,7 +69,7 @@ Backends:
nec: Kazuya Fukuda (*)
net: Andreas Beck, David Mosberger, Julien Blache (*)
niash: Ullrich Sigwanz (*), Bertrik Sikken
- p5: Stéphane Voltz (*)
+ p5: Stéphane Voltz (*)
pie: Simon Munton (*)
pint: Gordon Matzigkeit
pixma: Wittawat Yamwong (*)
@@ -84,7 +84,7 @@ Backends:
despeckling filter by Patrick Reynolds,
B&W fixes by Andrew Kuchling
ricoh: Feico W. Dillema
- rts8891: Stéphane Voltz (*)
+ rts8891: Stéphane Voltz (*)
s9036: Ingo Schneider
sceptre: Frank Zago (*)
sharp: Kazuya Fukuda (*) and Abel Deuring (*)
@@ -102,7 +102,7 @@ Backends:
test: Henning Geinitz (*)
u12: Gerhard Jaeger (*)
umax: Oliver Rauch (*) and Michael K. Johnson
- umax_pp: Stéphane Voltz (*)
+ umax_pp: Stéphane Voltz (*)
umax1220u: Marcio L. Teixeira, Patrick Lessard
v4l: Juergen G. Schimmer, and Henning Geinitz (*)
xerox_mfp: Alex Belkin (*)
@@ -112,7 +112,7 @@ Frontends:
jscanimage: Jeff Freedman and Guido Muesch
saned: Andreas Beck, David Mosberger, Julien Blache (*)
scanimage: Andreas Beck, David Mosberger, Gordon Matzigkeit,
- m. allan noah (*), Julien Blache (*), Stéphane Voltz (*)
+ m. allan noah (*), Julien Blache (*), Stéphane Voltz (*)
tstbackend: Frank Zago (*)
Sanei internal code:
@@ -189,7 +189,7 @@ Jon Chambers <jon@jon.demon.co.uk>
Jonathan Bravo Lopez <jkdsoft@gmail.com>
Juergen G. Schimmer <schimmi@nbgm.siemens.de>
Julien Blache <jb@jblache.org>
-Karl Anders Øygard <karlo@opera.no>
+Karl Anders Øygard <karlo@opera.no>
Karl Heinz Kremer <khk@khk.net>
Karsten Festag <karsten.festag@gmx.de>
Kazuhiro Sasayama <kaz@hypercore.co.jp>
@@ -232,7 +232,7 @@ Sebastien Sable <Sebastien.Sable@snv.jussieu.fr>
Sergey Vlasov <vsu@altlinux.ru>
Simon Krix <kinsei@users.sourceforge.net>
Simon Munton <simon@munton.demon.co.uk>
-Stéphane Voltz <stef.dev@free.fr>
+Stéphane Voltz <stef.dev@free.fr>
Thomas Soumarmon <soumarmt@nerim.net>
Tom Martone <tom@martoneconsulting.com>
Tom Wang <tom.wang@mustek.com.tw>
diff --git a/ChangeLog b/ChangeLog
index 0d4a741..b32913f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,15 +4,15 @@
* po/nl.po: updates from Martin Kho
* po/uk.po: updates from Yuri Chornoivan
-2011-02-04 Stéphane Voltz <stef.dev@free.fr>
+2011-02-04 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c: disable image processing options at 16 bits since
they can't handle it.
-2011-02-02 Stéphane Voltz <stef.dev@free.fr>
+2011-02-02 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_low.c backend/genesys_gl843.c:
more asynchronous parking issues
-2011-01-31 Stéphane Voltz <stef.dev@free.fr>
+2011-01-31 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_low.[ch]: don't return EOF too
early when applying image processing functions, handle writing of
lineart data, improve asynchronous head parking
@@ -46,7 +46,7 @@
- ad usb ids for DR-6030C, CR-135i & CR-190i
* doc/descriptions/unsupported.desc: moved DR-2020U from canon_dr.desc
-2011-01-20 Stéphane Voltz <stef.dev@free.fr>
+2011-01-20 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl646.h: tune resolution
list and add internal values matching them
@@ -63,7 +63,7 @@
* po/de.po: updated translation from Matthias Mailander
* backend/canon.conf.in: improved detection of scsi scanners
-2011-01-17 Stéphane Voltz <stef.dev@free.fr>
+2011-01-17 Stéphane Voltz <stef.dev@free.fr>
* doc/descriptions/genesys.desc: add DSmobile variant
2011-01-15 Reinhold Kainhofer <reinhold@kainhofer.com>
@@ -72,17 +72,17 @@
* backend/magicolor.c: Add new "magicolor" backend for KONICA MINOLTA
magicolor 1690MF devices
-2011-01-13 Stéphane Voltz <stef.dev@free.fr>
+2011-01-13 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl124.c backend/genesys_gl124.h
doc/descriptions/genesys.desc: add 2400 dpi mode for LiDE 110 and 210
-2011-01-12 Stéphane Voltz <stef.dev@free.fr>
+2011-01-12 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl124.c
backend/genesys_gl124.h backend/genesys_low.c backend/genesys_low.h :
prepare 2400 dpi modes for LiDE 210/110, add a wait for head to park
function and use it in sane_start().
-2011-01-06 Stéphane Voltz <stef.dev@free.fr>
+2011-01-06 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c
backend/genesys_gl847.c: fix lineart issue when yres is higher than
xres and dynamic lineart is enabled, make gl847 wait for head to
@@ -97,13 +97,13 @@
backend/pixma_common.c, backend/pixma_common.h:
pixma: several updates for MP830, MP990, memmove bug fix, and 64 bits image size.
-2011-01-04 Stéphane Voltz <stef.dev@free.fr>
+2011-01-04 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c
backend/genesys_gl124.c: fix 1200 dpi lineart issues for gl124,
reenable low resolutions for lineart for gl124, and geometry fine
tuning for LiDE 110/210
-2011-01-03 Stéphane Voltz <stef.dev@free.fr>
+2011-01-03 Stéphane Voltz <stef.dev@free.fr>
* backends/lexmark_low.c: fix compilation issue due to incorrect
place for a DBG statement.
@@ -126,30 +126,30 @@
disabled.
* sanei/Makefile.am: allow "make check" to work on cygwin.
-2010-12-28 Stéphane Voltz <stef.dev@free.fr>
+2010-12-28 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.conf.in backend/genesys_devices.c backend/genesys_gl646.c
backend/genesys_gl847.c backend/genesys_gl847.h:
fix HP2300 warming up problem, add LiDE 700F and 5600F to gl847
devices, smooth DSmobile 600 moves.
-2010-12-27 Stéphane Voltz <stef.dev@free.fr>
+2010-12-27 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys.conf.in backend/genesys_devices.c
backend/genesys_gl841.c backend/genesys_low.h
doc/descriptions/genesys.desc doc/descriptions/unsupported.desc
doc/sane-genesys.man: add Plustek OpticBook 3600 support
by Chris Berry <s0457957@sms.ed.ac.uk> and Michael Rickmann <mrickma@gwdg.de>
-2010-12-27 Stéphane Voltz <stef.dev@free.fr>
+2010-12-27 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl124.c backend/genesys.c
doc/descriptions/genesys.desc doc/sane-genesys.man: enable 16 bit gamma
for gl124 scanners, models and credits update.
-2010-12-24 Stéphane Voltz <stef.dev@free.fr>
+2010-12-24 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl124.c backend/genesys.c
doc/descriptions/genesys.desc: GL847 shading area size fix, GL124
shading area tuning, descriptions update.
-2010-12-24 Stéphane Voltz <stef.dev@free.fr>
+2010-12-24 Stéphane Voltz <stef.dev@free.fr>
* backend/lexmark*.[ch]: applied X74 support patch by Torsten Houwaart
<ToHo@gmx.de>
@@ -170,15 +170,15 @@
* doc/descriptions/avision.desc:
- (Re)generated from avision.c.
-2010-12-19 Stéphane Voltz <stef.dev@free.fr>
+2010-12-19 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_gl124.h: LiDE 210 GPIO fix
-2010-12-16 Stéphane Voltz <stef.dev@free.fr>
+2010-12-16 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys.conf.in backend/genesys_devices.c
backend/genesys_gl124.h:
LiDE 210 support (GL124 based)
-2010-12-14 Stéphane Voltz <stef.dev@free.fr>
+2010-12-14 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys*.[ch] backend/genesys.conf.in backend/Makefile.am
backend/Makefile.in tools/check-usb-chip.c doc/desc/genesys.desc:
LiDE 110 support (GL124 based)
@@ -228,7 +228,7 @@
* doc/descriptions-external/epkowa.desc: update for iScan 2.26.1,
from Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>.
-2010-11-17 Stéphane Voltz <stef.dev@free.fr>
+2010-11-17 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c: don't write scan data unless specified by debug
level.
@@ -240,15 +240,15 @@
* backend/v4l.c: loop through the read buffers in the v4l backend so
we don't get stale frames.
-2010-11-06 Stéphane Voltz <stef.dev@free.fr>
+2010-11-06 Stéphane Voltz <stef.dev@free.fr>
* frontend/scanimage.c doc/scanimage.man: add -A/--all-options to list
all control options exposed by a backend.
-2010-11-01 Stéphane Voltz <stef.dev@free.fr>
+2010-11-01 Stéphane Voltz <stef.dev@free.fr>
* frontend/scanimage.c: don't print readonly device options since
they can't be set on command line
-2010-11-01 Stéphane Voltz <stef.dev@free.fr>
+2010-11-01 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl843.c
backend/genesys_gl843.h backend/genesys_gl847.c: up build number to 41,
rework head parking,
@@ -265,7 +265,7 @@
Samsung SCX 4824 & 4825FN (Debian #601748). Resync desc file with
config file.
-2010-10-13 Stéphane Voltz <stef.dev@free.fr>
+2010-10-13 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl843.c
backend/genesys_gl843.h: added 100, 150, 400 and 600 dpi modes for
G4050 and G4010. Added 500 and 400 dpi modes for KV-SS080
@@ -279,7 +279,7 @@
for xerox_mfp backend (by Alexander Kuznetsov). autoconf and automake reconfigure
to support new files.
-2010-09-28 Stéphane Voltz <stef.dev@free.fr>
+2010-09-28 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys.conf.in backend/genesys_devices.c
backend/genesys_gl843.c backend/genesys_gl843.h: add minimal support
(200 and 300 dpi) for HP G4050. Add a device entry for G4010.
@@ -296,7 +296,7 @@
* doc/descriptions-external/epkowa.desc: update for iScan 2.26.0,
from Alesh Slovak <alesh.slovak@avasys.jp>.
-2010-09-17 Stéphane Voltz <stef.dev@free.fr>
+2010-09-17 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_low.h sanei/sanei_magic.c
backend/genesys_devices.c backend/genesys_gl843.c: do asynchronous head
parking for flatbed scanners to save scan time. Fix a couple of
@@ -307,15 +307,15 @@
* frontend/saned.c: exit Avahi process on error and when the poll
loop terminates.
-2010-09-13 Stéphane Voltz <stef.dev@free.fr>
+2010-09-13 Stéphane Voltz <stef.dev@free.fr>
* doc/descriptions/unsupported.desc: update status of scanners
now supported by the genesys backend.
-2010-09-13 Stéphane Voltz <stef.dev@free.fr>
+2010-09-13 Stéphane Voltz <stef.dev@free.fr>
* doc/sane-genesys.man doc/descriptions/genesys.desc
backend/genesys.con.in: update HP3690 status to supported
-2010-09-12 Stéphane Voltz <stef.dev@free.fr>
+2010-09-12 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_conv.c backend/genesys.c doc/sane-genesys.man
sanei/sanei_magic.c backend/genesys.h backend/genesys_low.h
backend/Makefile.in backend/Makefile.am: add software deskep, crop
@@ -334,15 +334,15 @@
* doc/sane-pixma.man:
pixma: man page update for devices as reported by Gernot Hassenpflug.
-2010-09-05 Stéphane Voltz <stef.dev@free.fr>
+2010-09-05 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_gl841.c: end of document detection rework for
sheetfed scanners.
-2010-09-04 Stéphane Voltz <stef.dev@free.fr>
+2010-09-04 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys.c backend/genesys_gl843.c:
1200 dpi resolution support for KV-SS080.
-2010-09-01 Stéphane Voltz <stef.dev@free.fr>
+2010-09-01 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys.c backend/genesys_gl843.c:
support for scan button, faster move to scan area and calibration fine
tuning.
@@ -353,13 +353,13 @@
pixma: changes supplied by Gernot Hassenpflug for Lineart support
to some Pixma devices, and desc updates.
-2010-08-31 Stéphane Voltz <stef.dev@free.fr>
+2010-08-31 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys.conf.in backend/genesys.c
backend/genesys_gl843.[ch] backend/Makefile.am backend/Makefile.in:
support for gl843 based scanners, starting with KV-SS080.
disable true gray for LIDE35/50 since it breaks scanning
-2010-08-02 Stéphane Voltz <stef.dev@free.fr>
+2010-08-02 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys.conf.in: add a device
entry for the Canoscan 5600f.
@@ -417,18 +417,18 @@
* tools/sane-desc.c: udev rules: set libsane_matched=yes for SCSI
devices too. Used by udev-acl later on.
-2010-06-21 Stéphane Voltz <stef.dev@free.fr>
+2010-06-21 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
backend/genesys_low.h: improve scan quality by using double x
resolution internally at low resolution. Scan area geometry fine
tuning.
-2010-06-18 Stéphane Voltz <stef.dev@free.fr>
+2010-06-18 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
add 400, 200 and 100 dpi resolution to LiDE 100 and LiDE 200 . Disable
true gray until it really works.
-2010-06-15 Stéphane Voltz <stef.dev@free.fr>
+2010-06-15 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
backend/genesys_gl847.h:
Canon LiDE 200 support up to 1200 DPI
@@ -438,7 +438,7 @@
Add Samsung SCX-4600 USB IDs
* backend/kvs20xx.h: use sys/param.h instead of endian.h
-2010-06-10 Stéphane Voltz <stef.dev@free.fr>
+2010-06-10 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c:
calibration file name double free fix
@@ -446,7 +446,7 @@
* backend/niash.c: patch for HP3300 from Yves Jeanrenaud
* po/fr.po: updates from Yann E. MORIN
-2010-06-10 Stéphane Voltz <stef.dev@free.fr>
+2010-06-10 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_devices.c backend/genesys_gl847.c:
LiDE 100 motor settings rework
@@ -470,20 +470,20 @@
* backend/pixma_imageclass.c:
pixma: set #1 of modifiations for ImageClass MF65xx series.
-2010-06-07 Stéphane Voltz <stef.dev@free.fr>
+2010-06-07 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
LiDE 100 motor fine tuning
-2010-06-03 Stéphane Voltz <stef.dev@free.fr>
+2010-06-03 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
doc/descriptions/genesys.desc:
final bits for full LiDE 100 support
-2010-05-31 Stéphane Voltz <stef.dev@free.fr>
+2010-05-31 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
shading calibration is working and led calibration has been tuned
-2010-05-30 Stéphane Voltz <stef.dev@free.fr>
+2010-05-30 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
backend/genesys_low.h: Canon LiDE 100 working without shading
calibration which is the final bit to fix
@@ -491,7 +491,7 @@
2010-05-24 m. allan noah <kitno455 at gmail dot com>
* backend/avision.c, doc/descriptions/avision.desc: add Fujitsu fi-5015C
-2010-05-20 Stéphane Voltz <stef.dev@free.fr>
+2010-05-20 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
make led and shading calibration work for LiDE 100
@@ -500,12 +500,12 @@
to be told location of external libraries installed through
Ports.
-2010-05-16 Stéphane Voltz <stef.dev@free.fr>
+2010-05-16 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.[ch] backend/genesys_devices.c
backend/genesys.conf.in backend/genesys_gl847.[ch]
backend/Makefile.in: start of LiDE 100 and LIDE 200 support
-2010-05-16 Stéphane Voltz <stef.dev@free.fr>
+2010-05-16 Stéphane Voltz <stef.dev@free.fr>
* sanei/sanei_usb.c include/sane/sanei_usb.h: add a sanei_usb_reset()
function.
diff --git a/NEWS b/NEWS
index aad3ebe..53645b1 100644
--- a/NEWS
+++ b/NEWS
@@ -463,7 +463,7 @@ New with 1.00:
Supports "Scan 300/GS" and may work with "Scan 300/S" but the
latter is untested.
-* New Agfa Focus backend (by Karl Anders Øygard)
+* New Agfa Focus backend (by Karl Anders Øygard)
Supports:
o AGFA Focus GS (6 bit gray scale) (untested)
o AGFA Focus Lineart (lineart) (untested)
diff --git a/doc/descriptions.txt b/doc/descriptions.txt
index c9eaad1..d4cab94 100644
--- a/doc/descriptions.txt
+++ b/doc/descriptions.txt
@@ -84,7 +84,7 @@ Example: `:interface "SCSI USB IEEE-1394"'
`:usbid' defines the USB vendor and product ids of the device. It has two
arguments which must be lower case hexadecimal (4 digits). The first one is the
-USB vendor id, the second one the USB üproduct id. The keyword refers to the
+USB vendor id, the second one the USB product id. The keyword refers to the
previous `:model', is optional, and applicable for devices with :interface "USB"
only, and should be used only once per model. The special parameter "ignore" can
be used if no vendor or product ids are given intentionally, e.g. for a group of
diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES
index f20fb54..43f2e85 100644
--- a/doc/gt68xx/gt68xx.CHANGES
+++ b/doc/gt68xx/gt68xx.CHANGES
@@ -256,7 +256,7 @@ V 1.0-59 (2004-04-10)
* Added Genius Colorpage Vivid4 to .conf file. Changed status to good. Added
to man page.
* Fixed black mark for Mustek BearPaw 2448 TA Plus. This one and the Mustek A3
- fixes are from Jakub Dvo?ák <xdvorak@chello.cz>.
+ fixes are from Jakub Dvořák <xdvorak@chello.cz>.
* Status of BearPaw 2448 TA/CS Plus is "basic" now.
V 1.0-58 (2004-04-04)
diff --git a/doc/mustek/mustek.CHANGES b/doc/mustek/mustek.CHANGES
index 250f68f..b7c7e2b 100644
--- a/doc/mustek/mustek.CHANGES
+++ b/doc/mustek/mustek.CHANGES
@@ -763,7 +763,7 @@ CHANGES for the SANE Mustek backend
2000-06-04
* changed (again) Paragon 12000 SP linedistance handling, now 1.02 uses
normal LD corrections, all other use none. We'll see, if this works.
- Thanks to Reinhard Günzel who helped to debug this.
+ Thanks to Reinhard Günzel who helped to debug this.
* fixed some long lines (>80 chars)
2000-06-03
diff --git a/doc/plustek/Plustek-PARPORT-TODO.txt b/doc/plustek/Plustek-PARPORT-TODO.txt
index c66de8a..94ef5f7 100644
--- a/doc/plustek/Plustek-PARPORT-TODO.txt
+++ b/doc/plustek/Plustek-PARPORT-TODO.txt
@@ -1,4 +1,4 @@
-Plustek-PARPORT-TODO.txt (2003-29-10) Gerhard Jäger <gerhard@gjaeger.de>
+Plustek-PARPORT-TODO.txt (2003-29-10) Gerhard Jäger <gerhard@gjaeger.de>
========================================================================
TODO (in general):
diff --git a/doc/plustek/Plustek-PARPORT.txt b/doc/plustek/Plustek-PARPORT.txt
index 333c2d8..e5b6097 100644
--- a/doc/plustek/Plustek-PARPORT.txt
+++ b/doc/plustek/Plustek-PARPORT.txt
@@ -1,4 +1,4 @@
-Plustek-PARPRORT.txt (2004-03-28) Gerhard Jäger <gerhard@gjaeger.de>
+Plustek-PARPRORT.txt (2004-03-28) Gerhard Jäger <gerhard@gjaeger.de>
====================================================================
diff --git a/doc/plustek/Plustek-USB.txt b/doc/plustek/Plustek-USB.txt
index 89dfecf..e1ee793 100644
--- a/doc/plustek/Plustek-USB.txt
+++ b/doc/plustek/Plustek-USB.txt
@@ -1,4 +1,4 @@
-Plustek-USB.txt (2005-08-08) Gerhard Jäger <gerhard@gjaeger.de>
+Plustek-USB.txt (2005-08-08) Gerhard Jäger <gerhard@gjaeger.de>
===============================================================
NOTE:
diff --git a/doc/u12/U12.changes b/doc/u12/U12.changes
index b13cf27..b6d008f 100644
--- a/doc/u12/U12.changes
+++ b/doc/u12/U12.changes
@@ -1,4 +1,4 @@
-U12.changes - Gerhard Jäger <gerhard@gjaeger.de>
+U12.changes - Gerhard Jäger <gerhard@gjaeger.de>
================================================
V 0.01-1 (2004-09-01)
diff --git a/doc/u12/U12.todo b/doc/u12/U12.todo
index 5eea402..f10216e 100644
--- a/doc/u12/U12.todo
+++ b/doc/u12/U12.todo
@@ -1,4 +1,4 @@
-U12.todo (2004-19-01) Gerhard Jäger <gerhard@gjaeger.de>
+U12.todo (2004-19-01) Gerhard Jäger <gerhard@gjaeger.de>
=========================================================
OPEN:
diff --git a/doc/umax/sane-umax-parport-doc.html b/doc/umax/sane-umax-parport-doc.html
index 330b7d6..5dd9f04 100644
--- a/doc/umax/sane-umax-parport-doc.html
+++ b/doc/umax/sane-umax-parport-doc.html
@@ -78,7 +78,7 @@ backend that provides acces to several UMAX-SCSI-scanners.
But there is an experimental
<a href="http://umax1220p.sourceforge.net">parallel port driver for UMAX scanners</a>.
<br>
-Don´t ask me about that driver - I do not know anything about this driver!
+Don't ask me about that driver - I do not know anything about this driver!
</blockquote>
</td>
--
1.7.4

49
sane-backends-1.0.22-epson-stylus-sx125.patch
View File

@ -1,49 +0,0 @@
From 8a662d1b7949cf4aba35ae39b404ce06141fea51 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Fri, 16 Sep 2011 13:18:10 +0200
Subject: [PATCH] patch: epson-stylus-sx125
Squashed commit of the following:
commit 77cf6ab6058cdb539c8c6bb8cd447a1233a4e7f6
Author: Nils Philippsen <nils@redhat.com>
Date: Fri Sep 16 13:12:30 2011 +0200
epson2: add USB id for Epson Stylus SX125
---
backend/epson_usb.c | 1 +
doc/descriptions/epson2.desc | 6 ++++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/backend/epson_usb.c b/backend/epson_usb.c
index be80326..848ef63 100644
--- a/backend/epson_usb.c
+++ b/backend/epson_usb.c
@@ -81,6 +81,7 @@ SANE_Word sanei_epson_usb_product_ids[] = {
0x851, /* Stylus NX410 Series, Stylus SX410 Series, Stylus TX410 Series */
0x854, /* ME OFFICE 650FN Series, Stylus Office BX310FN Series, Stylus Office TX510FN Series, WorkForce 310 Series */
0x856, /* PX-502A, Stylus NX510 Series, Stylus SX510W Series, Stylus TX550W Series */
+ 0x85c, /* Stylus SX125 */
0 /* last entry - this is used for devices that are specified
in the config file as "usb <vendor> <product>" */
};
diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
index da3bdd9..8451afa 100644
--- a/doc/descriptions/epson2.desc
+++ b/doc/descriptions/epson2.desc
@@ -1875,6 +1875,12 @@
:status :good
:comment "all-in-one<br>overseas version of the PX-402A"
+:model "Stylus SX125"
+:interface "USB"
+:usbid "0x04b8" "0x085c"
+:status :untested
+:comment "all-in-one"
+
:model "Stylus SX200"
:interface "USB"
:usbid "0x04b8" "0x0849"
--
1.7.6.1

43
sane-backends-1.0.22-man-encoding.patch
View File

@ -1,43 +0,0 @@
From 50bce37120e3a1f448e62dd88b0b8cce1f36d35b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 16 Mar 2011 10:59:09 +0100
Subject: [PATCH] patch: man-encoding
Squashed commit of the following:
commit 54a279b424c39c0ab658acacb5e2c861b6f291a0
Author: Nils Philippsen <nils@redhat.com>
Date: Wed Mar 16 10:52:45 2011 +0100
don't use ISO-8859-1 encoding in man pages
---
doc/sane-hpljm1005.man | 2 +-
doc/sane-p5.man | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/sane-hpljm1005.man b/doc/sane-hpljm1005.man
index af6588f..ff1006a 100644
--- a/doc/sane-hpljm1005.man
+++ b/doc/sane-hpljm1005.man
@@ -34,4 +34,4 @@ support dynamic loading).
.BR sane\-usb (5),
.SH AUTHOR
-Philippe Rétornaz <couriousous@mandriva.org>
+Philippe R\['e]tornaz <couriousous@mandriva.org>
diff --git a/doc/sane-p5.man b/doc/sane-p5.man
index b5ecbba..860a019 100644
--- a/doc/sane-p5.man
+++ b/doc/sane-p5.man
@@ -133,7 +133,7 @@ St\['e]phane Voltz <stef.dev@free.fr>
.SH "CREDITS"
Support for the Prima PagePartner has been made possible thank to an hardware donation
-by Sébastien Lange.
+by S\['e]bastien Lange.
.SH "BUG REPORTS"
If something doesn't work mail sane-devel@lists.alioth.debian.org or use the bug
--
1.7.4

109
sane-backends-1.0.22-pkgconfig.patch
View File

@ -1,109 +0,0 @@
From 62b327a3a6a289ef3b89d6cfe239a9008a0303c3 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Fri, 16 Sep 2011 12:23:57 +0200
Subject: [PATCH] patch: pkgconfig
Squashed commit of the following:
commit 8232a5fdf931da4b1adfade313c17c9cd118790d
Author: Nils Philippsen <nils@redhat.com>
Date: Fri Sep 16 12:18:06 2011 +0200
use pkg-config in sane-config
As we require pkg-config anyway, simply let sane-config use it to make
it compatible with multilib systems. Previously, sane-config contained
paths which were different on e.g. x86_64 and i386 which made the 64 and
32 bit versions conflict if installed in parallel.
---
tools/sane-config.in | 49 +++++++------------------------------------------
1 files changed, 7 insertions(+), 42 deletions(-)
diff --git a/tools/sane-config.in b/tools/sane-config.in
index 22c02b5..1fae2e5 100644
--- a/tools/sane-config.in
+++ b/tools/sane-config.in
@@ -7,31 +7,10 @@
PACKAGE="@PACKAGE@"
scriptname="sane-config"
-LINKER_RPATH="@LINKER_RPATH@"
-
prefix="@prefix@"
exec_prefix="@exec_prefix@"
-LDFLAGS="@LDFLAGS@ @GPHOTO2_LDFLAGS@"
-LIBS="@LIBS@ @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @AVAHI_LIBS@ @USB_LIBS@ @SCSI_LIBS@ @RESMGR_LIBS@"
-pkgincludedir="@pkgincludedir@"
-pkglibdir="@pkglibdir@"
-includedir="@includedir@"
-mandir="@mandir@"
-infodir="@infodir@"
-libdir="@libdir@"
-localstatedir="@localstatedir@"
-sysconfdir="@sysconfdir@"
-datarootdir="@datarootdir@"
-datadir="@datadir@"
-libexecdir="@libexecdir@"
-sbindir="@sbindir@"
-bindir="@bindir@"
-#${prefix}
-#exec_prefix_set=no
-srcdir="@srcdir@"
-top_srcdir="@top_srcdir@"
-cflags=
+pkgconfig_package=sane-backends
usage ()
{
@@ -60,7 +39,7 @@ if test $# -gt 0; then
if test $# -eq 1; then
usage
elif test $# -eq 2; then
- case $2 in
+ case $2 in
--cflags)
echo "Usage: $0 --cflags"
echo " Print C compiler flags for compiling code that uses SANE."
@@ -85,33 +64,19 @@ if test $# -gt 0; then
exit 1
;;
--ldflags)
-
- if test -z "$LINKER_RPATH"; then
- echo "-L${libdir} @LDFLAGS@"
- else
- echo "-L${libdir} @LDFLAGS@ ${LINKER_RPATH}${libdir}"
- fi
+ pkg-config --libs-only-L "$pkgconfig_package"
;;
--libs)
- echo "-lsane ${LIBS}"
+ pkg-config --libs "$pkgconfig_package"
;;
--cflags)
- unique_cflags=
- if test "${includedir}" != "/usr/include"; then
- unique_cflags="${unique_cflags} -I${includedir}"
- fi
- for i in $cflags; do
- if test "${i}" != "-I${includedir}"; then
- unique_cflags="${unique_cflags} $i"
- fi
- done
- echo ${unique_cflags}
+ pkg-config --cflags "$pkgconfig_package"
;;
--prefix)
- echo ${prefix}
+ echo "${prefix}"
;;
--exec-prefix)
- echo ${exec_prefix}
+ echo "${exec_prefix}"
;;
*)
usage
--
1.7.6.1

71
sane-backends-1.0.22-udev.patch
View File

@ -1,71 +0,0 @@
From 89ca3fb1306f5e809c94c9d059b3c39b4fe50ec8 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Mon, 14 Mar 2011 17:15:20 +0100
Subject: [PATCH] patch: udev
Squashed commit of the following:
commit cad1db5c3a1f735e2425655db6005d2b05169288
Author: Nils Philippsen <nils@redhat.com>
Date: Mon Mar 14 17:07:32 2011 +0100
adapt generated udev rules for Fedora
---
tools/sane-desc.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
index ad3a134..fea2f6b 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
@@ -3525,20 +3525,20 @@ print_udev (void)
}
}
printf ("\n");
- printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
- usbid->usb_vendor_id + 2, usbid->usb_product_id + 2, DEVMODE, DEVGROUP);
+ printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n",
+ usbid->usb_vendor_id + 2, usbid->usb_product_id + 2);
usbid = usbid->next;
}
printf("\n# The following rule will disable USB autosuspend for the device\n");
- printf("ENV{libsane_matched}==\"yes\", RUN+=\"/bin/sh -c 'test -e /sys/$env{DEVPATH}/power/level && echo on > /sys/$env{DEVPATH}/power/level'\"\n");
+ printf("ENV{libsane_matched}==\"yes\", TEST==\"power/level\", ATTR{power/level}=\"on\"\n");
printf ("\nLABEL=\"libsane_usb_rules_end\"\n\n");
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]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\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)
@@ -3571,8 +3571,8 @@ print_udev (void)
}
}
printf ("\n");
- printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\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");
--
1.7.4

64
sane-backends-1.0.22-v4l.patch
View File

@ -1,64 +0,0 @@
From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Mon, 14 Mar 2011 13:35:05 +0100
Subject: [PATCH] patch: v4l
Squashed commit of the following:
commit 23381932c76846191b42a48e505b37cd74711265
Author: Julien BLACHE <jb@jblache.org>
Date: Wed Feb 16 19:37:43 2011 +0100
Fix v4l build with libv4l 0.8.3+
(cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
Conflicts:
ChangeLog
Signed-off-by: Nils Philippsen <nils@redhat.com>
---
backend/v4l.c | 3 +--
backend/v4l.h | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/backend/v4l.c b/backend/v4l.c
index 6510ef0..38595ed 100644
--- a/backend/v4l.c
+++ b/backend/v4l.c
@@ -84,9 +84,8 @@
#include "../include/sane/sanei_config.h"
#define V4L_CONFIG_FILE "v4l.conf"
-#include "v4l.h"
-
#include <libv4l1.h>
+#include "v4l.h"
static const SANE_Device **devlist = NULL;
static int num_devices;
diff --git a/backend/v4l.h b/backend/v4l.h
index 588b96e..6aee586 100644
--- a/backend/v4l.h
+++ b/backend/v4l.h
@@ -29,6 +29,7 @@
#ifndef v4l_h
#define v4l_h
+#ifndef __LINUX_VIDEODEV_H
/* Kernel interface */
/* Only the stuff we need. For more features, more defines are needed */
@@ -165,7 +166,7 @@ struct video_channel
/* end of kernel interface */
-
+#endif /* !__LINUX_VIDEODEV_H */
#include <../include/sane/sane.h>
--
1.7.4

81
sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch
View File

@ -1,81 +0,0 @@
From 9792fb4ac11443553771d4f311a985333b503594 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Tue, 10 May 2011 10:22:02 +0200
Subject: [PATCH] patch: xerox_mfp-fix-usb-devices
Squashed commit of the following:
commit 962a5a657b750f99b274d58763667bd199f5cb5d
Author: Alex Belkin <abc@telekom.ru>
Date: Tue Mar 8 17:57:19 2011 +0300
keep usb device by default (correct for bug introduced by tcp sub-backend
(cherry picked from commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7)
---
backend/xerox_mfp.c | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
index e08b50f..d4672a7 100644
--- a/backend/xerox_mfp.c
+++ b/backend/xerox_mfp.c
@@ -37,10 +37,10 @@
static const SANE_Device **devlist = NULL; /* sane_get_devices array */
static struct device *devices_head = NULL; /* sane_get_devices list */
-transport available_transports[] = {
+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
+transport available_transports[TRANSPORTS_MAX] = {
{ "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
{ "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
- { 0 }
};
static int resolv_state(int state)
@@ -824,7 +824,13 @@ free_devices (void)
devices_head = NULL;
}
-/* SANE API ignores return code of this callback */
+static transport *tr_from_devname(SANE_String_Const devname)
+{
+ if (strncmp("tcp", devname, 3) == 0)
+ return &available_transports[TRANSPORT_TCP];
+ return &available_transports[TRANSPORT_USB];
+}
+
static SANE_Status
list_one_device (SANE_String_Const devname)
{
@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
return SANE_STATUS_GOOD;
}
- for (tr = available_transports; tr->ttype; tr++) {
- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
- break;
- }
- if (!tr->ttype)
- return SANE_STATUS_INVAL;
+ tr = tr_from_devname(devname);
dev = calloc (1, sizeof (struct device));
if (dev == NULL)
@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
static SANE_Status
list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
{
- transport *tr;
-
- for (tr = available_transports; tr->ttype; tr++) {
- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
- return tr->configure_device(devname, list_one_device);
- }
- return SANE_STATUS_INVAL;
+ return tr_from_devname(devname)->configure_device(devname, list_one_device);
}
SANE_Status
--
1.7.5.1

42
sane-backends-1.0.23-udev.patch Normal file
View File

@ -0,0 +1,42 @@
commit 2fd4ea713546ef0cb9f67ee7853e9b1d01f64071
Author: Nils Philippsen <nils@redhat.com>
AuthorDate: Fri Aug 31 15:54:01 2012 +0200
Commit: Nils Philippsen <nils@redhat.com>
CommitDate: Fri Aug 31 15:54:01 2012 +0200
patch: udev
Squashed commit of the following:
commit 99a4a33bd297f5b475ac610cf2d51385893596b9
Author: Nils Philippsen <nils@redhat.com>
Date: Fri Aug 31 15:51:55 2012 +0200
adapt generated udev rules for Fedora
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
index 7bbd012..9447cb8 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
@@ -3543,7 +3543,8 @@ print_udev (void)
}
printf("\n# The following rule will disable USB autosuspend for the device\n");
- printf("ENV{libsane_matched}==\"yes\", RUN+=\"/bin/sh -c 'if test -e /sys/$env{DEVPATH}/power/control; then echo on > /sys/$env{DEVPATH}/power/control; elif test -e /sys/$env{DEVPATH}/power/level; then echo on > /sys/$env{DEVPATH}/power/level; fi'\"\n");
+ printf("ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n");
+ printf("ENV{libsane_matched}==\"yes\", TEST!=\"power/control\", TEST==\"power/level\", ATTR{power/level}=\"on\"\n");
printf ("\nLABEL=\"libsane_usb_rules_end\"\n\n");

49
sane-backends.spec
View File

@ -7,8 +7,8 @@
Summary: Scanner access software
Name: sane-backends
Version: 1.0.22
Release: 13%{?dist}
Version: 1.0.23
Release: 1%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain
# see LICENSE for details
@ -16,30 +16,14 @@ License: GPLv2+ and GPLv2+ with exceptions and Public Domain
Group: System Environment/Libraries
Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
Source1: sane.png
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313038
Patch0: sane-backends-1.0.22-pkgconfig.patch
# Fedora-specific, not generally applicable:
Patch1: sane-backends-1.0.22-udev.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313039
Patch2: sane-backends-1.0.22-man-encoding.patch
Patch0: sane-backends-1.0.23-udev.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313040
Patch3: sane-backends-1.0.21-epson-expression800.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313042
Patch4: sane-backends-1.0.22-docs-utf8.patch
Patch1: sane-backends-1.0.21-epson-expression800.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313043
Patch5: sane-backends-1.0.21-SCX4500W.patch
# backported from upstream c5ca46c2d1be78c651afb843cc834cf2b5b24953
Patch6: sane-backends-1.0.22-v4l.patch
# backported from upstream 5ea227caeacd504b64eef301e83fa63e0a25b3f7
Patch7: sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch
# backported from upstream 058f423a302e12196028f218dcb2eca7cc8a250a
Patch8: sane-backends-1.0.22-epson-stylus-sx125.patch
# submitted upstream: c648a4411e5eacf19da2de726dac06ec07dae302
Patch9: sane-backends-1.0.22-av220-gray-modes.patch
# backported from upstream: cef28b4d46a0faa4d4acb60d815ac9a49036ba85
Patch10: sane-backends-1.0.22-Lexmark-X1100.patch
# backported from upstream: 33bb529c5f8ca013fb499addc14c7fb229203ea8
Patch11: sane-backends-1.0.22-avision-init-devices.patch
Patch2: sane-backends-1.0.21-SCX4500W.patch
URL: http://www.sane-project.org
BuildRequires: tetex-latex
@ -119,18 +103,9 @@ This package contains backend drivers to access digital cameras through SANE.
%prep
%setup -q
%patch0 -p1 -b .pkgconfig
%patch1 -p1 -b .udev
%patch2 -p1 -b .man-encoding
%patch3 -p1 -b .epson-expression800
%patch4 -p1 -b .docs-utf8
%patch5 -p1 -b .SCX4500W
%patch6 -p1 -b .v4l
%patch7 -p1 -b .xerox_mfp-fix-usb-devices
%patch8 -p1 -b .epson-stylus-sx125
%patch9 -p1 -b .av220-gray-modes
%patch10 -p1 -b .Lexmark-X1100
%patch11 -p1 -b .avision-init-devices
%patch0 -p1 -b .udev
%patch1 -p1 -b .epson-expression800
%patch2 -p1 -b .SCX4500W
%build
# use PIC/PIE because SANE-enabled software is likely to deal with data coming
@ -206,6 +181,10 @@ install -m 0644 tools/sane-backends.pc %{buildroot}%{_libdir}/pkgconfig/
%{_libdir}/sane/*gphoto2.so.*
%changelog
* Fri Aug 31 2012 Nils Philippsen <nils@redhat.com> - 1.0.23-1
- version 1.0.23
- update udev patch, remove obsolete patches
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.22-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
fadf56a60f4776bfb24491f66b617cf5 sane-backends-1.0.22.tar.gz
e226a89c54173efea80e91e9a5eb6573 sane-backends-1.0.23.tar.gz