From 1ac1132404525b67d4ff8aa4cd6b8065939e4179be9c17ad970d28b1f7b0e7b8 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Tue, 16 Oct 2012 15:11:36 +0000 Subject: [PATCH] Accepting request 138386 from home:jsmeix:branches:graphics Version upgrade to 1.0.23 OBS-URL: https://build.opensuse.org/request/show/138386 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=58 --- fix-no-return-in-nonvoid-function.patch | 15 ++++ ...nds-1.0.22-xerox_mfp-fix-usb-devices.patch | 81 ------------------- sane-backends-1.0.22.tar.bz2 | 3 - sane-backends-1.0.23.tar.gz | 3 + sane-backends.changes | 32 +++++++- sane-backends.spec | 41 +++++++--- 6 files changed, 75 insertions(+), 100 deletions(-) create mode 100644 fix-no-return-in-nonvoid-function.patch delete mode 100644 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch delete mode 100644 sane-backends-1.0.22.tar.bz2 create mode 100644 sane-backends-1.0.23.tar.gz diff --git a/fix-no-return-in-nonvoid-function.patch b/fix-no-return-in-nonvoid-function.patch new file mode 100644 index 0000000..cb355ca --- /dev/null +++ b/fix-no-return-in-nonvoid-function.patch @@ -0,0 +1,15 @@ +--- 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 */ diff --git a/sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch b/sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch deleted file mode 100644 index 6c41805..0000000 --- a/sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 9792fb4ac11443553771d4f311a985333b503594 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -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 -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 - diff --git a/sane-backends-1.0.22.tar.bz2 b/sane-backends-1.0.22.tar.bz2 deleted file mode 100644 index b75ef92..0000000 --- a/sane-backends-1.0.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21830b6a0c315fef423ad8b7e96bfacff462085f49d43863e2e7139e242e535c -size 4065208 diff --git a/sane-backends-1.0.23.tar.gz b/sane-backends-1.0.23.tar.gz new file mode 100644 index 0000000..7a7abab --- /dev/null +++ b/sane-backends-1.0.23.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029 +size 5342350 diff --git a/sane-backends.changes b/sane-backends.changes index cf017f4..e3b6a08 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Oct 16 13:47:46 CEST 2012 - jsmeix@suse.de + +- Upgraded to sane-backends version 1.0.22: + New backends: + kvs40xx (Panasonic KV-S40xx), kodakaio (Kodak AiO ESP and Hero). + Significant enhancements to several backends. + 30 new scanner models supported. + V4L support improvements. + Improvements for builds on multiple platforms. + Improved udev rules. + Updated software deskew algorithm. + 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.22-xerox_mfp-fix-usb-devices.patch that + fixes usb device support in xerox_mfp is obsolete since + sane-backends-1.0.23 because it is fixed in the source. +- 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. + ------------------------------------------------------------------- Thu Aug 23 09:24:52 UTC 2012 - cfarrell@suse.com @@ -29,13 +53,15 @@ Fri Apr 20 12:24:49 CEST 2012 - jsmeix@suse.de ------------------------------------------------------------------- Tue Mar 20 15:44:31 UTC 2012 - jslaby@suse.de -- re-add support for USB scanners +- added explicit "BuildRequires libusb-compat-devel" to + re-add support for USB scanners ------------------------------------------------------------------- Sun Feb 5 20:18:31 UTC 2012 - lnussel@suse.de -- add usb id for SCX4500W -- fix usb device handling regression in xerox_mfp (bnc#745245) +- sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W +- sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes + usb device handling regression in xerox_mfp (bnc#745245) ------------------------------------------------------------------- Sun Nov 20 06:28:34 UTC 2011 - coolo@suse.com diff --git a/sane-backends.spec b/sane-backends.spec index b4264af..66fd264 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -37,12 +37,20 @@ BuildRequires: texlive-latex Summary: SANE (Scanner Access Now Easy) Scanner Drivers License: GPL-2.0+ and SUSE-GPL-2.0+-with-sane-exception and SUSE-Public-Domain Group: Hardware/Scanner -Version: 1.0.22 +Version: 1.0.23 Release: 0 Url: http://www.sane-project.org/ -# URL for Source0: https://alioth.debian.org/frs/download.php/3258/sane-backends-1.0.21.tar.gz -# MD5 sum for upstream sane-backends-1.0.21.tar.gz (not our .bz2): be586a23633949cf2ecf0c9c6d769130 -Source0: sane-backends-%{version}.tar.bz2 +# URLs for Source0: +# https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1 +# https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2 +# https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3 +# Get https://alioth.debian.org/frs/download.php/3756/sane-backends-1.0.23.tar.gz.md5 +# for the MD5 sum for sane-backends-1.0.23.tar.gz "e226a89c54173efea80e91e9a5eb6573" +# See https://alioth.debian.org/frs/download.php/3755/README.txt +# 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 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. @@ -165,8 +173,12 @@ Patch104: no-descriptions-external-hpoj.patch # 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 -# 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 +# 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. +# 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: fix-no-return-in-nonvoid-function.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build # Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun: @@ -177,7 +189,7 @@ Obsoletes: sane-64bit %endif # Up to SLE10 there was the package name 'sane' for 'sane-backends'. # Therefore this RPM provides 'sane' and it also obsoletes it. -# The %{version} is needed in both Provides and Obsoletes +# The {version} is needed in both Provides and Obsoletes # to avoid a RPMLINT warning that the package obsoletes itself: Provides: sane = %{version} Obsoletes: sane < %{version} @@ -256,8 +268,10 @@ package or remove it when it is already installed. %patch104 # Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W: %patch106 -p1 -# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245): -%patch107 -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 # Source100... is SUSE specific stuff: # 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. @@ -323,7 +337,7 @@ make %install make install DESTDIR=%{buildroot} -# The actual driver modules are installed as libsane-.so.%{version} +# The actual driver modules are installed as libsane-.so.{version} # and two libsane-.so.1 and libsane-.so links point to them. # Additionally a libsane-.la libtool archive file is installed # which could be used to find the correct module file name to dlopen the module. @@ -348,9 +362,9 @@ perl -pi -e 's/^([^#].*)$/#$1/' %{buildroot}%{_sysconfdir}/sane.d/dll.conf # Allow all users to write into /var/lock/sane/ so that the backends work for normal users # and set the sticky bit (i.e. others are not allowed to remove lock files). # Disabled because package-specific world-writable directories are not allowed: -#chmod 1777 %{buildroot}/var/lock/sane/ +#chmod 1777 {buildroot}/var/lock/sane/ # Install the descriptions and descriptions-external files. -# These files are the sources to make %{_defaultdocdir}/sane/sane-backends/*.html +# These files are the sources to make {_defaultdocdir}/sane/sane-backends/*.html # but these source files must also exist in the installed sane package # because YaST needs them to create its scanner database: for d in descriptions descriptions-external @@ -533,7 +547,7 @@ exit 0 %{_datadir}/sane/ %{_libdir}/libsane.so.* %{_libdir}/sane/ -#%dir /var/lock/sane +#dir /var/lock/sane %doc %{_defaultdocdir}/sane-backends/ %doc %{_mandir}/man1/scanimage.1.gz %doc %{_mandir}/man1/sane-find-scanner.1.gz @@ -547,6 +561,7 @@ exit 0 %{_bindir}/sane-config %{_includedir}/sane/ %{_libdir}/libsane.so +%{_libdir}/pkgconfig/sane-backends.pc %doc %{_mandir}/man1/sane-config.1.gz %files autoconfig