Attachment #162089 for bug #203799

View | Details | Raw Unified | Return to bug 203799
Collapse All | Expand All




# $FreeBSD: head/graphics/sane-backends/Makefile 364213 2014-08-06 18:34:42Z tijl $

PORTNAME=	sane-backends
PORTVERSION=	1.0.25
PORTREVISION=	3
CATEGORIES=	graphics
MASTER_SITES=	https://alioth.debian.org/frs/download.php/4146/ \
		http://fossies.org/linux/misc/

MAINTAINER=	ports@FreeBSD.org


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

USES=		gmake libtool pathfix pkgconfig
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} \
		--disable-latex \
		--disable-locking \
		--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

USERS=	saned
GROUPS=	saned

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

SUB_FILES=	pkg-message
AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app

USERS=	saned
GROUPS=	saned

PORTDOCS=	*
GPHOTO_LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2

OPTIONS_DEFINE=		AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
OPTIONS_DEFAULT=	USB
OPTIONS_SUB=		yes

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
NLS_CONFIGURE_ENABLE=	translations
SNMP_CONFIGURE_WITH=	snmp
SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
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
CONFIGURE_ENV+=		ac_cv_header_cups_cups_h=no
.endif

.if ! ${PORT_OPTIONS:MIEEE1284}
CONFIGURE_ENV+=		sane_cv_use_libieee1284=no
.endif

post-patch:
	@${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|' \

Lines 1-2 Link Here

(-)graphics/sane-backends/distinfo (-2 / +2 lines)
1	SHA256 (sane-backends-1.0.24.tar.gz) = 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d	1	SHA256 (sane-backends-1.0.25.tar.gz) = a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c
2	SIZE (sane-backends-1.0.24.tar.gz) = 5778749	2	SIZE (sane-backends-1.0.25.tar.gz) = 5955016




--- 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 = 

 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -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.*

 	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; \
@@ -5575,7 +5575,7 @@ install-becfg:
 	  echo NOT overwriting $${cfg} in $(configdir)...; \
 	  else \
 	  echo installing $${cfg} in $(configdir)/$${cfg}...; \




--- 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") || e2_model(s, "GT-X900") || e2_model(s, "GT-X980"))) {
 		s->lcount = 21;
@@ -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);
 	}




--- 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>

 
 #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);
 }
 

Lines 1-5 Link Here

(-)graphics/sane-backends/files/patch-backend__kvs40xx.h (-3 / +3 lines)
1	--- backend/kvs40xx.h.orig 2012-08-20 05:27:18.000000000 +0900	1	--- backend/kvs40xx.h.orig 2013-08-25 21:22:58 UTC
2	+++ backend/kvs40xx.h 2012-08-29 17:01:58.000000000 +0900	2	+++ backend/kvs40xx.h
3	@@ -10,6 +10,7 @@	3	@@ -10,6 +10,7 @@
4		4
5	#include "../include/sane/config.h"	5	#include "../include/sane/config.h"
Lines 8-14 Link Here
8		8
9	#undef BACKEND_NAME	9	#undef BACKEND_NAME
10	#define BACKEND_NAME kvs40xx	10	#define BACKEND_NAME kvs40xx
11	@@ -208,7 +209,7 @@	11	@@ -208,7 +209,7 @@ SANE_Status kvs40xx_read_image_data (str
12	SANE_Status kvs40xx_document_exist (struct scanner *s);	12	SANE_Status kvs40xx_document_exist (struct scanner *s);
13	SANE_Status get_buffer_status (struct scanner s, unsigned data_avalible);	13	SANE_Status get_buffer_status (struct scanner s, unsigned data_avalible);
14	SANE_Status kvs40xx_scan (struct scanner *s);	14	SANE_Status kvs40xx_scan (struct scanner *s);

Lines 1-5 Link Here

(-)graphics/sane-backends/files/patch-backend__kvs40xx_opt.c (-2 / +2 lines)
1	--- backend/kvs40xx_opt.c.orig 2012-08-10 09:33:29.000000000 +0900	1	--- backend/kvs40xx_opt.c.orig 2013-08-25 21:22:58 UTC
2	+++ backend/kvs40xx_opt.c 2012-08-29 16:57:47.000000000 +0900	2	+++ backend/kvs40xx_opt.c
3	@@ -8,6 +8,7 @@	3	@@ -8,6 +8,7 @@
4		4
5	#include "../include/sane/config.h"	5	#include "../include/sane/config.h"




--- 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;




--- 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 */




--- 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"

Lines 1-6 Link Here

(-)graphics/sane-backends/files/patch-include__sane__sane.h (-3 / +3 lines)
1	--- include/sane/sane.h.orig 2009-04-24 04:59:23.000000000 +0900	1	--- include/sane/sane.h.orig 2014-04-09 01:46:04 UTC
2	+++ include/sane/sane.h 2009-05-13 15:15:50.000000000 +0900	2	+++ include/sane/sane.h
3	@@ -115,6 +115,7 @@	3	@@ -115,6 +115,7 @@ SANE_Device;
4	#define SANE_CAP_AUTOMATIC (1 << 4)	4	#define SANE_CAP_AUTOMATIC (1 << 4)
5	#define SANE_CAP_INACTIVE (1 << 5)	5	#define SANE_CAP_INACTIVE (1 << 5)
6	#define SANE_CAP_ADVANCED (1 << 6)	6	#define SANE_CAP_ADVANCED (1 << 6)




--- 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)




--- 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 */

Lines 1-6 Link Here

(-)graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c (-3 / +3 lines)
1	--- sanei/sanei_pa4s2.c.orig 2010-04-05 22:18:06.000000000 +0900	1	--- sanei/sanei_pa4s2.c.orig 2015-09-20 11:55:39 UTC
2	+++ sanei/sanei_pa4s2.c 2010-05-10 22:07:48.000000000 +0900	2	+++ sanei/sanei_pa4s2.c
3	@@ -109,6 +109,12 @@	3	@@ -112,6 +112,12 @@ inb (u_long port)
4		4
5	#endif /* HAVE_LIBIEEE1284 */	5	#endif /* HAVE_LIBIEEE1284 */
6		6




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

@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

@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

@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.25
lib/sane/libsane-abaton.so
lib/sane/libsane-abaton.so.1
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.25
lib/sane/libsane-apple.so
lib/sane/libsane-apple.so.1
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.25
lib/sane/libsane-artec_eplus48u.so
lib/sane/libsane-artec_eplus48u.so.1
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.25
lib/sane/libsane-avision.so
lib/sane/libsane-avision.so.1
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.25
lib/sane/libsane-canon.so
lib/sane/libsane-canon.so.1
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.25
lib/sane/libsane-canon_dr.so
lib/sane/libsane-canon_dr.so.1
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.25
lib/sane/libsane-cardscan.so
lib/sane/libsane-cardscan.so.1
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.25
lib/sane/libsane-coolscan2.so
lib/sane/libsane-coolscan2.so.1
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.25
lib/sane/libsane-dc210.so
lib/sane/libsane-dc210.so.1
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.25
lib/sane/libsane-dc25.so
lib/sane/libsane-dc25.so.1
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.25
lib/sane/libsane-dll.so
lib/sane/libsane-dll.so.1
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.25
lib/sane/libsane-epjitsu.so
lib/sane/libsane-epjitsu.so.1
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.25
lib/sane/libsane-epson2.so
lib/sane/libsane-epson2.so.1
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.25
lib/sane/libsane-genesys.so
lib/sane/libsane-genesys.so.1
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.25
lib/sane/libsane-gt68xx.so
lib/sane/libsane-gt68xx.so.1
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.25
lib/sane/libsane-hp3500.so
lib/sane/libsane-hp3500.so.1
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.25
lib/sane/libsane-hp4200.so
lib/sane/libsane-hp4200.so.1
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.25
lib/sane/libsane-hp5590.so
lib/sane/libsane-hp5590.so.1
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.25
%%IEEE1284%%lib/sane/libsane-hpsj5s.so
%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1
%%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.25
lib/sane/libsane-ibm.so
lib/sane/libsane-ibm.so.1
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.25
lib/sane/libsane-kodakaio.so
lib/sane/libsane-kodakaio.so.1
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.25
lib/sane/libsane-kvs20xx.so
lib/sane/libsane-kvs20xx.so.1
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.25
lib/sane/libsane-leo.so
lib/sane/libsane-leo.so.1
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.25
lib/sane/libsane-ma1509.so
lib/sane/libsane-ma1509.so.1
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.25
lib/sane/libsane-matsushita.so
lib/sane/libsane-matsushita.so.1
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.25
lib/sane/libsane-microtek2.so
lib/sane/libsane-microtek2.so.1
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.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.25
lib/sane/libsane-mustek_usb.so
lib/sane/libsane-mustek_usb.so.1
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.25
lib/sane/libsane-nec.so
lib/sane/libsane-nec.so.1
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.25
lib/sane/libsane-niash.so
lib/sane/libsane-niash.so.1
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.25
lib/sane/libsane-pie.so
lib/sane/libsane-pie.so.1
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.25
lib/sane/libsane-plustek.so
lib/sane/libsane-plustek.so.1
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.25
lib/sane/libsane-ricoh.so
lib/sane/libsane-ricoh.so.1
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.25
lib/sane/libsane-s9036.so
lib/sane/libsane-s9036.so.1
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.25
lib/sane/libsane-sharp.so
lib/sane/libsane-sharp.so.1
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.25
lib/sane/libsane-sm3840.so
lib/sane/libsane-sm3840.so.1
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.25
lib/sane/libsane-sp15c.so
lib/sane/libsane-sp15c.so.1
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.25
lib/sane/libsane-stv680.so
lib/sane/libsane-stv680.so.1
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.25
lib/sane/libsane-teco1.so
lib/sane/libsane-teco1.so.1
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.25
lib/sane/libsane-teco3.so
lib/sane/libsane-teco3.so.1
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.25
lib/sane/libsane-u12.so
lib/sane/libsane-u12.so.1
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.25
lib/sane/libsane-umax1220u.so
lib/sane/libsane-umax1220u.so.1
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.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.25
libdata/pkgconfig/sane-backends.pc
man/man1/gamma4scanimage.1.gz
man/man1/sane-config.1.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

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

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

%%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

Return to bug 203799

Lines 2-11 Link Here

(-)graphics/sane-backends/Makefile (-43 / +31 lines)
2	# $FreeBSD: head/graphics/sane-backends/Makefile 364213 2014-08-06 18:34:42Z tijl $	2	# $FreeBSD: head/graphics/sane-backends/Makefile 364213 2014-08-06 18:34:42Z tijl $
3		3
4	PORTNAME= sane-backends	4	PORTNAME= sane-backends
5	PORTVERSION= 1.0.24	5	PORTVERSION= 1.0.25
6	PORTREVISION= 3
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= http://alioth.debian.org/frs/download.php/3958/ \	7	MASTER_SITES= https://alioth.debian.org/frs/download.php/4146/ \
9	http://fossies.org/linux/misc/	8	http://fossies.org/linux/misc/
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
Lines 13-82 Link Here
13		12
14	LICENSE= GPLv2 # (or later)	13	LICENSE= GPLv2 # (or later)
15		14
16	LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \	15	LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff
17	libv4l1.so:${PORTSDIR}/multimedia/libv4l
18
19	OPTIONS_DEFINE= AVAHI CUPS DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB
20	OPTIONS_DEFAULT= USB IPV6
21	OPTIONS_SUB= yes
22	IEEE1284_DESC= Parallel port support via libieee1284
23	USB_DESC= USB support
24		16
		17	USES= gmake libtool pathfix pkgconfig
25	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
26	CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \	19	CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \
27	--disable-latex \	20	--disable-latex \
28	--disable-locking \	21	--disable-locking \
29	--enable-pthread	22	--enable-pthread \
		23	--without-systemd
30	INSTALL_TARGET= install-strip	24	INSTALL_TARGET= install-strip
31	USES= gmake libtool pathfix pkgconfig
32	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
33
34	PORTDOCS= *
35	USE_RC_SUBR= saned	26	USE_RC_SUBR= saned
36	SUB_FILES+= pkg-message
37
38	USERS= saned
39	GROUPS= saned
40		27
41	CPPFLAGS+= -I${LOCALBASE}/include	28	CPPFLAGS+= -I${LOCALBASE}/include
42	LDFLAGS+= -L${LOCALBASE}/lib	29	LDFLAGS+= -L${LOCALBASE}/lib
43		30
44	AVAHI_CONFIGURE_ENABLE= avahi	31	SUB_FILES= pkg-message
45	AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app
46		32
47	CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client	33	USERS= saned
		34	GROUPS= saned
48		35
49	GPHOTO_CONFIGURE_OFF= --with-gphoto2=no	36	PORTDOCS= *
50	GPHOTO_LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
51		37
52	IEEE1284_LIB_DEPENDS= libieee1284.so:${PORTSDIR}/sysutils/libieee1284	38	OPTIONS_DEFINE= AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
		39	OPTIONS_DEFAULT= USB
		40	OPTIONS_SUB= yes
53		41
		42	AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app
		43	AVAHI_CONFIGURE_ENABLE= avahi
		44	GPHOTO_LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
		45	GPHOTO_CONFIGURE_OFF= --with-gphoto2=no
		46	IEEE1284_DESC= Parallel port support via libieee1284
		47	IEEE1284_LIB_DEPENDS= libieee1284.so:${PORTSDIR}/sysutils/libieee1284
		48	IEEE1284_CONFIGURE_ENV_OFF= sane_cv_use_libieee1284=no
54	IPV6_CONFIGURE_ENABLE= ipv6	49	IPV6_CONFIGURE_ENABLE= ipv6
55
56	NLS_CONFIGURE_ENABLE= translations
57	NLS_USES= gettext	50	NLS_USES= gettext
58		51	NLS_CONFIGURE_ENABLE= translations
59	SNMP_CONFIGURE_WITH= snmp
60	SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp	52	SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
61		53	SNMP_CONFIGURE_WITH= snmp
62	USB_CONFIGURE_ENABLE= libusb	54	USB_DESC= USB support
63		55	USB_CONFIGURE_ON= --enable-libusb_1_0
64	.include <bsd.port.options.mk>	56	USB_CONFIGURE_OFF= --enable-libusb=no
65		57	V4L_LIB_DEPENDS= libv4l1.so:${PORTSDIR}/multimedia/libv4l
66	.if ! ${PORT_OPTIONS:MCUPS}	58	V4L_CONFIGURE_WITH= v4l
67	CONFIGURE_ENV+= ac_cv_header_cups_cups_h=no
68	.endif
69
70	.if ! ${PORT_OPTIONS:MIEEE1284}
71	CONFIGURE_ENV+= sane_cv_use_libieee1284=no
72	.endif
73		59
74	post-patch:	60	post-patch:
75	@${REINPLACE_CMD} -e '/^for ac_header in/s\|libc.h\|cups/cups.h\| ; \	61	@${REINPLACE_CMD} -e '/for ac_header in/s\|libc.h\|sys/endian.h\| ; \
76	s\|-e .*/cups.h\|"$$ac_cv_header_cups_cups_h" = "yes"\|' \	62	s\|"$${have_linux_ioctl_defines}"\|"$${have_libv4l1}"\|' \
77	${WRKSRC}/configure	63	${WRKSRC}/configure
78	@${REINPLACE_CMD} -e '/^dist_doc_DATA/s\|COPYING\|\|' \	64	@${REINPLACE_CMD} -e '/^dist_doc_DATA/s\|COPYING\|\|' \
79	${WRKSRC}/Makefile.in	65	${WRKSRC}/Makefile.in
		66	@${REINPLACE_CMD} -e 's\|HAVE_LIBC_H\|HAVE_SYS_ENDIAN_H\|' \
		67	${WRKSRC}/include/sane/config.h.in
80	@${REINPLACE_CMD} -e '/^pkgconfigdir/s\|@libdir@\|@prefix@/libdata\|' \	68	@${REINPLACE_CMD} -e '/^pkgconfigdir/s\|@libdir@\|@prefix@/libdata\|' \
81	${WRKSRC}/tools/Makefile.in	69	${WRKSRC}/tools/Makefile.in
82	@${REINPLACE_CMD} -e '/^export PKG_CONFIG_LIBDIR=/s\|@libdir@\|@prefix@/libdata\|' \	70	@${REINPLACE_CMD} -e '/^export PKG_CONFIG_LIBDIR=/s\|@libdir@\|@prefix@/libdata\|' \

Lines 1-6 Link Here

(-)graphics/sane-backends/files/patch-backend__Makefile.in (-5 / +5 lines)
1	--- ./backend/Makefile.in.orig 2014-01-05 18:05:50.000000000 -0200	1	--- backend/Makefile.in.orig 2015-10-11 21:13:46 UTC
2	+++ ./backend/Makefile.in 2014-01-05 18:06:53.000000000 -0200	2	+++ backend/Makefile.in
3	@@ -1470,7 +1470,7 @@	3	@@ -1508,7 +1508,7 @@ AM_V_at = $(am__v_at_@AM_V@)
4	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)	4	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
5	am__v_at_0 = @	5	am__v_at_0 = @
6	am__v_at_1 =	6	am__v_at_1 =
Lines 9-15 Link Here
9	depcomp = $(SHELL) $(top_srcdir)/depcomp	9	depcomp = $(SHELL) $(top_srcdir)/depcomp
10	am__depfiles_maybe = depfiles	10	am__depfiles_maybe = depfiles
11	am__mv = mv -f	11	am__mv = mv -f
12	@@ -5385,7 +5385,7 @@	12	@@ -5567,7 +5567,7 @@ install-becfg:
13	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.	13	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
14	@# Having two libsane's can cause issues so get rid of it.	14	@# Having two libsane's can cause issues so get rid of it.
15	-rm -f $(DESTDIR)$(sanelibdir)/libsane.*	15	-rm -f $(DESTDIR)$(sanelibdir)/libsane.*
Lines 18-24 Link Here
18	test -z "$(configdir)/dll.d" \|\| $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"	18	test -z "$(configdir)/dll.d" \|\| $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
19	@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \	19	@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
20	if test ! -r $${cfg}; then continue; fi; \	20	if test ! -r $${cfg}; then continue; fi; \
21	@@ -5393,7 +5393,7 @@	21	@@ -5575,7 +5575,7 @@ install-becfg:
22	echo NOT overwriting $${cfg} in $(configdir)...; \	22	echo NOT overwriting $${cfg} in $(configdir)...; \
23	else \	23	else \
24	echo installing $${cfg} in $(configdir)/$${cfg}...; \	24	echo installing $${cfg} in $(configdir)/$${cfg}...; \

Lines 1-14 Link Here

(-)graphics/sane-backends/files/patch-backend__epson2-ops.c (-5 / +5 lines)
1	--- backend/epson2-ops.c.orig 2010-04-14 09:52:59.000000000 +0900	1	--- backend/epson2-ops.c.orig 2015-09-19 15:18:44 UTC
2	+++ backend/epson2-ops.c 2010-05-10 21:59:04.000000000 +0900	2	+++ backend/epson2-ops.c
3	@@ -1219,6 +1219,7 @@	3	@@ -1286,6 +1286,7 @@ e2_setup_block_mode(Epson_Scanner * s)
4		4
5	DBG(1, "max req size: %d, line count: %d\n", maxreq, s->lcount);	5	DBG(1, "max req size: %d, line count: %d\n", maxreq, s->lcount);
6		6
7	+#if 0	7	+#if 0
8	/* XXX investigate this */	8	/* XXX investigate this */
9	if (s->lcount < 3 && e2_model(s, "GT-X800")) {	9	if (s->lcount < 3 && (e2_model(s, "GT-X800") \|\| e2_model(s, "GT-X900") \|\| e2_model(s, "GT-X980"))) {
10	s->lcount = 21;	10	s->lcount = 21;
11	@@ -1226,6 +1227,7 @@	11	@@ -1293,6 +1294,7 @@ e2_setup_block_mode(Epson_Scanner * s)
12	"%s: set lcount = %i bigger than sanei_scsi_max_request_size\n",	12	"%s: set lcount = %i bigger than sanei_scsi_max_request_size\n",
13	__func__, s->lcount);	13	__func__, s->lcount);
14	}	14	}

Lines 1-6 Link Here

(-)graphics/sane-backends/files/patch-backend__kodakaio.c (-62 / +3 lines)
1	--- backend/kodakaio.c.orig 2012-08-10 09:33:29.000000000 +0900	1	--- backend/kodakaio.c.orig 2015-09-26 00:53:42 UTC
2	+++ backend/kodakaio.c 2012-08-29 16:35:36.000000000 +0900	2	+++ backend/kodakaio.c
3	@@ -181,6 +181,10 @@	3	@@ -207,6 +207,10 @@ normal levels. This system is a plan rat
4	#include <math.h>	4	#include <math.h>
5	#include <poll.h>	5	#include <poll.h>
6	#include <time.h>	6	#include <time.h>
Lines 11-72 Link Here
11		11
12	#if WITH_AVAHI	12	#if WITH_AVAHI
13	/* used for auto detecting network printers */	13	/* used for auto detecting network printers */
14	@@ -2184,6 +2188,7 @@
15	AvahiLookupResultFlags flags,
16	AVAHI_GCC_UNUSED void* userdata) {
17
18	+ AvahiStringList vid_pair_list = NULL, pid_pair_list = NULL;
19	char pidkey, pidvalue;
20	char vidkey, vidvalue;
21	size_t valuesize;
22	@@ -2204,20 +2209,40 @@
23	avahi_address_snprint(a, sizeof(a), address);
24
25	/* Output short for Kodak ESP */
26	- DBG(min(10,DBG_AUTO), "%s:%u %s ", a,port,host_name);
27	- avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"),
28	- &vidkey, &vidvalue, &valuesize);
29	- DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue);
30	- avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"),
31	- &pidkey, &pidvalue, &valuesize);
32	- DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
33	+ DBG(min(10,DBG_AUTO), "%s:%u %s\n", a,port,host_name);
34	+
35	+ vid_pair_list = avahi_string_list_find(txt, "vid");
36	+ if(vid_pair_list != NULL) {
37	+ avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize);
38	+ DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue);
39	+ }
40	+ else DBG(min(10,DBG_AUTO), "failed to find key vid\n");
41
42	+ pid_pair_list = avahi_string_list_find(txt, "pid");
43	+ if(pid_pair_list != NULL) {
44	+ avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize);
45	+ DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
46	+ }
47	+ else DBG(min(10,DBG_AUTO), "failed to find key pid\n");
48	+
49	+ if(pid_pair_list != NULL && vid_pair_list != NULL) {
50	ProcessAvahiDevice(name, vidvalue, pidvalue, a);
51	- avahi_free(vidkey); avahi_free(vidvalue);
52	- avahi_free(pidkey); avahi_free(pidvalue);
53	+ }
54	+ else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n");
55	+
56	+ if(vid_pair_list != NULL) {
57	+ avahi_free(vidkey);
58	+ avahi_free(vidvalue);
59	+ DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n");
60	+ }
61	+ if(pid_pair_list != NULL) {
62	+ avahi_free(pidkey);
63	+ avahi_free(pidvalue);
64	+ DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n");
65	+ }
66	}
67	}
68	-
69	+ DBG(min(10,DBG_AUTO), "ending resolve_callback\n");
70	avahi_service_resolver_free(r);
71	}
72

Lines 1-24 Link Here

(-)graphics/sane-backends/files/patch-backend__niash.c (-24 lines)
1	--- backend/niash.c.orig 2006-02-04 12:34:28.000000000 +0100
2	+++ backend/niash.c 2007-02-21 15:38:12.000000000 +0100
3	@@ -89,7 +89,9 @@ typedef enum
4	optLamp,
5
6	optCalibrate,
7	- optGamma /* analog gamma = single number */
8	+ optGamma, /* analog gamma = single number */
9	+/* have optEndOfList only to define arrays with sufficient size */
10	+ optEndOfList
11	} EOptionIndex;
12
13
14	@@ -105,8 +107,8 @@ typedef union
15
16	typedef struct
17	{
18	- SANE_Option_Descriptor aOptions[optLast];
19	- TOptionValue aValues[optLast];
20	+ SANE_Option_Descriptor aOptions[optEndOfList];
21	+ TOptionValue aValues[optEndOfList];
22
23	TScanParams ScanParams;
24	THWParams HWParams;

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__pieusb_buffer.c (+24 lines)
	1	--- backend/pieusb_buffer.c.orig 2015-09-01 00:31:33 UTC
	2	+++ backend/pieusb_buffer.c
	3	@@ -100,6 +100,12 @@
	4	#include <stdio.h>
	5	#include <fcntl.h>
	6	#include <sys/mman.h>
	7	+
	8	+#ifdef HAVE_SYS_ENDIAN_H
	9	+#include <sys/endian.h>
	10	+#endif
	11	+
	12	+#ifdef HAVE_ENDIAN_H
	13	#include <endian.h>
	14
	15	/* When creating the release backend, make complains about unresolved external
	16	@@ -110,6 +116,8 @@
	17	#define le16toh(x) __bswap_16 (x)
	18	#endif
	19
	20	+#endif
	21	+
	22	static void buffer_update_read_index(struct Pieusb_Read_Buffer* buffer, int increment);
	23
	24	/* READER */

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__v4l.c (+13 lines)
	1	--- backend/v4l.c.orig 2015-09-20 11:55:39 UTC
	2	+++ backend/v4l.c
	3	@@ -72,7 +72,10 @@
	4	#include "../include/sane/saneopts.h"
	5
	6	#include <sys/ioctl.h>
	7	+
	8	+#ifdef HAVE_ASM_TYPES_H
	9	#include <asm/types.h> /* XXX glibc */
	10	+#endif
	11
	12	#define BACKEND_NAME v4l
	13	#include "../include/sane/sanei_backend.h"

Line 0 Link Here

(-)graphics/sane-backends/files/patch-include__sane__sanei_backend.h (+24 lines)
	1	--- include/sane/sanei_backend.h.orig 2013-08-25 21:22:58 UTC
	2	+++ include/sane/sanei_backend.h
	3	@@ -68,9 +68,11 @@
	4
	5	/* Just enough backwards compatibility that we get by in the backends
	6	without making handstands. */
	7	+#if 0
	8	# ifdef sigset_t
	9	# undef sigset_t
	10	# endif
	11	+#endif
	12	# ifdef sigemptyset
	13	# undef sigemptyset
	14	# endif
	15	@@ -96,7 +98,9 @@
	16	# undef SIG_SETMASK
	17	# endif
	18
	19	+#if 0
	20	# define sigset_t int
	21	+#endif
	22	# define sigemptyset(set) do { *(set) = 0; } while (0)
	23	# define sigfillset(set) do { *(set) = ~0; } while (0)
	24	# define sigaddset(set,signal) do { *(set) \|= sigmask (signal); } while (0)

Line 0 Link Here

(-)graphics/sane-backends/files/patch-sanei__sanei_ir.c (+12 lines)
	1	--- sanei/sanei_ir.c.orig 2015-09-29 01:10:43 UTC
	2	+++ sanei/sanei_ir.c
	3	@@ -29,7 +29,8 @@
	4
	5	#include <stdlib.h>
	6	#include <string.h>
	7	-#include <values.h>
	8	+#include <float.h>
	9	+#include <limits.h>
	10	#include <math.h>
	11
	12	#define BACKEND_NAME sanei_ir /* name of this module for debugging */