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

Accepting request 209260 from home:jsmeix:branches:graphics

Browse Source 
Version upgrade to 1.0.24

OBS-URL: https://build.opensuse.org/request/show/209260
OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=74
This commit is contained in:
Johannes Meixner 2013-12-03 11:57:02 +00:00 committed by Git OBS Bridge
parent 36c74c156a
commit 6b1e6b0940
7 changed files with 962 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1422
adapt_epkowa.desc_for_yast2-scanner.patch
View File

File diff suppressed because it is too large Load Diff

15
fix-no-return-in-nonvoid-function.patch
View File

@ -1,15 +0,0 @@
--- backend/kodakaio.c.orig 2012-08-10 02:33:29.000000000 +0200
+++ backend/kodakaio.c 2012-10-16 15:53:59.000000000 +0200
@@ -666,8 +666,11 @@ kodakaio_net_read(struct KodakAio_Scanne
DBG(32, "net read %d bytes:%x,%x,%x,%x,%x,%x,%x,%x\n",read,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7]);
return read;
}
- else
+ else {
DBG(1, "Unknown problem with poll\n");
+ *status = SANE_STATUS_IO_ERROR;
+ }
+ return read;
}
/* kodak does not pad commands like magicolor, so there's only a write_raw function */

34
sane-backends-1.0.21-SCX4500W.patch
View File

@ -1,34 +0,0 @@
From 0643804b4e76c0047df1d61ebee1adfe4696d9d4 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 3 Nov 2010 17:54:24 +0100
Subject: [PATCH] patch: SCX4500W
Squashed commit of the following:
commit d3d53225c2a5ee271141bd058e628ffa66d0c065
Author: Nils Philippsen <nils@redhat.com>
Date: Wed Nov 3 17:53:32 2010 +0100
add USB id for SCX-4500W
---
doc/descriptions/xerox_mfp.desc | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
index 406510f..6b8aa5f 100644
--- a/doc/descriptions/xerox_mfp.desc
+++ b/doc/descriptions/xerox_mfp.desc
@@ -48,6 +48,10 @@
:usbid "0x04e8" "0x3426"
:status :good
+:model "SCX-4500W"
+:interface "USB"
+:usbid "0x04e8" "0x342b"
+
:model "CLX-3170fn"
:interface "USB"
:usbid "0x04e8" "0x342a"
--
1.7.3.2

3
sane-backends-1.0.23.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029
size 5342350

3
sane-backends-1.0.24.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d
size 5778749

47
sane-backends.changes
View File

@ -1,21 +1,50 @@
-------------------------------------------------------------------
Tue Dec 3 11:09:25 CET 2013 - jsmeix@suse.de
- Upgraded to sane-backends version 1.0.24:
Changes since 1.0.23:
* Significant enhancements to pixma, genesys, kodakaio,
fujitsu, canon_dr.
* Minor updates, bugfixes or scanners added in several backends.
* Added new testsuite.
* 51 new scanner models supported.
* USB support improvements.
* Improved build system (mingw64, bug fixes,
default pthread on Linux).
* Documentation updates.
* Bugfixes.
For Details see the ChangeLog file.
- sane-backends-1.0.21-SCX4500W.patch that adds usb id for SCX4500W
is obsolete since sane-backends-1.0.24 because it is fixed
in the source.
- fix-no-return-in-nonvoid-function.patch that fixes a
"control reaches end of non-void function" gcc warning
in kodakaio.c is obsolete since sane-backends-1.0.24
because it is fixed in the source.
- Recreated adapt_epkowa.desc_for_yast2-scanner.patch
according to the comment in sane-backends.spec
so that it applies for sane-backends-1.0.24.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 15 23:23:23 UTC 2013 - piny@gmx.com Mon Sep 15 23:23:23 UTC 2013 - piny@gmx.com
- workaround for hp scanjet 8200 - Workaround for hp scanjet 8200: As described in
As described in <https://bugzilla.novell.com/show_bug.cgi?id=840443> https://bugzilla.novell.com/show_bug.cgi?id=840443
when operating on a hp scanjet 8200 the avision driver gets stuck when operating on a hp scanjet 8200 the avision driver gets stuck
in a loop trying to detect an ADF, even if none is present. in a loop trying to detect an ADF, even if none is present.
In order circumvent this issue, following workaround has been implemented: In order circumvent this issue, following workaround has been
implemented:
1) create an option "enforce-no-adf" in the file avision.conf 1) create an option "enforce-no-adf" in the file avision.conf
2) patch the code in avision.c to make use of this option, 2) patch the code in avision.c to make use of this option,
if the conditions that lead to the unsuccessful ADF search if the conditions that lead to the unsuccessful ADF search
(namely detection of NO ADF but reporting of SOME ADF type) is given. (namely detection of NO ADF but reporting of SOME ADF type)
Per default the new option is inactive by comment; activate at your own risk! is given.
Per default the new option is inactive by comment.
Activate at your own risk!
An upstream report was added to An upstream report was added to
<https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366> https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366
- created patch110 for avision.conf - created patch110 (avision.conf.patch) for avision.conf
- created patch111 for avision.c - created patch111 (avision.c.patch) for avision.c
- introduced patch110 and patch111 into sane-backends.spec
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 4 15:52:19 UTC 2013 - meissner@suse.com Thu Apr 4 15:52:19 UTC 2013 - meissner@suse.com

39
sane-backends.spec
View File

@ -39,20 +39,16 @@ BuildRequires: texlive-latex
Summary: SANE (Scanner Access Now Easy) Scanner Drivers Summary: SANE (Scanner Access Now Easy) Scanner Drivers
License: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain License: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain
Group: Hardware/Scanner Group: Hardware/Scanner
Version: 1.0.23 Version: 1.0.24
Release: 0 Release: 0
Url: http://www.sane-project.org/ Url: http://www.sane-project.org/
# URLs for Source0: # How to get Source0:
# https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1 # wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/3958/sane-backends-1.0.24.tar.gz
# https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2 # How to get the MD5 sum file:
# https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3 # wget --no-check-certificate https://alioth.debian.org/frs/download.php/file/3956/sane-backends-1.0.24.tar.gz.md5
# Get https://alioth.debian.org/frs/download.php/3756/sane-backends-1.0.23.tar.gz.md5 # How to check the MD5 sum:
# for the MD5 sum for sane-backends-1.0.23.tar.gz "e226a89c54173efea80e91e9a5eb6573" # md5sum -c sane-backends-1.0.24.tar.gz.md5
# See https://alioth.debian.org/frs/download.php/3755/README.txt Source0: https://alioth.debian.org/frs/download.php/file/3958/sane-backends-%{version}.tar.gz
# how to make sane-backends-1.0.23.tar.gz and how to verify it:
# $ cat sane-backends-1.0.23.tar.gz.[1-3] > sane-backends-1.0.23.tar.gz
# $ md5sum -c sane-backends-1.0.23.tar.gz.md5
Source0: sane-backends-%{version}.tar.gz
# Source100... is SUSE specific stuff: # Source100... is SUSE specific stuff:
# Source100 is the evil-hack init-script "sane-dev" to grant scanner access permissions. # Source100 is the evil-hack init-script "sane-dev" to grant scanner access permissions.
# Source100 is no longer provided because sane-backends-1.0.19 has udev and HAL support. # Source100 is no longer provided because sane-backends-1.0.19 has udev and HAL support.
@ -169,14 +165,14 @@ Patch103: install-umax_pp-tool.patch
Patch104: no-descriptions-external-hpoj.patch Patch104: no-descriptions-external-hpoj.patch
# Patch105 sane-backends-1.0.20-xerox_mfp.diff backports post 1.0.20 xerox_mfp changes # Patch105 sane-backends-1.0.20-xerox_mfp.diff backports post 1.0.20 xerox_mfp changes
# and is therefore removed since sane-backends-1.0.21 which contains those changes. # and is therefore removed since sane-backends-1.0.21 which contains those changes.
# Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W: # Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W.
Patch106: sane-backends-1.0.21-SCX4500W.patch # Patch106 is obsolete since sane-backends-1.0.24 because it is fixed in the source.
# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245) # Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245)
# is obsolete since sane-backends-1.0.23 because it is fixed in the source. # is obsolete since sane-backends-1.0.23 because it is fixed in the source.
# Patch108 fix-no-return-in-nonvoid-function.patch fixes a "control reaches end of non-void function" gcc warning # Patch108 fix-no-return-in-nonvoid-function.patch fixes a "control reaches end of non-void function" gcc warning
# which lets build fail with "no-return-in-nonvoid-function" error in kodakaio.c - the upstream bug report is # which lets build fail with "no-return-in-nonvoid-function" error in kodakaio.c - the upstream bug report is
# https://alioth.debian.org/tracker/index.php?func=detail&aid=313858&group_id=30186&atid=410366 # https://alioth.debian.org/tracker/index.php?func=detail&aid=313858&group_id=30186&atid=410366
Patch108: fix-no-return-in-nonvoid-function.patch # Patch108 is obsolete since sane-backends-1.0.24 because it is fixed in the source.
# Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner # Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner
# (see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14). # (see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14).
# It adds "requires DFSG non-free Image Scan software from Avasys" to all comments # It adds "requires DFSG non-free Image Scan software from Avasys" to all comments
@ -188,12 +184,10 @@ Patch108: fix-no-return-in-nonvoid-function.patch
# Furthermore it removes "unsupported" models from epkowa.desc because # Furthermore it removes "unsupported" models from epkowa.desc because
# otherwise there would be confusing model entries shown in yast2-scanner: # otherwise there would be confusing model entries shown in yast2-scanner:
Patch109: adapt_epkowa.desc_for_yast2-scanner.patch Patch109: adapt_epkowa.desc_for_yast2-scanner.patch
#
# Patch 110 and 111 implement scanjet 8200 ADF workaround - bnc#840443 # Patch 110 and 111 implement scanjet 8200 ADF workaround - bnc#840443
# https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366 # https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366
Patch110: avision.conf.patch Patch110: avision.conf.patch
Patch111: avision.c.patch Patch111: avision.c.patch
#
# 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
# Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun: # Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun:
@ -281,20 +275,13 @@ package or remove it when it is already installed.
# Patch104 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am # Patch104 no-descriptions-external-hpoj.patch 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
# Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W:
%patch106 -p1
# Patch108 fix-no-return-in-nonvoid-function.patch fixes a "control reaches end of non-void function" gcc warning
# which lets build fail with "no-return-in-nonvoid-function" error in kodakaio.c - the upstream bug report is
# https://alioth.debian.org/tracker/index.php?func=detail&aid=313858&group_id=30186&atid=410366
%patch108
# Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner # Patch109 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner
# see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14 # see https://bugzilla.novell.com/show_bug.cgi?id=788756#c14
%patch109 %patch109
# # Patch 110 and 111 implement scanjet 8200 ADF workaround - bnc#840443
# hope this is the right place to insert # https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366
%patch110 %patch110
%patch111 %patch111
#
# 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.