rpm/sane-backends
SHA256
1
0
Fork 0
forked from pool/sane-backends
Code Pull Requests Activity

Accepting request 61503 from graphics

Browse Source 
Accepted submit request 61503 from user jsmeix

OBS-URL: https://build.opensuse.org/request/show/61503
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=53
This commit is contained in:
Ruediger Oertel 2011-02-18 11:32:10 +00:00 committed by Git OBS Bridge
commit 16fb926c52
10 changed files with 1757 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
canon-backend-autoprobing.patch
View File

@ -1,17 +0,0 @@
--- backend/canon.conf.in.save 2006-07-21 09:43:08.000000000 +0200
+++ backend/canon.conf.in 2006-07-21 09:57:03.000000000 +0200
@@ -1,3 +1,12 @@
-#canon.conf
-/dev/scanner
+# canon.conf
+#
+# Activate exactly one of the following choices:
+#
+# Probe on all /dev/sg* devices:
+scsi
+#
+# Probe for "CANON" on all /dev/sg* devices:
+#scsi CANON
+#
+# Probe only on one fixed device:
#/dev/sg0

47
epkowa.desc
View File

@ -212,6 +212,13 @@
:status :good
:comment "100Base-TX/10Base-T unsupported<br>IEEE1394 untested"
:model "ES-D200"
:interface "USB"
:usbid "0x04b8" "0x0137"
:status :good
:comment "requires DFSG non-free esci-interpreter-gt-s80"
:url "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
:model "ES-D400"
:interface "USB"
:usbid "0x04b8" "0x0136"
@ -572,6 +579,13 @@
:comment "requires DFSG non-free esci-interpreter-gt-f720<br>GT-S620 with TPU"
:url "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
:model "GT-F730"
:interface "USB"
:usbid "0x04b8" "0x0142"
:status :good
:comment "requires DFSG non-free esci-interpreter-perfection-v330<br>GT-S630 with TPU"
:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
:model "GT-S50"
:interface "USB"
:usbid "0x04b8" "0x0137"
@ -600,6 +614,13 @@
:comment "requires DFSG non-free esci-interpreter-gt-f720"
:url "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do"
:model "GT-S630"
:interface "USB"
:usbid "0x04b8" "0x0142"
:status :good
:comment "requires DFSG non-free esci-interpreter-perfection-v330"
:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
:model "GT-X700" ; product spec (JP)
:interface "USB"
:usbid "0x04b8" "0x0128"
@ -1058,42 +1079,56 @@
:comment "requires DFSG non-free esci-interpreter-gt-f720<br>overseas version of the GT-S620"
:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
:model "Perfection V100 PHOTO"
:model "Perfection V33"
:interface "USB"
:usbid "0x04b8" "0x0142"
:status :good
:comment "requires DFSG non-free esci-interpreter-perfection-v330<br>overseas version of the GT-S630"
:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
:model "Perfection V100 Photo"
:interface "USB"
:usbid "0x04b8" "0x012d"
:status :good
:comment "requires DFSG non-free iscan-plugin-gt-s600<br>overseas version of the GT-F650"
:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
:model "Perfection V200 PHOTO"
:model "Perfection V200 Photo"
:interface "USB"
:usbid "0x04b8" "0x012e"
:status :good
:comment "requires DFSG non-free iscan-plugin-gt-f670<br>overseas version of the GT-F670"
:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
:model "Perfection V300 PHOTO"
:model "Perfection V300 Photo"
:interface "USB"
:usbid "0x04b8" "0x0131"
:status :good
:comment "requires DFSG non-free esci-interpreter-gt-f720<br>overseas version of the GT-F720"
:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
:model "Perfection V350 PHOTO"
:model "Perfection V330 Photo"
:interface "USB"
:usbid "0x04b8" "0x0142"
:status :good
:comment "requires DFSG non-free esci-interpreter-perfection-v330<br>overseas version of the GT-F730"
:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
:model "Perfection V350 Photo"
:interface "USB"
:usbid "0x04b8" "0x012f"
:status :good
:comment "requires DFSG non-free iscan-plugin-gt-f700<br>overseas version of the GT-F700"
:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
:model "Perfection V500 PHOTO"
:model "Perfection V500 Photo"
:interface "USB"
:usbid "0x04b8" "0x0130"
:status :good
:comment "requires DFSG non-free iscan-plugin-gt-x770<br>overseas version of the GT-X770"
:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do"
:model "Perfection V600 PHOTO"
:model "Perfection V600 Photo"
:interface "USB"
:usbid "0x04b8" "0x013a"
:status :good

11
fix-genesys-create_range-type.patch
View File

@ -1,11 +0,0 @@
--- backend/genesys.c.orig 2010-04-05 15:18:04.000000000 +0200
+++ backend/genesys.c 2010-05-07 13:06:07.000000000 +0200
@@ -5436,7 +5436,7 @@ init_gamma_vector_option (Genesys_Scanne
* @param size maximum size of the range
* @return a poiter to a valid range or NULL
*/
-static create_range(SANE_Fixed size)
+static SANE_Range *create_range(SANE_Fixed size)
{
SANE_Range *range=NULL;

10
fix-xerox_mfp-color-mode.patch
View File

@ -1,10 +0,0 @@
--- backend/xerox_mfp.c.orig 2010-04-05 15:18:05.000000000 +0200
+++ backend/xerox_mfp.c 2010-12-09 11:13:16.000000000 +0100
@@ -386,6 +386,7 @@ static int doc_source_to_code[] = {
static SANE_String_Const scan_modes[] = {
SANE_VALUE_SCAN_MODE_LINEART,
+ SANE_VALUE_SCAN_MODE_HALFTONE,
SANE_VALUE_SCAN_MODE_GRAY,
SANE_VALUE_SCAN_MODE_COLOR,
NULL

1894
models.dat
View File

File diff suppressed because it is too large Load Diff

129
sane-backends-1.0.21-i18n.patch
View File

@ -1,129 +0,0 @@
diff -Nur sane-backends-1.0.21/po/LINGUAS sane-backends-1.0.21.mod/po/LINGUAS
--- sane-backends-1.0.21/po/LINGUAS 1969-12-31 19:00:00.000000000 -0500
+++ sane-backends-1.0.21.mod/po/LINGUAS 2010-04-27 03:38:23.000000000 -0400
@@ -0,0 +1,21 @@
+# List of languages
+# try to keep this list ordered
+bg
+cs
+da
+de
+en_GB
+eo
+es
+fi
+fr
+gl
+it
+ja
+nb
+nl
+pl
+pt
+ru
+sv
+uk
diff -Nur sane-backends-1.0.21/po/POTFILES sane-backends-1.0.21.mod/po/POTFILES
--- sane-backends-1.0.21/po/POTFILES 1969-12-31 19:00:00.000000000 -0500
+++ sane-backends-1.0.21.mod/po/POTFILES 2010-04-27 03:38:16.000000000 -0400
@@ -0,0 +1,100 @@
+# List of source files containing translatable strings
+# paths relative to po
+../include/sane/saneopts.h
+../backend/sane_strstatus.c
+
+../backend/artec_eplus48u.c
+
+../backend/avision.h
+
+../backend/canon630u.c
+../backend/canon.c
+../backend/canon-sane.c
+
+../backend/canon_dr.c
+../backend/canon_dr.h
+
+../backend/cardscan.c
+../backend/cardscan.h
+
+../backend/epjitsu.c
+../backend/epjitsu.h
+
+../backend/epson.c
+../backend/epson.h
+../backend/epson2.c
+../backend/epson2.h
+
+../backend/fujitsu.c
+../backend/fujitsu.h
+
+../backend/genesys.c
+
+../backend/kodak.c
+../backend/kodak.h
+
+../backend/gt68xx.c
+../backend/gt68xx_low.h
+
+../backend/hp3500.c
+../backend/hp3900_sane.c
+../backend/hp5400_sane.c
+../backend/hp5590.c
+../backend/hp-option.c
+../backend/hp-option.h
+
+../backend/leo.c
+../backend/leo.h
+
+../backend/lexmark.c
+
+../backend/ma1509.c
+
+../backend/matsushita.c
+../backend/matsushita.h
+
+../backend/microtek2.c
+../backend/microtek2.h
+
+../backend/mustek.c
+../backend/mustek_usb.c
+../backend/mustek_usb2.c
+
+../backend/niash.c
+
+../backend/pixma.c
+../backend/pixma_sane_options.c
+
+../backend/plustek.c
+../backend/plustek_pp.c
+
+../backend/pnm.c
+
+../backend/rts8891.c
+
+../backend/sceptre.c
+../backend/sceptre.h
+
+../backend/sm3840.c
+
+../backend/snapscan.c
+../backend/snapscan-options.c
+
+../backend/stv680.c
+../backend/stv680.h
+
+../backend/teco1.c
+../backend/teco1.h
+../backend/teco2.c
+../backend/teco2.h
+../backend/teco3.c
+../backend/teco3.h
+
+../backend/test.c
+
+../backend/u12.c
+
+../backend/umax1220u.c
+../backend/umax.c
+../backend/umax_pp.c
+

3
sane-backends-1.0.21.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:042428a962f43562b7f1d31948ab0b14a7eec55373ccb7b5b174fa1d8d7275a2
size 3911050

3
sane-backends-1.0.22.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21830b6a0c315fef423ad8b7e96bfacff462085f49d43863e2e7139e242e535c
size 4065208

35
sane-backends.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Wed Feb 16 15:31:21 CET 2011 - jsmeix@suse.de
- Upgraded to sane-backends version 1.0.22:
New backends:
kvs20xx (Panasonic KV-S20xx), magicolor (Konica-Minolta).
Significant enhancements to several backends.
More than 80 new scanner models supported.
Support many more networked scanners.
Added -A option to scanimage.
Improved build system.
Improved USB support.
Improved udev rules.
Documentation updates.
Bugfixes.
Note:
This is one more release of the SANE 1.0 series, compare
the below entry dated "Thu Feb 28 13:56:15 CET 2008".
- sane-backends-1.0.21-i18n.patch,
fix-genesys-create_range-type.patch,
fix-xerox_mfp-color-mode.patch, and
canon-backend-autoprobing.patch are obsolete since
sane-backends-1.0.22 because it is fixed in the source.
- Adapted how we derive our libsane.rules file from the
generated one which uses now "ATTRS" (instead of "SYSFS"),
see the below entry dated "Tue Oct 21 13:12:42 CEST 2008".
- Updated models.dat to the one from the current HPLIP 3.11.1.
- Added only those new models from epkowa.desc in the
sane-backends 1.0.22 sources which 'requires DFSG non-free'
plugin software to our epkowa.desc source file so that the
supported models in our epkowa.desc source file still match
to what is supported by our iscan-free package but more users
of models which require the proprietary software from Avasys
will be informed via yast2-scanner.
-------------------------------------------------------------------
Thu Dec 9 11:48:58 CET 2010 - jsmeix@suse.de

43
sane-backends.spec
View File

@ -20,7 +20,6 @@
Name: sane-backends
BuildRequires: libgphoto2-devel libjpeg-devel net-snmp-devel pkg-config texlive-latex
%if 0%{?suse_version} > 1130
BuildRequires: libieee1284-devel
%else
@ -30,7 +29,7 @@ License: GPLv2 ; GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware
Group: Hardware/Scanner
AutoReqProv: on
Summary: SANE (Scanner Access Now Easy) Scanner Drivers
Version: 1.0.21
Version: 1.0.22
Release: 8
Url: http://www.sane-project.org/
# URL for Source0: https://alioth.debian.org/frs/download.php/3258/sane-backends-1.0.21.tar.gz
@ -123,19 +122,19 @@ Patch10: fix-mustek_pp_ccd300.c.patch
# Patch14 is an upstream patch which adds two files required to build translations
# which are missing in the upstream sane-backends-1.0.21 source tar ball.
# URL for Patch14: https://alioth.debian.org/frs/download.php/3261/sane-backends-1.0.21-i18n.patch
Patch14: sane-backends-1.0.21-i18n.patch
# Patch14 is obsolete since sane-backends-1.0.22 because it is fixed in the source.
# Patch15 fix-genesys-create_range-type.patch lets in genesys.c the create_range function
# be of type 'SANE_Range *' to fix 'assignment makes pointer from integer' bugs
# wherever the create_range function is called
# see https://alioth.debian.org/tracker/index.php?func=detail&aid=312492&group_id=30186&atid=410366
Patch15: fix-genesys-create_range-type.patch
# which is obsolete since sane-backends-1.0.22 because it is fixed in the source.
# Patch16 fix-xerox_mfp-color-mode.patch adds SANE_VALUE_SCAN_MODE_HALFTONE in xerox_mfp.c
# to fix a regression in sane-backends-1.0.21 where the xerox_mfp works only in grayscale mode
# see https://bugzilla.novell.com/show_bug.cgi?id=658017
Patch16: fix-xerox_mfp-color-mode.patch
# which is obsolete since sane-backends-1.0.22 because it is fixed in the source.
# Patch100... is SUSE specific stuff:
# Patch100 lets the "canon" backend do scanner auto-recognition:
Patch100: canon-backend-autoprobing.patch
# Patch100 canon-backend-autoprobing.patch lets the "canon" backend do scanner auto-recognition
# which is obsolete since sane-backends-1.0.22 because it is fixed in the source.
# Patch102 builds libsane-* modules as libtool modules:
# SANE backends (i.e. driver modules) are regular shared libraries.
# Nothing is linked directly with a /usr/lib/sane/libsane-<driver>.so module.
@ -164,11 +163,12 @@ PreReq: coreutils, /bin/sed, /bin/grep
%ifarch ppc64
Obsoletes: sane-64bit
%endif
#
# Suse Linux and openSUSE have the package name 'sane' for 'sane-backends'.
# Therefore this RPM provides 'sane' and it also obsoletes it:
Provides: sane
Obsoletes: sane
# Up to SLE10 there was the package name 'sane' for 'sane-backends'.
# Therefore this RPM provides 'sane' and it also obsoletes it.
# The %{version} s needed in both Provides and Obsoletes
# to avoid a RPMLINT warning that the package obsoletes itself:
Provides: sane = %{version}
Obsoletes: sane < %{version}
# Skip testing devel dependencies required by libtool .la files by the following comment:
# skip-check-libtool-deps
@ -336,9 +336,6 @@ Authors:
%prep
%setup -q
# Apply upstream patches first of all:
# Patch14 is an upstream patch for sane-backends-1.0.21
# which adds two files required to build translations:
%patch14 -p1
# Then apply non-upstream patches:
# Patch2 fixes too small arrays in backend/niash.c:
%patch2
@ -346,13 +343,7 @@ Authors:
%patch8
# Patch10 fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c:
%patch10
# Patch15 lets in genesys.c the create_range function be of type 'SANE_Range *':
%patch15
# Patch16 adds SANE_VALUE_SCAN_MODE_HALFTONE in xerox_mfp.c:
%patch16
# Patch100... is SUSE specific stuff:
# Patch100 lets the "canon" backend do scanner auto-recognition:
%patch100
# Patch103 installs tools/umax_pp as /usr/bin/umax_pp:
%patch103
# Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am
@ -546,12 +537,13 @@ install -m644 autoconfig.rules %{buildroot}%{_sysconfdir}/udev/rules.d/56-sane-b
# should usually require the same kind of security.
# Regarding SUBSYSTEM=="usb" see the Novell/Suse Bugzilla bug
# https://bugzilla.novell.com/show_bug.cgi?id=294161#c11
# Regarding SYSFS{} versus ATTR{} see the Novell/Suse Bugzilla bug
# Regarding SYSFS{} or ATTRS{} versus ATTR{} see the Novell/Suse Bugzilla bug
# https://bugzilla.novell.com/show_bug.cgi?id=436085#c0
# Disable all ENV{DEVTYPE} lines because we (Suse/Novell) do not need them.
sed -i -e 's/GROUP="scanner"/GROUP="lp"/' tools/udev/libsane.rules
sed -i -e '/^SUBSYSTEM/s/"usb_device"/"usb"/' tools/udev/libsane.rules
sed -i -e 's/SYSFS/ATTR/g' tools/udev/libsane.rules
sed -i -e 's/ATTRS/ATTR/g' tools/udev/libsane.rules
sed -i -e 's/^ENV{DEVTYPE}/# ENV{DEVTYPE}/' tools/udev/libsane.rules
# Disable entries for USB scanners which are "unsupported"
# but keep the entries for models for which the support status
@ -574,12 +566,15 @@ sed -i -e 's/^ENV{DEVTYPE}/# ENV{DEVTYPE}/' tools/udev/libsane.rules
# see https://bugzilla.novell.com/show_bug.cgi?id=439193#c6
cat /dev/null >unsupportedUSBIDs
for USBID in $( grep '||[^|]*|0x[0-9A-Fa-f][0-9A-Fa-f]*:0x[0-9A-Fa-f][0-9A-Fa-f]*|unsupported|' scanner.database | cut -s -d '|' -f 7 | sort -f -u )
do grep -o "|$USBID|.*|" scanner.database | egrep -q 'complete|good|basic|minimal|untested' || echo $USBID >>unsupportedUSBIDs
do grep -o "|$USBID|.*|" scanner.database | grep -E -q 'complete|good|basic|minimal|untested' || echo $USBID >>unsupportedUSBIDs
done
# Ignore case when using sed to avoid possible problems
# with upper case letters in the USB IDs:
for m in $( sed -e 's/0x/./ig' -e 's/:/.,.ATTR.idProduct.==/' unsupportedUSBIDs )
do sed -i -e "/^ATTR.idVendor.==$m/Is/^ATTR/# ATTR/" tools/udev/libsane.rules
do if grep -q "^ATTR.idVendor.==$m" tools/udev/libsane.rules
then echo "Disabling unsupported model matching ATTR.idVendor.==$m"
sed -i -e "/^ATTR.idVendor.==$m/Is/^ATTR/# ATTR/" tools/udev/libsane.rules
fi
done
# Newer udev versions complain about NAME="%k" usage with warning messages like
# 'udevd[1234]: NAME="%k" is superfluous and breaks kernel supplied names...'