- Update to 1.0.25 [1]

- Add option for v4l [1]
- Use more option helpers [1]
- Removed CUPS option since CUPS requirement has been dropped upstream [1]

While here:

- Convert to USES=localbase
- Regenerate some patches [1]

This version also includes support for Canon LiDE 220 scanners. [2]

PR:		203799 [1], 200788 [2]
Submitted by:	Ports Fury [1], avg@ [2]

15 files changed, 229 insertions, 237 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 770971cb3d86..bc76e8cbb205 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.24
-PORTREVISION=	3
+PORTVERSION=	1.0.25
 CATEGORIES=	graphics
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/3958/ \
+MASTER_SITES=	https://alioth.debian.org/frs/download.php/4146/ \
 		http://fossies.org/linux/misc/
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,70 +12,56 @@ COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
 
 LICENSE=	GPLv2 # (or later)
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libv4l1.so:${PORTSDIR}/multimedia/libv4l
-
-OPTIONS_DEFINE=	AVAHI CUPS DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB
-OPTIONS_DEFAULT=	USB IPV6
-OPTIONS_SUB=	yes
-IEEE1284_DESC=	Parallel port support via libieee1284
-USB_DESC=	USB support
+LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
+USES=		gmake libtool localbase pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} \
 		--disable-latex \
 		--disable-locking \
-		--enable-pthread
+		--enable-pthread \
+		--without-systemd
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
-
-PORTDOCS=	*
 USE_RC_SUBR=	saned
-SUB_FILES+=	pkg-message
+
+SUB_FILES=	pkg-message
 
 USERS=	saned
 GROUPS=	saned
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-AVAHI_CONFIGURE_ENABLE=	avahi
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+PORTDOCS=	*
 
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+OPTIONS_DEFINE=		AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
+OPTIONS_DEFAULT=	USB
+OPTIONS_SUB=		yes
 
-GPHOTO_CONFIGURE_OFF=	--with-gphoto2=no
+AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_CONFIGURE_ENABLE=	avahi
 GPHOTO_LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
-
+GPHOTO_CONFIGURE_OFF=	--with-gphoto2=no
+IEEE1284_DESC=		Parallel port support via libieee1284
 IEEE1284_LIB_DEPENDS=	libieee1284.so:${PORTSDIR}/sysutils/libieee1284
-
+IEEE1284_CONFIGURE_ENV_OFF=	sane_cv_use_libieee1284=no
 IPV6_CONFIGURE_ENABLE=	ipv6
-
-NLS_CONFIGURE_ENABLE=	translations
 NLS_USES=		gettext
-
-SNMP_CONFIGURE_WITH=	snmp
+NLS_CONFIGURE_ENABLE=	translations
 SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-
-USB_CONFIGURE_ENABLE=	libusb
-
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MCUPS}
-CONFIGURE_ENV+=		ac_cv_header_cups_cups_h=no
-.endif
-
-.if ! ${PORT_OPTIONS:MIEEE1284}
-CONFIGURE_ENV+=		sane_cv_use_libieee1284=no
-.endif
+SNMP_CONFIGURE_WITH=	snmp
+USB_DESC=		USB support
+USB_CONFIGURE_ON=	--enable-libusb_1_0
+USB_CONFIGURE_OFF=	--enable-libusb=no
+V4L_LIB_DEPENDS=	libv4l1.so:${PORTSDIR}/multimedia/libv4l
+V4L_CONFIGURE_WITH=	v4l
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^for ac_header in/s|libc.h|cups/cups.h| ; \
-		 s|-e .*/cups.h|"$$ac_cv_header_cups_cups_h" = "yes"|' \
+	@${REINPLACE_CMD} -e '/for ac_header in/s|libc.h|sys/endian.h| ; \
+		 s|"$${have_linux_ioctl_defines}"|"$${have_libv4l1}"|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^dist_doc_DATA/s|COPYING||' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|HAVE_LIBC_H|HAVE_SYS_ENDIAN_H|' \
+		${WRKSRC}/include/sane/config.h.in
 	@${REINPLACE_CMD} -e '/^pkgconfigdir/s|@libdir@|@prefix@/libdata|' \
 		${WRKSRC}/tools/Makefile.in
 	@${REINPLACE_CMD} -e '/^export PKG_CONFIG_LIBDIR=/s|@libdir@|@prefix@/libdata|' \
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 5ccb7c49f75e..5ab69f5d992d 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sane-backends-1.0.24.tar.gz) = 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d
-SIZE (sane-backends-1.0.24.tar.gz) = 5778749
+SHA256 (sane-backends-1.0.25.tar.gz) = a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c
+SIZE (sane-backends-1.0.25.tar.gz) = 5955016
diff --git a/graphics/sane-backends/files/patch-backend__Makefile.in b/graphics/sane-backends/files/patch-backend__Makefile.in
index 8ded1b343d72..3381d32a8fc3 100644
--- a/graphics/sane-backends/files/patch-backend__Makefile.in
+++ b/graphics/sane-backends/files/patch-backend__Makefile.in
@@ -1,6 +1,6 @@
---- ./backend/Makefile.in.orig	2014-01-05 18:05:50.000000000 -0200
-+++ ./backend/Makefile.in	2014-01-05 18:06:53.000000000 -0200
-@@ -1470,7 +1470,7 @@
+--- backend/Makefile.in.orig	2015-10-11 21:13:46 UTC
++++ backend/Makefile.in
+@@ -1508,7 +1508,7 @@ AM_V_at = $(am__v_at_@AM_V@)
  am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
  am__v_at_0 = @
  am__v_at_1 = 
@@ -9,7 +9,7 @@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
  am__mv = mv -f
-@@ -5385,7 +5385,7 @@
+@@ -5567,7 +5567,7 @@ install-becfg:
  	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.  
  	@# Having two libsane's can cause issues so get rid of it.
  	-rm -f $(DESTDIR)$(sanelibdir)/libsane.*
@@ -18,7 +18,7 @@
  	test -z "$(configdir)/dll.d" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
  	@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
  	  if test ! -r $${cfg}; then continue; fi; \
-@@ -5393,7 +5393,7 @@
+@@ -5575,7 +5575,7 @@ install-becfg:
  	  echo NOT overwriting $${cfg} in $(configdir)...; \
  	  else \
  	  echo installing $${cfg} in $(configdir)/$${cfg}...; \
diff --git a/graphics/sane-backends/files/patch-backend__epson2-ops.c b/graphics/sane-backends/files/patch-backend__epson2-ops.c
index d02021dbc5b9..e53d4a8cae64 100644
--- a/graphics/sane-backends/files/patch-backend__epson2-ops.c
+++ b/graphics/sane-backends/files/patch-backend__epson2-ops.c
@@ -1,14 +1,14 @@
---- backend/epson2-ops.c.orig	2010-04-14 09:52:59.000000000 +0900
-+++ backend/epson2-ops.c	2010-05-10 21:59:04.000000000 +0900
-@@ -1219,6 +1219,7 @@
+--- backend/epson2-ops.c.orig	2015-09-19 15:18:44 UTC
++++ backend/epson2-ops.c
+@@ -1286,6 +1286,7 @@ e2_setup_block_mode(Epson_Scanner * s)
  
  	DBG(1, "max req size: %d, line count: %d\n", maxreq, s->lcount);
  
 +#if 0
  	/* XXX investigate this */
- 	if (s->lcount < 3 && e2_model(s, "GT-X800")) {
+ 	if (s->lcount < 3 && (e2_model(s, "GT-X800") || e2_model(s, "GT-X900") || e2_model(s, "GT-X980"))) {
  		s->lcount = 21;
-@@ -1226,6 +1227,7 @@
+@@ -1293,6 +1294,7 @@ e2_setup_block_mode(Epson_Scanner * s)
  		    "%s: set lcount = %i bigger than sanei_scsi_max_request_size\n",
  		    __func__, s->lcount);
  	}
diff --git a/graphics/sane-backends/files/patch-backend__kodakaio.c b/graphics/sane-backends/files/patch-backend__kodakaio.c
index 43e1e69cc235..029e6edd74c5 100644
--- a/graphics/sane-backends/files/patch-backend__kodakaio.c
+++ b/graphics/sane-backends/files/patch-backend__kodakaio.c
@@ -1,6 +1,6 @@
---- backend/kodakaio.c.orig	2012-08-10 09:33:29.000000000 +0900
-+++ backend/kodakaio.c	2012-08-29 16:35:36.000000000 +0900
-@@ -181,6 +181,10 @@
+--- backend/kodakaio.c.orig	2015-09-26 00:53:42 UTC
++++ backend/kodakaio.c
+@@ -207,6 +207,10 @@ normal levels. This system is a plan rat
  #include <math.h>
  #include <poll.h>
  #include <time.h>
@@ -11,62 +11,3 @@
  
  #if WITH_AVAHI
  /* used for auto detecting network printers  */
-@@ -2184,6 +2188,7 @@
-     AvahiLookupResultFlags flags,
-     AVAHI_GCC_UNUSED void* userdata) {
- 
-+	AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL;
- 	char *pidkey, *pidvalue;
- 	char *vidkey, *vidvalue;
- 	size_t valuesize;
-@@ -2204,20 +2209,40 @@
-             avahi_address_snprint(a, sizeof(a), address);
- 
- /* Output short for Kodak ESP */
--	DBG(min(10,DBG_AUTO), "%s:%u  %s  ", a,port,host_name);
--	avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), 
--		&vidkey, &vidvalue, &valuesize);
--	DBG(min(10,DBG_AUTO), "%s=%s  ", vidkey, vidvalue);
--	avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), 
--		&pidkey, &pidvalue, &valuesize);
--	DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
-+	DBG(min(10,DBG_AUTO), "%s:%u  %s\n", a,port,host_name);
-+
-+	vid_pair_list = avahi_string_list_find(txt, "vid");
-+	if(vid_pair_list != NULL) {
-+		avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize);
-+		DBG(min(10,DBG_AUTO), "%s=%s  ", vidkey, vidvalue);
-+	}
-+	else	DBG(min(10,DBG_AUTO), "failed to find key vid\n");
- 
-+	pid_pair_list = avahi_string_list_find(txt, "pid");
-+	if(pid_pair_list != NULL) {
-+		avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize);
-+		DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
-+	}
-+	else	DBG(min(10,DBG_AUTO), "failed to find key pid\n");
-+
-+	if(pid_pair_list != NULL && vid_pair_list != NULL) {
- 		ProcessAvahiDevice(name, vidvalue, pidvalue, a);
--	avahi_free(vidkey); avahi_free(vidvalue);
--	avahi_free(pidkey); avahi_free(pidvalue);
-+	}
-+	else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n");
-+
-+	if(vid_pair_list != NULL) {
-+		avahi_free(vidkey); 
-+		avahi_free(vidvalue);
-+		DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n");
-+	}
-+	if(pid_pair_list != NULL) {
-+		avahi_free(pidkey); 
-+		avahi_free(pidvalue);
-+		DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n");
-+	}
-         }
-     }
--
-+    DBG(min(10,DBG_AUTO), "ending resolve_callback\n");
-     avahi_service_resolver_free(r);
- }
- 
diff --git a/graphics/sane-backends/files/patch-backend__kvs40xx.h b/graphics/sane-backends/files/patch-backend__kvs40xx.h
index 37fd459a568d..d7acfeb593b4 100644
--- a/graphics/sane-backends/files/patch-backend__kvs40xx.h
+++ b/graphics/sane-backends/files/patch-backend__kvs40xx.h
@@ -1,5 +1,5 @@
---- backend/kvs40xx.h.orig	2012-08-20 05:27:18.000000000 +0900
-+++ backend/kvs40xx.h	2012-08-29 17:01:58.000000000 +0900
+--- backend/kvs40xx.h.orig	2013-08-25 21:22:58 UTC
++++ backend/kvs40xx.h
 @@ -10,6 +10,7 @@
  
  #include "../include/sane/config.h"
@@ -8,7 +8,7 @@
  
  #undef  BACKEND_NAME
  #define BACKEND_NAME kvs40xx
-@@ -208,7 +209,7 @@
+@@ -208,7 +209,7 @@ SANE_Status kvs40xx_read_image_data (str
  SANE_Status kvs40xx_document_exist (struct scanner *s);
  SANE_Status get_buffer_status (struct scanner *s, unsigned *data_avalible);
  SANE_Status kvs40xx_scan (struct scanner *s);
diff --git a/graphics/sane-backends/files/patch-backend__kvs40xx_opt.c b/graphics/sane-backends/files/patch-backend__kvs40xx_opt.c
index b3d8f5840e74..e3a767ac8c66 100644
--- a/graphics/sane-backends/files/patch-backend__kvs40xx_opt.c
+++ b/graphics/sane-backends/files/patch-backend__kvs40xx_opt.c
@@ -1,5 +1,5 @@
---- backend/kvs40xx_opt.c.orig	2012-08-10 09:33:29.000000000 +0900
-+++ backend/kvs40xx_opt.c	2012-08-29 16:57:47.000000000 +0900
+--- backend/kvs40xx_opt.c.orig	2013-08-25 21:22:58 UTC
++++ backend/kvs40xx_opt.c
 @@ -8,6 +8,7 @@
  
  #include "../include/sane/config.h"
diff --git a/graphics/sane-backends/files/patch-backend__niash.c b/graphics/sane-backends/files/patch-backend__niash.c
deleted file mode 100644
index 6820c6a1b220..000000000000
--- a/graphics/sane-backends/files/patch-backend__niash.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- backend/niash.c.orig	2006-02-04 12:34:28.000000000 +0100
-+++ backend/niash.c	2007-02-21 15:38:12.000000000 +0100
-@@ -89,7 +89,9 @@ typedef enum
-   optLamp,
- 
-   optCalibrate,
--  optGamma                      /* analog gamma = single number */
-+  optGamma,                     /* analog gamma = single number */
-+/* have optEndOfList only to define arrays with sufficient size */
-+  optEndOfList
- } EOptionIndex;
- 
- 
-@@ -105,8 +107,8 @@ typedef union
- 
- typedef struct
- {
--  SANE_Option_Descriptor aOptions[optLast];
--  TOptionValue aValues[optLast];
-+  SANE_Option_Descriptor aOptions[optEndOfList];
-+  TOptionValue aValues[optEndOfList];
- 
-   TScanParams ScanParams;
-   THWParams HWParams;
diff --git a/graphics/sane-backends/files/patch-backend__pieusb_buffer.c b/graphics/sane-backends/files/patch-backend__pieusb_buffer.c
new file mode 100644
index 000000000000..b50706834f3b
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend__pieusb_buffer.c
@@ -0,0 +1,24 @@
+--- backend/pieusb_buffer.c.orig	2015-09-01 00:31:33 UTC
++++ backend/pieusb_buffer.c
+@@ -100,6 +100,12 @@
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
++
++#ifdef HAVE_SYS_ENDIAN_H
++#include <sys/endian.h>
++#endif
++
++#ifdef HAVE_ENDIAN_H
+ #include <endian.h>
+ 
+ /* When creating the release backend, make complains about unresolved external
+@@ -110,6 +116,8 @@
+  #define le16toh(x) __bswap_16 (x)
+ #endif
+ 
++#endif
++
+ static void buffer_update_read_index(struct Pieusb_Read_Buffer* buffer, int increment);
+ 
+ /* READER */
diff --git a/graphics/sane-backends/files/patch-backend__v4l.c b/graphics/sane-backends/files/patch-backend__v4l.c
new file mode 100644
index 000000000000..3eae3e128372
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend__v4l.c
@@ -0,0 +1,13 @@
+--- backend/v4l.c.orig	2015-09-20 11:55:39 UTC
++++ backend/v4l.c
+@@ -72,7 +72,10 @@
+ #include "../include/sane/saneopts.h"
+ 
+ #include <sys/ioctl.h>
++
++#ifdef HAVE_ASM_TYPES_H
+ #include <asm/types.h>		/* XXX glibc */
++#endif
+ 
+ #define BACKEND_NAME v4l
+ #include "../include/sane/sanei_backend.h"
diff --git a/graphics/sane-backends/files/patch-include__sane__sane.h b/graphics/sane-backends/files/patch-include__sane__sane.h
index 440d3d71146e..a6a3e8bb76c4 100644
--- a/graphics/sane-backends/files/patch-include__sane__sane.h
+++ b/graphics/sane-backends/files/patch-include__sane__sane.h
@@ -1,6 +1,6 @@
---- include/sane/sane.h.orig	2009-04-24 04:59:23.000000000 +0900
-+++ include/sane/sane.h	2009-05-13 15:15:50.000000000 +0900
-@@ -115,6 +115,7 @@
+--- include/sane/sane.h.orig	2014-04-09 01:46:04 UTC
++++ include/sane/sane.h
+@@ -115,6 +115,7 @@ SANE_Device;
  #define SANE_CAP_AUTOMATIC		(1 << 4)
  #define SANE_CAP_INACTIVE		(1 << 5)
  #define SANE_CAP_ADVANCED		(1 << 6)
diff --git a/graphics/sane-backends/files/patch-include__sane__sanei_backend.h b/graphics/sane-backends/files/patch-include__sane__sanei_backend.h
new file mode 100644
index 000000000000..1ecd706de60e
--- /dev/null
+++ b/graphics/sane-backends/files/patch-include__sane__sanei_backend.h
@@ -0,0 +1,24 @@
+--- include/sane/sanei_backend.h.orig	2013-08-25 21:22:58 UTC
++++ include/sane/sanei_backend.h
+@@ -68,9 +68,11 @@
+ 
+ /* Just enough backwards compatibility that we get by in the backends
+    without making handstands.  */
++#if 0
+ # ifdef sigset_t
+ #  undef sigset_t
+ # endif
++#endif
+ # ifdef sigemptyset
+ #  undef sigemptyset
+ # endif
+@@ -96,7 +98,9 @@
+ #  undef SIG_SETMASK
+ # endif
+ 
++#if 0
+ # define sigset_t               int
++#endif
+ # define sigemptyset(set)       do { *(set) = 0; } while (0)
+ # define sigfillset(set)        do { *(set) = ~0; } while (0)
+ # define sigaddset(set,signal)  do { *(set) |= sigmask (signal); } while (0)
diff --git a/graphics/sane-backends/files/patch-sanei__sanei_ir.c b/graphics/sane-backends/files/patch-sanei__sanei_ir.c
new file mode 100644
index 000000000000..92f716e27caa
--- /dev/null
+++ b/graphics/sane-backends/files/patch-sanei__sanei_ir.c
@@ -0,0 +1,12 @@
+--- sanei/sanei_ir.c.orig	2015-09-29 01:10:43 UTC
++++ sanei/sanei_ir.c
+@@ -29,7 +29,8 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-#include <values.h>
++#include <float.h>
++#include <limits.h>
+ #include <math.h>
+ 
+ #define BACKEND_NAME sanei_ir	/* name of this module for debugging */
diff --git a/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c b/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c
index 0bbf7b17ba2c..6871e9d30fb0 100644
--- a/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c
+++ b/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c
@@ -1,6 +1,6 @@
---- sanei/sanei_pa4s2.c.orig	2010-04-05 22:18:06.000000000 +0900
-+++ sanei/sanei_pa4s2.c	2010-05-10 22:07:48.000000000 +0900
-@@ -109,6 +109,12 @@
+--- sanei/sanei_pa4s2.c.orig	2015-09-20 11:55:39 UTC
++++ sanei/sanei_pa4s2.c
+@@ -112,6 +112,12 @@ inb (u_long port)
  
  #endif /* HAVE_LIBIEEE1284 */
  
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index d6937e88a926..63099776b86d 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -2,6 +2,7 @@ bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
 bin/scanimage
+bin/umax_pp
 @sample etc/sane.d/dist/abaton.conf etc/sane.d/abaton.conf
 @sample etc/sane.d/dist/agfafocus.conf etc/sane.d/agfafocus.conf
 @sample etc/sane.d/dist/apple.conf etc/sane.d/apple.conf
@@ -26,6 +27,7 @@ bin/scanimage
 @sample etc/sane.d/dist/epjitsu.conf etc/sane.d/epjitsu.conf
 @sample etc/sane.d/dist/epson.conf etc/sane.d/epson.conf
 @sample etc/sane.d/dist/epson2.conf etc/sane.d/epson2.conf
+@sample etc/sane.d/dist/epsonds.conf etc/sane.d/epsonds.conf
 @sample etc/sane.d/dist/fujitsu.conf etc/sane.d/fujitsu.conf
 @sample etc/sane.d/dist/genesys.conf etc/sane.d/genesys.conf
 %%GPHOTO%%@sample etc/sane.d/dist/gphoto2.conf etc/sane.d/gphoto2.conf
@@ -53,6 +55,7 @@ bin/scanimage
 @sample etc/sane.d/dist/net.conf etc/sane.d/net.conf
 @sample etc/sane.d/dist/p5.conf etc/sane.d/p5.conf
 @sample etc/sane.d/dist/pie.conf etc/sane.d/pie.conf
+@sample etc/sane.d/dist/pieusb.conf etc/sane.d/pieusb.conf
 @sample etc/sane.d/dist/pixma.conf etc/sane.d/pixma.conf
 @sample etc/sane.d/dist/plustek.conf etc/sane.d/plustek.conf
 @sample etc/sane.d/dist/plustek_pp.conf etc/sane.d/plustek_pp.conf
@@ -76,264 +79,274 @@ bin/scanimage
 @sample etc/sane.d/dist/umax.conf etc/sane.d/umax.conf
 @sample etc/sane.d/dist/umax1220u.conf etc/sane.d/umax1220u.conf
 @sample etc/sane.d/dist/umax_pp.conf etc/sane.d/umax_pp.conf
+%%V4L%%@sample etc/sane.d/dist/v4l.conf etc/sane.d/v4l.conf
 @sample etc/sane.d/dist/xerox_mfp.conf etc/sane.d/xerox_mfp.conf
 include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.so
 lib/libsane.so.1
-lib/libsane.so.1.0.24
+lib/libsane.so.1.0.25
 lib/sane/libsane-abaton.so
 lib/sane/libsane-abaton.so.1
-lib/sane/libsane-abaton.so.1.0.24
+lib/sane/libsane-abaton.so.1.0.25
 lib/sane/libsane-agfafocus.so
 lib/sane/libsane-agfafocus.so.1
-lib/sane/libsane-agfafocus.so.1.0.24
+lib/sane/libsane-agfafocus.so.1.0.25
 lib/sane/libsane-apple.so
 lib/sane/libsane-apple.so.1
-lib/sane/libsane-apple.so.1.0.24
+lib/sane/libsane-apple.so.1.0.25
 lib/sane/libsane-artec.so
 lib/sane/libsane-artec.so.1
-lib/sane/libsane-artec.so.1.0.24
+lib/sane/libsane-artec.so.1.0.25
 lib/sane/libsane-artec_eplus48u.so
 lib/sane/libsane-artec_eplus48u.so.1
-lib/sane/libsane-artec_eplus48u.so.1.0.24
+lib/sane/libsane-artec_eplus48u.so.1.0.25
 lib/sane/libsane-as6e.so
 lib/sane/libsane-as6e.so.1
-lib/sane/libsane-as6e.so.1.0.24
+lib/sane/libsane-as6e.so.1.0.25
 lib/sane/libsane-avision.so
 lib/sane/libsane-avision.so.1
-lib/sane/libsane-avision.so.1.0.24
+lib/sane/libsane-avision.so.1.0.25
 lib/sane/libsane-bh.so
 lib/sane/libsane-bh.so.1
-lib/sane/libsane-bh.so.1.0.24
+lib/sane/libsane-bh.so.1.0.25
 lib/sane/libsane-canon.so
 lib/sane/libsane-canon.so.1
-lib/sane/libsane-canon.so.1.0.24
+lib/sane/libsane-canon.so.1.0.25
 lib/sane/libsane-canon630u.so
 lib/sane/libsane-canon630u.so.1
-lib/sane/libsane-canon630u.so.1.0.24
+lib/sane/libsane-canon630u.so.1.0.25
 lib/sane/libsane-canon_dr.so
 lib/sane/libsane-canon_dr.so.1
-lib/sane/libsane-canon_dr.so.1.0.24
+lib/sane/libsane-canon_dr.so.1.0.25
 %%IEEE1284%%lib/sane/libsane-canon_pp.so
 %%IEEE1284%%lib/sane/libsane-canon_pp.so.1
-%%IEEE1284%%lib/sane/libsane-canon_pp.so.1.0.24
+%%IEEE1284%%lib/sane/libsane-canon_pp.so.1.0.25
 lib/sane/libsane-cardscan.so
 lib/sane/libsane-cardscan.so.1
-lib/sane/libsane-cardscan.so.1.0.24
+lib/sane/libsane-cardscan.so.1.0.25
 lib/sane/libsane-coolscan.so
 lib/sane/libsane-coolscan.so.1
-lib/sane/libsane-coolscan.so.1.0.24
+lib/sane/libsane-coolscan.so.1.0.25
 lib/sane/libsane-coolscan2.so
 lib/sane/libsane-coolscan2.so.1
-lib/sane/libsane-coolscan2.so.1.0.24
+lib/sane/libsane-coolscan2.so.1.0.25
 lib/sane/libsane-coolscan3.so
 lib/sane/libsane-coolscan3.so.1
-lib/sane/libsane-coolscan3.so.1.0.24
+lib/sane/libsane-coolscan3.so.1.0.25
 lib/sane/libsane-dc210.so
 lib/sane/libsane-dc210.so.1
-lib/sane/libsane-dc210.so.1.0.24
+lib/sane/libsane-dc210.so.1.0.25
 lib/sane/libsane-dc240.so
 lib/sane/libsane-dc240.so.1
-lib/sane/libsane-dc240.so.1.0.24
+lib/sane/libsane-dc240.so.1.0.25
 lib/sane/libsane-dc25.so
 lib/sane/libsane-dc25.so.1
-lib/sane/libsane-dc25.so.1.0.24
+lib/sane/libsane-dc25.so.1.0.25
 lib/sane/libsane-dell1600n_net.so
 lib/sane/libsane-dell1600n_net.so.1
-lib/sane/libsane-dell1600n_net.so.1.0.24
+lib/sane/libsane-dell1600n_net.so.1.0.25
 lib/sane/libsane-dll.so
 lib/sane/libsane-dll.so.1
-lib/sane/libsane-dll.so.1.0.24
+lib/sane/libsane-dll.so.1.0.25
 lib/sane/libsane-dmc.so
 lib/sane/libsane-dmc.so.1
-lib/sane/libsane-dmc.so.1.0.24
+lib/sane/libsane-dmc.so.1.0.25
 lib/sane/libsane-epjitsu.so
 lib/sane/libsane-epjitsu.so.1
-lib/sane/libsane-epjitsu.so.1.0.24
+lib/sane/libsane-epjitsu.so.1.0.25
 lib/sane/libsane-epson.so
 lib/sane/libsane-epson.so.1
-lib/sane/libsane-epson.so.1.0.24
+lib/sane/libsane-epson.so.1.0.25
 lib/sane/libsane-epson2.so
 lib/sane/libsane-epson2.so.1
-lib/sane/libsane-epson2.so.1.0.24
+lib/sane/libsane-epson2.so.1.0.25
+lib/sane/libsane-epsonds.so
+lib/sane/libsane-epsonds.so.1
+lib/sane/libsane-epsonds.so.1.0.25
 lib/sane/libsane-fujitsu.so
 lib/sane/libsane-fujitsu.so.1
-lib/sane/libsane-fujitsu.so.1.0.24
+lib/sane/libsane-fujitsu.so.1.0.25
 lib/sane/libsane-genesys.so
 lib/sane/libsane-genesys.so.1
-lib/sane/libsane-genesys.so.1.0.24
+lib/sane/libsane-genesys.so.1.0.25
 %%GPHOTO%%lib/sane/libsane-gphoto2.so
 %%GPHOTO%%lib/sane/libsane-gphoto2.so.1
-%%GPHOTO%%lib/sane/libsane-gphoto2.so.1.0.24
+%%GPHOTO%%lib/sane/libsane-gphoto2.so.1.0.25
 lib/sane/libsane-gt68xx.so
 lib/sane/libsane-gt68xx.so.1
-lib/sane/libsane-gt68xx.so.1.0.24
+lib/sane/libsane-gt68xx.so.1.0.25
 lib/sane/libsane-hp.so
 lib/sane/libsane-hp.so.1
-lib/sane/libsane-hp.so.1.0.24
+lib/sane/libsane-hp.so.1.0.25
 lib/sane/libsane-hp3500.so
 lib/sane/libsane-hp3500.so.1
-lib/sane/libsane-hp3500.so.1.0.24
+lib/sane/libsane-hp3500.so.1.0.25
 lib/sane/libsane-hp3900.so
 lib/sane/libsane-hp3900.so.1
-lib/sane/libsane-hp3900.so.1.0.24
+lib/sane/libsane-hp3900.so.1.0.25
 lib/sane/libsane-hp4200.so
 lib/sane/libsane-hp4200.so.1
-lib/sane/libsane-hp4200.so.1.0.24
+lib/sane/libsane-hp4200.so.1.0.25
 lib/sane/libsane-hp5400.so
 lib/sane/libsane-hp5400.so.1
-lib/sane/libsane-hp5400.so.1.0.24
+lib/sane/libsane-hp5400.so.1.0.25
 lib/sane/libsane-hp5590.so
 lib/sane/libsane-hp5590.so.1
-lib/sane/libsane-hp5590.so.1.0.24
+lib/sane/libsane-hp5590.so.1.0.25
 lib/sane/libsane-hpljm1005.so
 lib/sane/libsane-hpljm1005.so.1
-lib/sane/libsane-hpljm1005.so.1.0.24
+lib/sane/libsane-hpljm1005.so.1.0.25
 %%IEEE1284%%lib/sane/libsane-hpsj5s.so
 %%IEEE1284%%lib/sane/libsane-hpsj5s.so.1
-%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1.0.24
+%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1.0.25
 lib/sane/libsane-hs2p.so
 lib/sane/libsane-hs2p.so.1
-lib/sane/libsane-hs2p.so.1.0.24
+lib/sane/libsane-hs2p.so.1.0.25
 lib/sane/libsane-ibm.so
 lib/sane/libsane-ibm.so.1
-lib/sane/libsane-ibm.so.1.0.24
+lib/sane/libsane-ibm.so.1.0.25
 lib/sane/libsane-kodak.so
 lib/sane/libsane-kodak.so.1
-lib/sane/libsane-kodak.so.1.0.24
+lib/sane/libsane-kodak.so.1.0.25
 lib/sane/libsane-kodakaio.so
 lib/sane/libsane-kodakaio.so.1
-lib/sane/libsane-kodakaio.so.1.0.24
+lib/sane/libsane-kodakaio.so.1.0.25
 lib/sane/libsane-kvs1025.so
 lib/sane/libsane-kvs1025.so.1
-lib/sane/libsane-kvs1025.so.1.0.24
+lib/sane/libsane-kvs1025.so.1.0.25
 lib/sane/libsane-kvs20xx.so
 lib/sane/libsane-kvs20xx.so.1
-lib/sane/libsane-kvs20xx.so.1.0.24
+lib/sane/libsane-kvs20xx.so.1.0.25
 lib/sane/libsane-kvs40xx.so
 lib/sane/libsane-kvs40xx.so.1
-lib/sane/libsane-kvs40xx.so.1.0.24
+lib/sane/libsane-kvs40xx.so.1.0.25
 lib/sane/libsane-leo.so
 lib/sane/libsane-leo.so.1
-lib/sane/libsane-leo.so.1.0.24
+lib/sane/libsane-leo.so.1.0.25
 lib/sane/libsane-lexmark.so
 lib/sane/libsane-lexmark.so.1
-lib/sane/libsane-lexmark.so.1.0.24
+lib/sane/libsane-lexmark.so.1.0.25
 lib/sane/libsane-ma1509.so
 lib/sane/libsane-ma1509.so.1
-lib/sane/libsane-ma1509.so.1.0.24
+lib/sane/libsane-ma1509.so.1.0.25
 lib/sane/libsane-magicolor.so
 lib/sane/libsane-magicolor.so.1
-lib/sane/libsane-magicolor.so.1.0.24
+lib/sane/libsane-magicolor.so.1.0.25
 lib/sane/libsane-matsushita.so
 lib/sane/libsane-matsushita.so.1
-lib/sane/libsane-matsushita.so.1.0.24
+lib/sane/libsane-matsushita.so.1.0.25
 lib/sane/libsane-microtek.so
 lib/sane/libsane-microtek.so.1
-lib/sane/libsane-microtek.so.1.0.24
+lib/sane/libsane-microtek.so.1.0.25
 lib/sane/libsane-microtek2.so
 lib/sane/libsane-microtek2.so.1
-lib/sane/libsane-microtek2.so.1.0.24
+lib/sane/libsane-microtek2.so.1.0.25
 lib/sane/libsane-mustek.so
 lib/sane/libsane-mustek.so.1
-lib/sane/libsane-mustek.so.1.0.24
+lib/sane/libsane-mustek.so.1.0.25
 %%IEEE1284%%lib/sane/libsane-mustek_pp.so
 %%IEEE1284%%lib/sane/libsane-mustek_pp.so.1
-%%IEEE1284%%lib/sane/libsane-mustek_pp.so.1.0.24
+%%IEEE1284%%lib/sane/libsane-mustek_pp.so.1.0.25
 lib/sane/libsane-mustek_usb.so
 lib/sane/libsane-mustek_usb.so.1
-lib/sane/libsane-mustek_usb.so.1.0.24
+lib/sane/libsane-mustek_usb.so.1.0.25
 lib/sane/libsane-mustek_usb2.so
 lib/sane/libsane-mustek_usb2.so.1
-lib/sane/libsane-mustek_usb2.so.1.0.24
+lib/sane/libsane-mustek_usb2.so.1.0.25
 lib/sane/libsane-nec.so
 lib/sane/libsane-nec.so.1
-lib/sane/libsane-nec.so.1.0.24
+lib/sane/libsane-nec.so.1.0.25
 lib/sane/libsane-net.so
 lib/sane/libsane-net.so.1
-lib/sane/libsane-net.so.1.0.24
+lib/sane/libsane-net.so.1.0.25
 lib/sane/libsane-niash.so
 lib/sane/libsane-niash.so.1
-lib/sane/libsane-niash.so.1.0.24
+lib/sane/libsane-niash.so.1.0.25
 lib/sane/libsane-p5.so
 lib/sane/libsane-p5.so.1
-lib/sane/libsane-p5.so.1.0.24
+lib/sane/libsane-p5.so.1.0.25
 lib/sane/libsane-pie.so
 lib/sane/libsane-pie.so.1
-lib/sane/libsane-pie.so.1.0.24
+lib/sane/libsane-pie.so.1.0.25
+lib/sane/libsane-pieusb.so
+lib/sane/libsane-pieusb.so.1
+lib/sane/libsane-pieusb.so.1.0.25
 lib/sane/libsane-pixma.so
 lib/sane/libsane-pixma.so.1
-lib/sane/libsane-pixma.so.1.0.24
+lib/sane/libsane-pixma.so.1.0.25
 lib/sane/libsane-plustek.so
 lib/sane/libsane-plustek.so.1
-lib/sane/libsane-plustek.so.1.0.24
+lib/sane/libsane-plustek.so.1.0.25
 lib/sane/libsane-plustek_pp.so
 lib/sane/libsane-plustek_pp.so.1
-lib/sane/libsane-plustek_pp.so.1.0.24
+lib/sane/libsane-plustek_pp.so.1.0.25
 lib/sane/libsane-ricoh.so
 lib/sane/libsane-ricoh.so.1
-lib/sane/libsane-ricoh.so.1.0.24
+lib/sane/libsane-ricoh.so.1.0.25
 lib/sane/libsane-rts8891.so
 lib/sane/libsane-rts8891.so.1
-lib/sane/libsane-rts8891.so.1.0.24
+lib/sane/libsane-rts8891.so.1.0.25
 lib/sane/libsane-s9036.so
 lib/sane/libsane-s9036.so.1
-lib/sane/libsane-s9036.so.1.0.24
+lib/sane/libsane-s9036.so.1.0.25
 lib/sane/libsane-sceptre.so
 lib/sane/libsane-sceptre.so.1
-lib/sane/libsane-sceptre.so.1.0.24
+lib/sane/libsane-sceptre.so.1.0.25
 lib/sane/libsane-sharp.so
 lib/sane/libsane-sharp.so.1
-lib/sane/libsane-sharp.so.1.0.24
+lib/sane/libsane-sharp.so.1.0.25
 lib/sane/libsane-sm3600.so
 lib/sane/libsane-sm3600.so.1
-lib/sane/libsane-sm3600.so.1.0.24
+lib/sane/libsane-sm3600.so.1.0.25
 lib/sane/libsane-sm3840.so
 lib/sane/libsane-sm3840.so.1
-lib/sane/libsane-sm3840.so.1.0.24
+lib/sane/libsane-sm3840.so.1.0.25
 lib/sane/libsane-snapscan.so
 lib/sane/libsane-snapscan.so.1
-lib/sane/libsane-snapscan.so.1.0.24
+lib/sane/libsane-snapscan.so.1.0.25
 lib/sane/libsane-sp15c.so
 lib/sane/libsane-sp15c.so.1
-lib/sane/libsane-sp15c.so.1.0.24
+lib/sane/libsane-sp15c.so.1.0.25
 lib/sane/libsane-st400.so
 lib/sane/libsane-st400.so.1
-lib/sane/libsane-st400.so.1.0.24
+lib/sane/libsane-st400.so.1.0.25
 lib/sane/libsane-stv680.so
 lib/sane/libsane-stv680.so.1
-lib/sane/libsane-stv680.so.1.0.24
+lib/sane/libsane-stv680.so.1.0.25
 lib/sane/libsane-tamarack.so
 lib/sane/libsane-tamarack.so.1
-lib/sane/libsane-tamarack.so.1.0.24
+lib/sane/libsane-tamarack.so.1.0.25
 lib/sane/libsane-teco1.so
 lib/sane/libsane-teco1.so.1
-lib/sane/libsane-teco1.so.1.0.24
+lib/sane/libsane-teco1.so.1.0.25
 lib/sane/libsane-teco2.so
 lib/sane/libsane-teco2.so.1
-lib/sane/libsane-teco2.so.1.0.24
+lib/sane/libsane-teco2.so.1.0.25
 lib/sane/libsane-teco3.so
 lib/sane/libsane-teco3.so.1
-lib/sane/libsane-teco3.so.1.0.24
+lib/sane/libsane-teco3.so.1.0.25
 lib/sane/libsane-test.so
 lib/sane/libsane-test.so.1
-lib/sane/libsane-test.so.1.0.24
+lib/sane/libsane-test.so.1.0.25
 lib/sane/libsane-u12.so
 lib/sane/libsane-u12.so.1
-lib/sane/libsane-u12.so.1.0.24
+lib/sane/libsane-u12.so.1.0.25
 lib/sane/libsane-umax.so
 lib/sane/libsane-umax.so.1
-lib/sane/libsane-umax.so.1.0.24
+lib/sane/libsane-umax.so.1.0.25
 lib/sane/libsane-umax1220u.so
 lib/sane/libsane-umax1220u.so.1
-lib/sane/libsane-umax1220u.so.1.0.24
+lib/sane/libsane-umax1220u.so.1.0.25
 lib/sane/libsane-umax_pp.so
 lib/sane/libsane-umax_pp.so.1
-lib/sane/libsane-umax_pp.so.1.0.24
+lib/sane/libsane-umax_pp.so.1.0.25
+%%V4L%%lib/sane/libsane-v4l.so
+%%V4L%%lib/sane/libsane-v4l.so.1
+%%V4L%%lib/sane/libsane-v4l.so.1.0.25
 lib/sane/libsane-xerox_mfp.so
 lib/sane/libsane-xerox_mfp.so.1
-lib/sane/libsane-xerox_mfp.so.1.0.24
+lib/sane/libsane-xerox_mfp.so.1.0.25
 libdata/pkgconfig/sane-backends.pc
 man/man1/gamma4scanimage.1.gz
 man/man1/sane-config.1.gz
@@ -363,6 +376,7 @@ man/man5/sane-dmc.5.gz
 man/man5/sane-epjitsu.5.gz
 man/man5/sane-epson.5.gz
 man/man5/sane-epson2.5.gz
+man/man5/sane-epsonds.5.gz
 man/man5/sane-fujitsu.5.gz
 man/man5/sane-genesys.5.gz
 %%GPHOTO%%man/man5/sane-gphoto2.5.gz
@@ -398,6 +412,7 @@ man/man5/sane-net.5.gz
 man/man5/sane-niash.5.gz
 man/man5/sane-p5.5.gz
 man/man5/sane-pie.5.gz
+man/man5/sane-pieusb.5.gz
 man/man5/sane-pixma.5.gz
 man/man5/sane-plustek.5.gz
 man/man5/sane-plustek_pp.5.gz
@@ -423,6 +438,7 @@ man/man5/sane-umax.5.gz
 man/man5/sane-umax1220u.5.gz
 man/man5/sane-umax_pp.5.gz
 man/man5/sane-usb.5.gz
+%%V4L%%man/man5/sane-v4l.5.gz
 man/man5/sane-xerox_mfp.5.gz
 man/man7/sane.7.gz
 man/man8/saned.8.gz
@@ -437,6 +453,7 @@ sbin/saned
 %%NLS%%share/locale/fi/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/it/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/sane-backends.mo