[packages/sane-backends] - up to 1.0.23

[arekm]

commit 95bee5066e4505729290f3ace6fa3bf35863bd9f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon May 27 22:10:02 2013 +0200

    - up to 1.0.23

 sane-backends-1.0.22-v4l.patch                  | 64 -----------------------
 sane-backends-1.0.23-sane-config-multilib.patch | 36 +++++++++++++
 sane-backends-1.0.23-umax-init-error.patch      | 38 ++++++++++++++
 sane-backends-link.patch                        |  8 +--
 sane-backends-lockpath_group.patch              | 12 +----
 sane-backends.spec                              | 21 +++++---
 xerox_mfp_fix_usb_devices.patch                 | 67 -------------------------
 7 files changed, 94 insertions(+), 152 deletions(-)
---
diff --git a/sane-backends.spec b/sane-backends.spec
index 3e6ac15..b50d3e3 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -9,20 +9,22 @@ Summary(ko.UTF-8):	스캐너를 다루는 소프트웨어
 Summary(pl.UTF-8):	SANE - prosta obsługa skanerów lokalnych i sieciowych
 Summary(pt_BR.UTF-8):	SANE - acesso a scanners locais e em rede
 Name:		sane-backends
-Version:	1.0.22
-Release:	9
+Version:	1.0.23
+Release:	1
 License:	relaxed GPL v2+ (libraries), Public Domain (docs)
 Group:		Libraries
-Source0:	ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/sane-backends-%{version}.tar.gz
-# Source0-md5:	fadf56a60f4776bfb24491f66b617cf5
+# Source0:	ftp://ftp2.sane-project.org/pub/sane/%{name}-%{version}.tar.gz
+Source0:	http://ftp.de.debian.org/debian/pool/main/s/sane-backends/%{name}_%{version}.orig.tar.gz
+# Source0-md5:	e226a89c54173efea80e91e9a5eb6573
 Source1:	%{name}.rc-inetd
 Source2:	%{name}.m4
 Patch0:		%{name}-lockpath_group.patch
 Patch1:		%{name}-mustek-path.patch
 Patch2:		%{name}-spatc.patch
 Patch4:		%{name}-link.patch
-Patch5:		http://patch-tracker.debian.org/patch/series/dl/sane-backends/1.0.22-6/xerox_mfp_fix_usb_devices.patch
-Patch6:		sane-backends-1.0.22-v4l.patch
+Patch5:		sane-backends-1.0.23-sane-config-multilib.patch
+Patch6:		sane-backends-1.0.23-umax-init-error.patch
+Patch7:		%{name}-format.patch
 URL:		http://www.sane-project.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
@@ -251,6 +253,7 @@ mv -f acinclude.m4.tmp acinclude.m4
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{__libtoolize}
@@ -360,6 +363,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/hs2p.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/ibm.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/kodak.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/kodakaio.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/leo.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/lexmark.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sane.d/ma1509.conf
@@ -435,8 +439,10 @@ fi
 %attr(755,root,root) %{_libdir}/sane/libsane-hs2p.so.*
 %attr(755,root,root) %{_libdir}/sane/libsane-ibm.so.*
 %attr(755,root,root) %{_libdir}/sane/libsane-kodak.so.*
+%attr(755,root,root) %{_libdir}/sane/libsane-kodakaio.so.*
 %attr(755,root,root) %{_libdir}/sane/libsane-kvs1025.so.*
 %attr(755,root,root) %{_libdir}/sane/libsane-kvs20xx.so.*
+%attr(755,root,root) %{_libdir}/sane/libsane-kvs40xx.so.*
 %attr(755,root,root) %{_libdir}/sane/libsane-leo.so.*
 %attr(755,root,root) %{_libdir}/sane/libsane-lexmark.so.*
 %attr(755,root,root) %{_libdir}/sane/libsane-ma1509.so.*
@@ -517,8 +523,10 @@ fi
 %{_mandir}/man5/sane-hs2p.5*
 %{_mandir}/man5/sane-ibm.5*
 %{_mandir}/man5/sane-kodak.5*
+%{_mandir}/man5/sane-kodakaio.5*
 %{_mandir}/man5/sane-kvs1025.5*
 %{_mandir}/man5/sane-kvs20xx.5*
+%{_mandir}/man5/sane-kvs40xx.5*
 %{_mandir}/man5/sane-leo.5*
 %{_mandir}/man5/sane-lexmark.5*
 %{_mandir}/man5/sane-ma1509.5*
@@ -569,6 +577,7 @@ fi
 %{_libdir}/libsane.la
 %{_includedir}/sane
 %{_aclocaldir}/sane-backends.m4
+%{_pkgconfigdir}/sane-backends.pc
 
 %files static
 %defattr(644,root,root,755)
diff --git a/sane-backends-1.0.22-v4l.patch b/sane-backends-1.0.22-v4l.patch
deleted file mode 100644
index 4e240e0..0000000
--- a/sane-backends-1.0.22-v4l.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils at 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 at 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 at 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
-
diff --git a/sane-backends-1.0.23-sane-config-multilib.patch b/sane-backends-1.0.23-sane-config-multilib.patch
new file mode 100644
index 0000000..2f28835
--- /dev/null
+++ b/sane-backends-1.0.23-sane-config-multilib.patch
@@ -0,0 +1,36 @@
+From d0c61e7e9b13185f424dff1f4ac697ec53089d69 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at redhat.com>
+Date: Tue, 4 Sep 2012 16:45:14 +0200
+Subject: [PATCH] patch: sane-config-multilib
+
+Squashed commit of the following:
+
+commit 81aa4f41bf102b08258c8e1de1c0476835329ec5
+Author: Nils Philippsen <nils at redhat.com>
+Date:   Tue Sep 4 16:43:34 2012 +0200
+
+    make installed sane-config multi-lib aware again
+
+    This partially reverts commit 77c4ea1a7aa680fb1c3ee4daa1404f21439b2c9b.
+---
+ tools/sane-config.in | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tools/sane-config.in b/tools/sane-config.in
+index 8e4b52a..1fae2e5 100644
+--- a/tools/sane-config.in
++++ b/tools/sane-config.in
+@@ -10,10 +10,6 @@ scriptname="sane-config"
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+-# using our installed *.pc only - neither default nor user paths
+-export PKG_CONFIG_LIBDIR="@libdir@/pkgconfig"
+-export PKG_CONFIG_PATH=""
+-
+ pkgconfig_package=sane-backends
+ 
+ usage ()
+-- 
+1.7.11.4
+
diff --git a/sane-backends-1.0.23-umax-init-error.patch b/sane-backends-1.0.23-umax-init-error.patch
new file mode 100644
index 0000000..5cb1c61
--- /dev/null
+++ b/sane-backends-1.0.23-umax-init-error.patch
@@ -0,0 +1,38 @@
+From b7ee97acddee63c5991d901b0c9ea506fb33f611 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at redhat.com>
+Date: Fri, 1 Feb 2013 16:47:30 +0100
+Subject: [PATCH] patch: umax-init-error
+
+Squashed commit of the following:
+
+commit 13fb7a94adfa786b81a11755f22e8ab647cfac69
+Author: Nils Philippsen <nils at redhat.com>
+Date:   Wed Jan 16 11:57:37 2013 +0100
+
+    umax: initialize reader_pid early in sane_start()
+
+    This avoids that subsequent errors followed by do_cancel() attempt to
+    phtread_cancel() an invalid thread (which may cause a crash).
+    (cherry picked from commit defdc1ab5c365735ac85e347d463a01cf96fc72d)
+---
+ backend/umax.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/backend/umax.c b/backend/umax.c
+index a9d1723..b2ceb00 100644
+--- a/backend/umax.c
++++ b/backend/umax.c
+@@ -7285,6 +7285,10 @@ SANE_Status sane_start(SANE_Handle handle)
+ 
+   DBG(DBG_sane_init,"sane_start\n");
+ 
++  /* Initialize reader_pid to invalid so a subsequent error and following call
++   * to do_cancel() won't trip over it. */
++  scanner->reader_pid = -1;
++
+   mode = scanner->val[OPT_MODE].s;
+ 
+   if (scanner->device->sfd == -1)   /* first call, don`t run this routine again on multi frame or multi image scan */
+-- 
+1.8.1
+
diff --git a/sane-backends-link.patch b/sane-backends-link.patch
index 631edcf..df1be15 100644
--- a/sane-backends-link.patch
+++ b/sane-backends-link.patch
@@ -9,15 +9,15 @@
  EXTRA_DIST += artec_eplus48u.conf.in
  
  libas6e_la_SOURCES = as6e.c as6e.h
-@@ -1089,7 +1089,7 @@
+@@ -1120,7 +1120,7 @@
  nodist_libsane_la_SOURCES =  dll-s.c
  libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
  libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
--libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
-+libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(DL_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
+-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
++libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
  
  # WARNING: Automake is getting this wrong so have to do it ourselves.
- libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo @SANEI_SANEI_JPEG_LO@
+ libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo @SANEI_SANEI_JPEG_LO@
 --- sane-backends-1.0.21/tools/Makefile.am.orig	2010-04-05 15:18:06.000000000 +0200
 +++ sane-backends-1.0.21/tools/Makefile.am	2010-11-07 11:59:31.659094909 +0100
 @@ -32,7 +32,7 @@
diff --git a/sane-backends-lockpath_group.patch b/sane-backends-lockpath_group.patch
index c7dcf2f..998fb76 100644
--- a/sane-backends-lockpath_group.patch
+++ b/sane-backends-lockpath_group.patch
@@ -17,14 +17,4 @@
    fi
    if test $use_locking = yes ; then
      INSTALL_LOCKPATH=install-lockpath
---- sane-backends-1.0.20/backend/Makefile.am~	2010-01-19 23:59:26.081372025 +0100
-+++ sane-backends-1.0.20/backend/Makefile.am	2010-01-20 00:02:20.477725218 +0100
-@@ -137,7 +137,7 @@
- 	  done
- 
- install-lockpath:
--	$(mkinstalldirs) -m 775 -g $(LOCKPATH_GROUP) $(DESTDIR)$(locksanedir)
-+	$(mkinstalldirs) -m 775 $(DESTDIR)$(locksanedir)
- 
- uninstall-hook:
- 	rm -rf $(DESTDIR)$(libdir)/sane $(DESTDIR)$(configdir) $(DESTDIR)$(locksanedir)
+
diff --git a/xerox_mfp_fix_usb_devices.patch b/xerox_mfp_fix_usb_devices.patch
deleted file mode 100644
index 5ed29b9..0000000
--- a/xerox_mfp_fix_usb_devices.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Author: Alex Belkin <abc at telekom.ru>
-Date:   Tue Mar 8 17:57:19 2011 +0300
-
-    keep usb device by default (correct for bug introduced by tcp sub-backend
-
-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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sane-backends.git/commitdiff/95bee5066e4505729290f3ace6fa3bf35863bd9f