Update sane-backends to 1.0.25.

New with 1.0.25, released 2015-10-03:

* New backends: epsonds (Epson DS, PX and WF series),
  pieusb (PIE and Reflecta film/slide scanners).
* Support for JPG and PNG output format in scanimage.
* Significant enhancements to avision, canon_dr, epjitsu, fujitsu, genesys,
  kodakaio and pixma backends.
* Minor updates, bugfixes or scanners added in several backends.
* 300 new scanner models supported.
* Workaround for USB3 problems in Linux kernel.
* Added code for IR functionality.
* Documentation and translation updates.
* Bugfixes (threading, networking, udev rules).

8 files changed, 63 insertions, 34 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index cd58c46bb67..0ec9e2212c5 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2015/08/16 20:24:23 leot Exp $
+# $NetBSD: Makefile,v 1.63 2015/10/25 10:39:13 wiz Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digital cameras, frame grabbers, etc
@@ -40,13 +40,13 @@ EGDIR=		${PREFIX}/share/examples/sane
 artec_eplus48u.conf avision.conf bh.conf canon.conf canon630u.conf \
 canon_dr.conf cardscan.conf coolscan.conf coolscan2.conf coolscan3.conf \
 dc210.conf dc240.conf dc25.conf dell1600n_net.conf dll.conf dmc.conf \
-epson.conf epjitsu.conf epson2.conf fujitsu.conf \
+epjitsu.conf epson.conf epson2.conf epsonds.conf fujitsu.conf \
 genesys.conf gt68xx.conf hp.conf hp3900.conf \
 hp4200.conf hp5400.conf hs2p.conf ibm.conf kodak.conf leo.conf lexmark.conf \
 ma1509.conf matsushita.conf \
 microtek.conf microtek2.conf mustek.conf mustek_usb.conf \
 nec.conf net.conf \
-p5.conf pie.conf pixma.conf plustek.conf plustek_pp.conf \
+p5.conf pie.conf pieusb.conf pixma.conf plustek.conf plustek_pp.conf \
 ricoh.conf rts8891.conf \
 s9036.conf saned.conf sceptre.conf sharp.conf sm3840.conf snapscan.conf \
 sp15c.conf st400.conf stv680.conf \
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index fdf0713c515..480212d03c5 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.31 2015/08/16 20:24:23 leot Exp $
+# $NetBSD: Makefile.common,v 1.32 2015/10/25 10:39:13 wiz Exp $
 # used by graphics/sane-frontends/Makefile
 
 CATEGORIES?=	graphics
-MASTER_SITES?=	${MASTER_SITE_LOCAL}
+MASTER_SITES?=	https://alioth.debian.org/frs/download.php/file/4146/
 # http://alioth.debian.org/frs/?group_id=30186
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
@@ -11,7 +11,7 @@ LICENSE=	gnu-gpl-v2
 
 SANE_MAJOR?=	1
 SANE_MINOR?=	0
-SANE_MICRO?=	24
+SANE_MICRO?=	25
 SANE_VERSION=	${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
 PLIST_SUBST+=	SANE_MAJOR=${SANE_MAJOR:Q}
 PLIST_SUBST+=	SANE_MINOR=${SANE_MINOR:Q}
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index 50e7d39b71a..a55b642e0a6 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.30 2012/12/12 08:40:27 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.31 2015/10/25 10:39:13 wiz Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
 bin/scanimage
+bin/umax_pp
 include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.la
@@ -31,6 +32,7 @@ lib/sane/libsane-dmc.la
 lib/sane/libsane-epjitsu.la
 lib/sane/libsane-epson.la
 lib/sane/libsane-epson2.la
+lib/sane/libsane-epsonds.la
 lib/sane/libsane-fujitsu.la
 lib/sane/libsane-genesys.la
 lib/sane/libsane-gt68xx.la
@@ -62,6 +64,7 @@ lib/sane/libsane-net.la
 lib/sane/libsane-niash.la
 lib/sane/libsane-p5.la
 lib/sane/libsane-pie.la
+lib/sane/libsane-pieusb.la
 ${PLIST.pint}lib/sane/libsane-pint.la
 lib/sane/libsane-pixma.la
 lib/sane/libsane-plustek.la
@@ -114,6 +117,7 @@ man/man5/sane-dmc.5
 man/man5/sane-epjitsu.5
 man/man5/sane-epson.5
 man/man5/sane-epson2.5
+man/man5/sane-epsonds.5
 man/man5/sane-fujitsu.5
 man/man5/sane-genesys.5
 man/man5/sane-gt68xx.5
@@ -145,6 +149,7 @@ man/man5/sane-net.5
 man/man5/sane-niash.5
 man/man5/sane-p5.5
 man/man5/sane-pie.5
+man/man5/sane-pieusb.5
 ${PLIST.pint}man/man5/sane-pint.5
 man/man5/sane-pixma.5
 man/man5/sane-plustek.5
@@ -281,6 +286,7 @@ share/examples/sane/dmc.conf
 share/examples/sane/epjitsu.conf
 share/examples/sane/epson.conf
 share/examples/sane/epson2.conf
+share/examples/sane/epsonds.conf
 share/examples/sane/fujitsu.conf
 share/examples/sane/genesys.conf
 share/examples/sane/gt68xx.conf
@@ -305,6 +311,7 @@ share/examples/sane/nec.conf
 share/examples/sane/net.conf
 share/examples/sane/p5.conf
 share/examples/sane/pie.conf
+share/examples/sane/pieusb.conf
 share/examples/sane/pixma.conf
 share/examples/sane/plustek.conf
 share/examples/sane/plustek_pp.conf
@@ -339,6 +346,7 @@ share/locale/es/LC_MESSAGES/sane-backends.mo
 share/locale/fi/LC_MESSAGES/sane-backends.mo
 share/locale/fr/LC_MESSAGES/sane-backends.mo
 share/locale/gl/LC_MESSAGES/sane-backends.mo
+share/locale/hu/LC_MESSAGES/sane-backends.mo
 share/locale/it/LC_MESSAGES/sane-backends.mo
 share/locale/ja/LC_MESSAGES/sane-backends.mo
 share/locale/nb/LC_MESSAGES/sane-backends.mo
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 875a5d60ae7..4cb9909306b 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,18 +1,21 @@
-$NetBSD: distinfo,v 1.36 2015/08/16 20:24:23 leot Exp $
+$NetBSD: distinfo,v 1.37 2015/10/25 10:39:13 wiz Exp $
 
-SHA1 (sane-backends-1.0.24.tar.gz) = c10bcb30a1b092b2c2fe5a86d6a5efc29123ccf9
-RMD160 (sane-backends-1.0.24.tar.gz) = 7a05c5b3d4fc4a88564cb862d4a1b46843026105
-Size (sane-backends-1.0.24.tar.gz) = 5778749 bytes
+SHA1 (sane-backends-1.0.25.tar.gz) = 05824922d91571e1fc2f5cdd270745783d593754
+RMD160 (sane-backends-1.0.25.tar.gz) = 1cfd81eeddf3ef3c2cea98f6ca7640522b249fab
+SHA512 (sane-backends-1.0.25.tar.gz) = b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df
+Size (sane-backends-1.0.25.tar.gz) = 5955016 bytes
 SHA1 (patch-aa) = ff3439b060d6aa78f63d6acd09d87499a4d7f224
-SHA1 (patch-ab) = 0462997912869fe3083e1b385a478a31bc3deec0
+SHA1 (patch-ab) = 58ef8bb791cfb043931e119a1cfe521d3bb346e0
 SHA1 (patch-ac) = 900911de5cde4a6cdc35cbc2d13371b13c596474
 SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
 SHA1 (patch-af) = db4ba80826d76363ad28c22eea325e19868fd1e4
 SHA1 (patch-ag) = 8155659bce4e1ce569a8a4a74131f21670c0a834
 SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
-SHA1 (patch-ai) = 74f27b5a66e3dfd96337cb00a4ff3bc48804256b
+SHA1 (patch-ai) = 14f5467eb865406cbec00b8d47b5c23c4c89f113
 SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
 SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
 SHA1 (patch-backend_kodakaio.c) = d15cb7af0a5cc506fc42e3a71fa0998329e6eef9
 SHA1 (patch-backend_magicolor.c) = e6cbb54a0ea0e688b0189b3d07d1dff34070a179
+SHA1 (patch-backend_pieusb__buffer.c) = 8d65f0f1927bb70af451fa9c04c7d535832b6ced
 SHA1 (patch-backend_xerox__mfp-tcp.c) = 3818b623217f15ed7f30724d1d70b1614befb88f
+SHA1 (patch-sanei_sanei__ir.c) = 35720c31542ed02238d59e6f5be908609c7dd85a
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
index ca9cb1bad58..ab29c10d033 100644
--- a/graphics/sane-backends/patches/patch-ab
+++ b/graphics/sane-backends/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2012/12/10 12:06:51 ryoon Exp $
+$NetBSD: patch-ab,v 1.14 2015/10/25 10:39:13 wiz Exp $
 
---- configure.orig	2012-08-19 20:45:11.000000000 +0000
+--- configure.orig	2015-10-04 13:18:39.000000000 +0000
 +++ configure
-@@ -7236,13 +7236,13 @@ if test "x$ac_cv_header_pthread_h" = xye
+@@ -7377,13 +7377,13 @@ if test "x$ac_cv_header_pthread_h" = xye
  #define HAVE_PTHREAD_H 1
  _ACEOF
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.13 2012/12/10 12:06:51 ryoon Exp $
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -7273,7 +7273,7 @@ fi
+@@ -7414,7 +7414,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
  $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
  if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
@@ -28,20 +28,12 @@ $NetBSD: patch-ab,v 1.13 2012/12/10 12:06:51 ryoon Exp $
  fi
  
         have_pthread=yes
-@@ -17741,14 +17741,14 @@ for be in ${BACKENDS}; do
+@@ -18138,7 +18138,7 @@ for be in ${BACKENDS}; do
      ;;
  
      mustek_pp)
 -    if test "${sane_cv_use_libieee1284}" != "yes" && test "${enable_parport_directio}" != "yes"; then
 +    if test "${sane_cv_use_libieee1284}" != "yes" || test "${enable_parport_directio}" != "yes"; then
-       echo "*** $be backend requires libieee1284 and paraport-directio libraries - $DISABLE_MSG"
-       backend_supported="no"
-     fi
-     ;;
- 
-     dell1600n_net)
--    if test "${sane_cv_use_libjpeg}" != "yes" || test "${sane_cv_use_libtiff}" != "yes"; then
-+    if test "${sane_cv_use_libjpeg}" != "yes" && test "${sane_cv_use_libtiff}" != "yes"; then
-       echo "*** $be backend requires JPEG and/or TIFF library - $DISABLE_MSG"
+       echo "*** $be backend requires libieee1284 or parport-directio libraries - $DISABLE_MSG"
        backend_supported="no"
      fi
diff --git a/graphics/sane-backends/patches/patch-ai b/graphics/sane-backends/patches/patch-ai
index 96860fa92e1..b813ea0cb62 100644
--- a/graphics/sane-backends/patches/patch-ai
+++ b/graphics/sane-backends/patches/patch-ai
@@ -1,19 +1,19 @@
-$NetBSD: patch-ai,v 1.2 2011/07/12 12:19:41 wiz Exp $
+$NetBSD: patch-ai,v 1.3 2015/10/25 10:39:13 wiz Exp $
 
 Avoid duplicate symbols in libepson and libepson2.
 
---- backend/epson_usb.c.orig	2011-01-16 01:01:28.000000000 +0000
+--- backend/epson_usb.c.orig	2015-09-20 11:55:39.000000000 +0000
 +++ backend/epson_usb.c
 @@ -4,7 +4,7 @@
  
- /* generated with epson2usb.pl doc/descriptions/epson2.desc */
+ /* generated with epson2usb.pl doc/descriptions/epson.desc */
  
 -SANE_Word sanei_epson_usb_product_ids[] = {
 +static SANE_Word sanei_epson_usb_product_ids[] = {
-   0x101, /* GT-7000U, Perfection 636U */
-   0x103, /* GT-6600U, Perfection 610 */
-   0x104, /* GT-7600U, GT-7600UF, Perfection 1200U, Perfection 1200U PHOTO */
-@@ -85,7 +85,7 @@ SANE_Word sanei_epson_usb_product_ids[] 
+   0x101, /* Perfection 636U */
+   0x103, /* Perfection 610 */
+   0x104, /* Perfection 1200U, Perfection 1200Photo */
+@@ -45,7 +45,7 @@ SANE_Word sanei_epson_usb_product_ids[] 
  				   in the config file as "usb <vendor> <product>" */
  };
  
diff --git a/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c b/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c
new file mode 100644
index 00000000000..836c56d483e
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-backend_pieusb__buffer.c,v 1.1 2015/10/25 10:39:13 wiz Exp $
+
+--- backend/pieusb_buffer.c.orig	2015-09-01 00:31:33.000000000 +0000
++++ backend/pieusb_buffer.c
+@@ -100,7 +100,9 @@
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
++#ifdef HAVE_ENDIAN_H
+ #include <endian.h>
++#endif
+ 
+ /* When creating the release backend, make complains about unresolved external
+  * le16toh, although it finds the include <endian.h> */
diff --git a/graphics/sane-backends/patches/patch-sanei_sanei__ir.c b/graphics/sane-backends/patches/patch-sanei_sanei__ir.c
new file mode 100644
index 00000000000..aaa50dfc9d3
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-sanei_sanei__ir.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-sanei_sanei__ir.c,v 1.1 2015/10/25 10:39:13 wiz Exp $
+
+--- sanei/sanei_ir.c.orig	2015-09-29 01:10:43.000000000 +0000
++++ sanei/sanei_ir.c
+@@ -29,7 +29,6 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-#include <values.h>
+ #include <math.h>
+ 
+ #define BACKEND_NAME sanei_ir	/* name of this module for debugging */