pool/sane-backends
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updating link to change in openSUSE:Factory/sane-backends revision 36.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=6ee6f70abc6c2064df41cf57ecbb79a2
This commit is contained in:
OBS User buildservice-autocommit 2009-10-12 13:43:21 +00:00 committed by Git OBS Bridge
parent b1b228e9b4
commit 5ac7a6910c
3 changed files with 150 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
sane-backends-1.0.20-xerox_mfp.diff Normal file
View File

@ -0,0 +1,139 @@
backport post 1.0.20 xerox_mfp changes
Index: sane-backends-1.0.20/backend/xerox_mfp.conf.in
===================================================================
--- sane-backends-1.0.20.orig/backend/xerox_mfp.conf.in
+++ sane-backends-1.0.20/backend/xerox_mfp.conf.in
@@ -5,3 +5,25 @@ usb 0x413c 0x5124
#Xerox Phaser 6110MFP
usb 0x0924 0x3d5d
+
+#Samsung CLX-3170fn
+usb 0x04e8 0x342a
+
+#Samsung SCX-4200
+usb 0x04e8 0x341b
+
+#Samsung SCX4725-FN
+usb 0x04e8 0x341f
+
+#Samsung SCX-4500
+usb 0x04e8 0x3426
+
+# Samsung SCX-4500W
+usb 0x04e8 0x342b
+
+# Samsung SCX-4300
+usb 0x04e8 0x342e
+
+#Xerox WorkCentre 3119 Series
+usb 0x0924 0x4265
+
Index: sane-backends-1.0.20/doc/descriptions/xerox_mfp.desc
===================================================================
--- sane-backends-1.0.20.orig/doc/descriptions/xerox_mfp.desc
+++ sane-backends-1.0.20/doc/descriptions/xerox_mfp.desc
@@ -1,23 +1,25 @@
:backend "xerox_mfp"
-:version "1.0-9"
+:version "1.0-11"
:manpage "sane-xerox_mfp"
-:comment "Could be compatible with other Samsung manufactured devices"
:devicetype :scanner
-:new :yes
:mfg "Xerox"
:url "http://www.office.xerox.com/"
+:model "Phaser 6110MFP"
+:interface "USB"
+:usbid "0x0924" "0x3d5d"
+:status :good
+
:model "Phaser 3200MFP"
:interface "USB"
:usbid "0x0924" "0x3da4"
-:status :good
+:status :complete
:url "http://www.office.xerox.com/multifunction-printer/multifunction-under-30ppm/phaser-3200mfp/spec-enus.html"
-:comment "All features of device I know of"
-:model "Phaser 6110MFP"
+:model "WorkCentre 3119 Series"
:interface "USB"
-:usbid "0x0924" "0x3d5d"
+:usbid "0x0924" "0x4265"
:status :good
:mfg "Dell"
@@ -28,3 +30,30 @@
:usbid "0x413c" "0x5124"
:status :good
+:mfg "Samsung"
+:url "http://www.samsung.com"
+
+:model "SCX-4200"
+:interface "USB"
+:usbid "0x04e8" "0x341b"
+:status :good
+
+:model "SCX4725-FN"
+:interface "USB"
+:usbid "0x04e8" "0x341f"
+:status :good
+
+:model "SCX-4500"
+:interface "USB"
+:usbid "0x04e8" "0x3426"
+:status :good
+
+:model "CLX-3170fn"
+:interface "USB"
+:usbid "0x04e8" "0x342a"
+:status :good
+
+:model "SCX-4300"
+:interface "USB"
+:usbid "0x04e8" "0x342e"
+:status :good
Index: sane-backends-1.0.20/backend/xerox_mfp.c
===================================================================
--- sane-backends-1.0.20.orig/backend/xerox_mfp.c
+++ sane-backends-1.0.20/backend/xerox_mfp.c
@@ -26,7 +26,7 @@
#include <sane/sanei_backend.h>
#include "xerox_mfp.h"
-#define BACKEND_BUILD 10
+#define BACKEND_BUILD 11
#define XEROX_CONFIG_FILE "xerox_mfp.conf"
static const SANE_Device **devlist = NULL; /* sane_get_devices array */
@@ -802,7 +802,7 @@ sane_control_option (SANE_Handle h, SANE
}
DBG (4, "%s: %d, <%d> => %08x, %x\n", __FUNCTION__, opt, act,
- *(SANE_Word *)val, info? *info : 0);
+ val? *(SANE_Word *)val : 0, info? *info : 0);
return SANE_STATUS_GOOD;
}
@@ -1319,14 +1319,15 @@ sane_start (SANE_Handle h)
dev->reserved++;
}
- if (!dev_set_window(dev))
+ if (!dev_set_window(dev) ||
+ (dev->state && dev->state != SANE_STATUS_DEVICE_BUSY))
return dev_stop(dev);
if (!dev_cmd_wait(dev, CMD_OBJECT_POSITION))
return dev_stop(dev);
if (!dev_cmd(dev, CMD_READ) ||
- dev->state != SANE_STATUS_DEVICE_BUSY)
+ (dev->state && dev->state != SANE_STATUS_DEVICE_BUSY))
return dev_stop(dev);
dev->scanning = 1;

5
sane-backends.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 8 09:35:17 UTC 2009 - lnussel@suse.de
- backport xerox_mfp changes to support samsung printers
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 30 12:59:12 CEST 2009 - jsmeix@suse.de Wed Sep 30 12:59:12 CEST 2009 - jsmeix@suse.de

9
sane-backends.spec
View File

@ -20,12 +20,12 @@
Name: sane-backends Name: sane-backends
BuildRequires: libgphoto2-devel libieee1284 libjpeg-devel net-snmp-devel pkg-config texlive-latex BuildRequires: libgphoto2-devel libieee1284 libjpeg-devel net-snmp-devel pkg-config texlive-latex
License: GPL v2 only ; GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware License: GPL v2 only ; GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware
Group: Hardware/Scanner Group: Hardware/Scanner
AutoReqProv: on AutoReqProv: on
Summary: SANE (Scanner Access Now Easy) Scanner Drivers Summary: SANE (Scanner Access Now Easy) Scanner Drivers
Version: 1.0.20 Version: 1.0.20
Release: 6 Release: 7
Url: http://www.sane-project.org/ Url: http://www.sane-project.org/
# URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz # URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz
Source0: sane-backends-%{version}.tar.bz2 Source0: sane-backends-%{version}.tar.bz2
@ -122,6 +122,8 @@ Patch103: install-umax_pp-tool.patch
# Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am # Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am
# because it is intentionally removed from the sources in the prep section: # because it is intentionally removed from the sources in the prep section:
Patch104: no-descriptions-external-hpoj.patch Patch104: no-descriptions-external-hpoj.patch
# backport post 1.0.20 xerox_mfp changes. remove with next sane version
Patch105: sane-backends-1.0.20-xerox_mfp.diff
# Install into this non-root directory (required when norootforbuild is used): # Install into this non-root directory (required when norootforbuild is used):
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
# The postinstall script requires this: # The postinstall script requires this:
@ -255,7 +257,7 @@ Authors:
Wittawat Yamwong <wittawat@web.de> Wittawat Yamwong <wittawat@web.de>
%package autoconfig %package autoconfig
License: GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware License: GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware
Group: Hardware/Scanner Group: Hardware/Scanner
Summary: USB Scanner Autoconfiguration Summary: USB Scanner Autoconfiguration
Requires: sane-backends Requires: sane-backends
@ -324,6 +326,7 @@ Authors:
# Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am # Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am
# because it is intentionally removed from the sources in the prep section: # because it is intentionally removed from the sources in the prep section:
%patch104 %patch104
%patch105 -p1
# Source100... is SUSE specific stuff: # Source100... is SUSE specific stuff:
# Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc
# because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped. # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped.