Attachment #200178 for bug #229653





PORTNAME=	sane-backends
PORTVERSION=	1.0.27
PORTREVISION=	5
CATEGORIES=	graphics
MASTER_SITES=	http://fossies.org/linux/misc/
		http://fossies.org/linux/misc/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	API for access to scanners, digitals camera, frame grabbers etc

		libtiff.so:graphics/tiff

USES=		gmake jpeg libtool localbase pathfix pkgconfig

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-locking \
		--disable-latex \
		--disable-locking \
		--enable-pthread \
		--without-systemd
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	yes
USE_RC_SUBR=	saned
WRKSRC=		${WRKDIR}/${PORTNAME}-1.0.25

SUB_FILES=	pkg-message


USERS=	saned
GROUPS=	saned

PORTDOCS = *

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


IEEE1284_CONFIGURE_ENV_OFF=	sane_cv_use_libieee1284=no
IPV6_CONFIGURE_ENABLE=	ipv6
NLS_USES=		gettext
NLS_CONFIGURE_ENABLE=	nls
SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
SNMP_CONFIGURE_WITH=	snmp
USB_DESC=		USB support
USB_CONFIGURE_ON=	--with-usb
USB_CONFIGURE_OFF=	--with-usb=no
V4L_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
V4L_CONFIGURE_WITH=	v4l


Lines 1-3 Link Here

(-)graphics/sane-backends/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1498740966	1	TIMESTAMP = 1535340348
2	SHA256 (sane-backends-1.0.27.tar.gz) = a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c	2	SHA256 (sane-backends-1.0.27.tar.gz) = 293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9
3	SIZE (sane-backends-1.0.27.tar.gz) = 5955016	3	SIZE (sane-backends-1.0.27.tar.gz) = 6430188




--- backend/Makefile.in.orig	2018-08-28 15:10:08 UTC
+++ backend/Makefile.in
@@ -1518,7 +1518,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
@@ -5609,7 +5609,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; \
@@ -5617,7 +5617,7 @@ install-becfg:
 	  echo NOT overwriting $${cfg} in $(configdir)...; \
 	  else \
 	  echo installing $${cfg} in $(configdir)/$${cfg}...; \

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__epsonds.c (+11 lines)
	1	--- backend/epsonds.c.orig 2017-05-15 01:19:11 UTC
	2	+++ backend/epsonds.c
	3	@@ -40,6 +40,8 @@
	4
	5	#include "sane/config.h"
	6
	7	+#include <sys/types.h>
	8	+#include <sys/socket.h>
	9	#include <ctype.h>
	10	#include <unistd.h>
	11




--- 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>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 
 #if WITH_AVAHI
 /* used for auto detecting network printers  */




--- backend/kvs40xx.h.orig	2013-08-25 21:22:58 UTC
+++ backend/kvs40xx.h
@@ -10,6 +10,7 @@
 
 #include "../include/sane/config.h"
 #include <semaphore.h>
+#include <pthread.h>
 
 #undef  BACKEND_NAME
 #define BACKEND_NAME kvs40xx
@@ -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);
-SANE_Status kvs40xx_sense_handler (int fd, u_char * sense_buffer, void *arg);
+SANE_Status kvs40xx_sense_handler (int fd, unsigned char * sense_buffer, void *arg);
 SANE_Status stop_adf (struct scanner *s);
 SANE_Status hopper_down (struct scanner *s);
 SANE_Status inquiry (struct scanner *s, char *id);




--- 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	2016-10-06 00:02:57 UTC
+++ backend/v4l.c
@@ -72,7 +72,10 @@
 #include "../include/sane/saneopts.h"

 
 #define BACKEND_NAME v4l
 #include "../include/sane/sanei_backend.h"
@@ -1046,7 +1049,7 @@ sane_start (SANE_Handle handle)
   /* v4l1 actually returns BGR when we ask for RGB, so convert it */
   if (s->pict.palette == VIDEO_PALETTE_RGB24)
     {
-      __u32 loop;
+      uint32_t loop;
       DBG (3, "sane_start: converting from BGR to RGB\n");
       for (loop = 0; loop < (s->window.width * s->window.height * 3); loop += 3)
         {

Lines 1-6 Link Here

(-)graphics/sane-backends/files/patch-include__sane__sanei_backend.h (-3 / +3 lines)
1	--- include/sane/sanei_backend.h.orig 2013-08-25 21:22:58 UTC	1	--- include/sane/sanei_backend.h.orig 2016-10-06 00:02:58 UTC
2	+++ include/sane/sanei_backend.h	2	+++ include/sane/sanei_backend.h
3	@@ -68,9 +68,11 @@	3	@@ -64,9 +64,11 @@
4		4
5	/* Just enough backwards compatibility that we get by in the backends	5	/* Just enough backwards compatibility that we get by in the backends
6	without making handstands. */	6	without making handstands. */
Lines 12-18 Link Here
12	# ifdef sigemptyset	12	# ifdef sigemptyset
13	# undef sigemptyset	13	# undef sigemptyset
14	# endif	14	# endif
15	@@ -96,7 +98,9 @@	15	@@ -92,7 +94,9 @@
16	# undef SIG_SETMASK	16	# undef SIG_SETMASK
17	# endif	17	# endif
18		18




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




--- sanei/sanei_pa4s2.c.orig	2017-05-15 01:19:11 UTC
+++ sanei/sanei_pa4s2.c
@@ -112,6 +112,12 @@ inb (u_long port)
 
 #endif /* HAVE_LIBIEEE1284 */
 
+#if defined(__FreeBSD__) && defined(__i386__)
+#define HAVE_IOPERM
+#define ioperm i386_set_ioperm
+#include <machine/sysarch.h>
+#endif
+
 #include "../include/sane/sane.h"
 #include "../include/sane/sanei.h"
 #include "../include/sane/sanei_pa4s2.h"




--- 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 */
 
+#if defined(__FreeBSD__) && defined(__i386__)
+#define HAVE_IOPERM
+#define ioperm i386_set_ioperm
+#include <machine/sysarch.h>
+#endif
+
 #include "../include/sane/sane.h"
 #include "../include/sane/sanei.h"
 #include "../include/sane/sanei_pa4s2.h"




@sample etc/sane.d/dist/bh.conf etc/sane.d/bh.conf
@sample etc/sane.d/dist/canon.conf etc/sane.d/canon.conf
@sample etc/sane.d/dist/canon630u.conf etc/sane.d/canon630u.conf
@sample etc/sane.d/dist/canon_dr.conf etc/sane.d/canon_dr.conf
%%IEEE1284%%@sample etc/sane.d/dist/canon_pp.conf etc/sane.d/canon_pp.conf
@sample etc/sane.d/dist/canon_dr.conf etc/sane.d/canon_dr.conf
@sample etc/sane.d/dist/cardscan.conf etc/sane.d/cardscan.conf
@sample etc/sane.d/dist/coolscan.conf etc/sane.d/coolscan.conf
@sample etc/sane.d/dist/coolscan2.conf etc/sane.d/coolscan2.conf

@sample etc/sane.d/dist/ibm.conf etc/sane.d/ibm.conf
@sample etc/sane.d/dist/kodak.conf etc/sane.d/kodak.conf
@sample etc/sane.d/dist/kodakaio.conf etc/sane.d/kodakaio.conf
@sample etc/sane.d/dist/kvs1025.conf etc/sane.d/kvs1025.conf
@sample etc/sane.d/dist/leo.conf etc/sane.d/leo.conf
@sample etc/sane.d/dist/lexmark.conf etc/sane.d/lexmark.conf
@sample etc/sane.d/dist/ma1509.conf etc/sane.d/ma1509.conf

include/sane/saneopts.h
lib/libsane.so
lib/libsane.so.1
lib/libsane.so.1.0.27
lib/sane/libsane-abaton.so
lib/sane/libsane-abaton.so.1
lib/sane/libsane-abaton.so.1.0.27
lib/sane/libsane-agfafocus.so
lib/sane/libsane-agfafocus.so.1
lib/sane/libsane-agfafocus.so.1.0.27
lib/sane/libsane-apple.so
lib/sane/libsane-apple.so.1
lib/sane/libsane-apple.so.1.0.27
lib/sane/libsane-artec.so
lib/sane/libsane-artec.so.1
lib/sane/libsane-artec.so.1.0.27
lib/sane/libsane-artec_eplus48u.so
lib/sane/libsane-artec_eplus48u.so.1
lib/sane/libsane-artec_eplus48u.so.1.0.27
lib/sane/libsane-as6e.so
lib/sane/libsane-as6e.so.1
lib/sane/libsane-as6e.so.1.0.27
lib/sane/libsane-avision.so
lib/sane/libsane-avision.so.1
lib/sane/libsane-avision.so.1.0.27
lib/sane/libsane-bh.so
lib/sane/libsane-bh.so.1
lib/sane/libsane-bh.so.1.0.27
lib/sane/libsane-canon.so
lib/sane/libsane-canon.so.1
lib/sane/libsane-canon.so.1.0.27
lib/sane/libsane-canon630u.so
lib/sane/libsane-canon630u.so.1
lib/sane/libsane-canon630u.so.1.0.27
lib/sane/libsane-canon_dr.so
lib/sane/libsane-canon_dr.so.1
lib/sane/libsane-canon_dr.so.1.0.27
%%IEEE1284%%lib/sane/libsane-canon_pp.so
%%IEEE1284%%lib/sane/libsane-canon_pp.so.1
%%IEEE1284%%lib/sane/libsane-canon_pp.so.1.0.27
lib/sane/libsane-cardscan.so
lib/sane/libsane-cardscan.so.1
lib/sane/libsane-cardscan.so.1.0.27
lib/sane/libsane-coolscan.so
lib/sane/libsane-coolscan.so.1
lib/sane/libsane-coolscan.so.1.0.27
lib/sane/libsane-coolscan2.so
lib/sane/libsane-coolscan2.so.1
lib/sane/libsane-coolscan2.so.1.0.27
lib/sane/libsane-coolscan3.so
lib/sane/libsane-coolscan3.so.1
lib/sane/libsane-coolscan3.so.1.0.27
lib/sane/libsane-dc210.so
lib/sane/libsane-dc210.so.1
lib/sane/libsane-dc210.so.1.0.27
lib/sane/libsane-dc240.so
lib/sane/libsane-dc240.so.1
lib/sane/libsane-dc240.so.1.0.27
lib/sane/libsane-dc25.so
lib/sane/libsane-dc25.so.1
lib/sane/libsane-dc25.so.1.0.27
lib/sane/libsane-dell1600n_net.so
lib/sane/libsane-dell1600n_net.so.1
lib/sane/libsane-dell1600n_net.so.1.0.27
lib/sane/libsane-dll.so
lib/sane/libsane-dll.so.1
lib/sane/libsane-dll.so.1.0.27
lib/sane/libsane-dmc.so
lib/sane/libsane-dmc.so.1
lib/sane/libsane-dmc.so.1.0.27
lib/sane/libsane-epjitsu.so
lib/sane/libsane-epjitsu.so.1
lib/sane/libsane-epjitsu.so.1.0.27
lib/sane/libsane-epson.so
lib/sane/libsane-epson.so.1
lib/sane/libsane-epson.so.1.0.27
lib/sane/libsane-epson2.so
lib/sane/libsane-epson2.so.1
lib/sane/libsane-epson2.so.1.0.27
lib/sane/libsane-epsonds.so
lib/sane/libsane-epsonds.so.1
lib/sane/libsane-epsonds.so.1.0.27
lib/sane/libsane-fujitsu.so
lib/sane/libsane-fujitsu.so.1
lib/sane/libsane-fujitsu.so.1.0.27
lib/sane/libsane-genesys.so
lib/sane/libsane-genesys.so.1
lib/sane/libsane-genesys.so.1.0.27
%%GPHOTO%%lib/sane/libsane-gphoto2.so.1.0.27
%%GPHOTO%%lib/sane/libsane-gphoto2.so.1
%%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.27
lib/sane/libsane-hp.so
lib/sane/libsane-hp.so.1
lib/sane/libsane-hp.so.1.0.27
lib/sane/libsane-hp3500.so
lib/sane/libsane-hp3500.so.1
lib/sane/libsane-hp3500.so.1.0.27
lib/sane/libsane-hp3900.so
lib/sane/libsane-hp3900.so.1
lib/sane/libsane-hp3900.so.1.0.27
lib/sane/libsane-hp4200.so
lib/sane/libsane-hp4200.so.1
lib/sane/libsane-hp4200.so.1.0.27
lib/sane/libsane-hp5400.so
lib/sane/libsane-hp5400.so.1
lib/sane/libsane-hp5400.so.1.0.27
lib/sane/libsane-hp5590.so
lib/sane/libsane-hp5590.so.1
lib/sane/libsane-hp5590.so.1.0.27
lib/sane/libsane-hpljm1005.so
lib/sane/libsane-hpljm1005.so.1
lib/sane/libsane-hpljm1005.so.1.0.27
%%IEEE1284%%lib/sane/libsane-hpsj5s.so
%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1
%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1.0.27
lib/sane/libsane-hs2p.so
lib/sane/libsane-hs2p.so.1
lib/sane/libsane-hs2p.so.1.0.27
lib/sane/libsane-ibm.so
lib/sane/libsane-ibm.so.1
lib/sane/libsane-ibm.so.1.0.27
lib/sane/libsane-kodak.so
lib/sane/libsane-kodak.so.1
lib/sane/libsane-kodak.so.1.0.27
lib/sane/libsane-kodakaio.so
lib/sane/libsane-kodakaio.so.1
lib/sane/libsane-kodakaio.so.1.0.27
lib/sane/libsane-kvs1025.so
lib/sane/libsane-kvs1025.so.1
lib/sane/libsane-kvs1025.so.1.0.27
lib/sane/libsane-kvs20xx.so
lib/sane/libsane-kvs20xx.so.1
lib/sane/libsane-kvs20xx.so.1.0.27
lib/sane/libsane-kvs40xx.so
lib/sane/libsane-kvs40xx.so.1
lib/sane/libsane-kvs40xx.so.1.0.27
lib/sane/libsane-leo.so
lib/sane/libsane-leo.so.1
lib/sane/libsane-leo.so.1.0.27
lib/sane/libsane-lexmark.so
lib/sane/libsane-lexmark.so.1
lib/sane/libsane-lexmark.so.1.0.27
lib/sane/libsane-ma1509.so
lib/sane/libsane-ma1509.so.1
lib/sane/libsane-ma1509.so.1.0.27
lib/sane/libsane-magicolor.so
lib/sane/libsane-magicolor.so.1
lib/sane/libsane-magicolor.so.1.0.27
lib/sane/libsane-matsushita.so
lib/sane/libsane-matsushita.so.1
lib/sane/libsane-matsushita.so.1.0.27
lib/sane/libsane-microtek.so
lib/sane/libsane-microtek.so.1
lib/sane/libsane-microtek.so.1.0.27
lib/sane/libsane-microtek2.so
lib/sane/libsane-microtek2.so.1
lib/sane/libsane-microtek2.so.1.0.27
lib/sane/libsane-mustek.so
lib/sane/libsane-mustek.so.1
lib/sane/libsane-mustek.so.1.0.27
%%IEEE1284%%lib/sane/libsane-mustek_pp.so
%%IEEE1284%%lib/sane/libsane-mustek_pp.so.1
%%IEEE1284%%lib/sane/libsane-mustek_pp.so.1.0.27
lib/sane/libsane-mustek_usb.so
lib/sane/libsane-mustek_usb.so.1
lib/sane/libsane-mustek_usb.so.1.0.27
lib/sane/libsane-mustek_usb2.so
lib/sane/libsane-mustek_usb2.so.1
lib/sane/libsane-mustek_usb2.so.1.0.27
lib/sane/libsane-nec.so
lib/sane/libsane-nec.so.1
lib/sane/libsane-nec.so.1.0.27
lib/sane/libsane-net.so
lib/sane/libsane-net.so.1
lib/sane/libsane-net.so.1.0.27
lib/sane/libsane-niash.so
lib/sane/libsane-niash.so.1
lib/sane/libsane-niash.so.1.0.27
lib/sane/libsane-p5.so
lib/sane/libsane-p5.so.1
lib/sane/libsane-p5.so.1.0.27
lib/sane/libsane-pie.so
lib/sane/libsane-pie.so.1
lib/sane/libsane-pie.so.1.0.27
lib/sane/libsane-pieusb.so
lib/sane/libsane-pieusb.so.1
lib/sane/libsane-pieusb.so.1.0.27
lib/sane/libsane-pixma.so
lib/sane/libsane-pixma.so.1
lib/sane/libsane-pixma.so.1.0.27
lib/sane/libsane-plustek.so
lib/sane/libsane-plustek.so.1
lib/sane/libsane-plustek.so.1.0.27
lib/sane/libsane-plustek_pp.so
lib/sane/libsane-plustek_pp.so.1
lib/sane/libsane-plustek_pp.so.1.0.27
lib/sane/libsane-ricoh.so
lib/sane/libsane-ricoh.so.1
lib/sane/libsane-ricoh.so.1.0.27
lib/sane/libsane-rts8891.so
lib/sane/libsane-rts8891.so.1
lib/sane/libsane-rts8891.so.1.0.27
lib/sane/libsane-s9036.so
lib/sane/libsane-s9036.so.1
lib/sane/libsane-s9036.so.1.0.27
lib/sane/libsane-sceptre.so
lib/sane/libsane-sceptre.so.1
lib/sane/libsane-sceptre.so.1.0.27
lib/sane/libsane-sharp.so
lib/sane/libsane-sharp.so.1
lib/sane/libsane-sharp.so.1.0.27
lib/sane/libsane-sm3600.so
lib/sane/libsane-sm3600.so.1
lib/sane/libsane-sm3600.so.1.0.27
lib/sane/libsane-sm3840.so
lib/sane/libsane-sm3840.so.1
lib/sane/libsane-sm3840.so.1.0.27
lib/sane/libsane-snapscan.so
lib/sane/libsane-snapscan.so.1
lib/sane/libsane-snapscan.so.1.0.27
lib/sane/libsane-sp15c.so
lib/sane/libsane-sp15c.so.1
lib/sane/libsane-sp15c.so.1.0.27
lib/sane/libsane-st400.so
lib/sane/libsane-st400.so.1
lib/sane/libsane-st400.so.1.0.27
lib/sane/libsane-stv680.so
lib/sane/libsane-stv680.so.1
lib/sane/libsane-stv680.so.1.0.27
lib/sane/libsane-tamarack.so
lib/sane/libsane-tamarack.so.1
lib/sane/libsane-tamarack.so.1.0.27
lib/sane/libsane-teco1.so
lib/sane/libsane-teco1.so.1
lib/sane/libsane-teco1.so.1.0.27
lib/sane/libsane-teco2.so
lib/sane/libsane-teco2.so.1
lib/sane/libsane-teco2.so.1.0.27
lib/sane/libsane-teco3.so
lib/sane/libsane-teco3.so.1
lib/sane/libsane-teco3.so.1.0.27
lib/sane/libsane-test.so
lib/sane/libsane-test.so.1
lib/sane/libsane-test.so.1.0.27
lib/sane/libsane-u12.so
lib/sane/libsane-u12.so.1
lib/sane/libsane-u12.so.1.0.27
lib/sane/libsane-umax.so
lib/sane/libsane-umax.so.1
lib/sane/libsane-umax.so.1.0.27
lib/sane/libsane-umax1220u.so
lib/sane/libsane-umax1220u.so.1
lib/sane/libsane-umax1220u.so.1.0.27
lib/sane/libsane-umax_pp.so
lib/sane/libsane-umax_pp.so.1
lib/sane/libsane-umax_pp.so.1.0.27
%%V4L%%lib/sane/libsane-v4l.so
%%V4L%%lib/sane/libsane-v4l.so.1
%%V4L%%lib/sane/libsane-v4l.so.1.0.27
lib/sane/libsane-xerox_mfp.so
lib/sane/libsane-xerox_mfp.so.1
lib/sane/libsane-xerox_mfp.so.1.0.27
libdata/pkgconfig/sane-backends.pc
man/man1/gamma4scanimage.1.gz
man/man1/sane-config.1.gz

%%NLS%%share/locale/cs/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/da/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/de/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/en@quot/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/eo/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/es/LC_MESSAGES/sane-backends.mo

Return to bug 229653

Lines 3-12 Link Here

(-)graphics/sane-backends/Makefile (-12 / +10 lines)
3		3
4	PORTNAME= sane-backends	4	PORTNAME= sane-backends
5	PORTVERSION= 1.0.27	5	PORTVERSION= 1.0.27
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= https://alioth.debian.org/frs/download.php/file/4146/ \	8	MASTER_SITES= http://fossies.org/linux/misc/
9	http://fossies.org/linux/misc/
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
12	COMMENT= API for access to scanners, digitals camera, frame grabbers etc	11	COMMENT= API for access to scanners, digitals camera, frame grabbers etc
Lines 18-33 Link Here
18	libtiff.so:graphics/tiff	17	libtiff.so:graphics/tiff
19		18
20	USES= gmake jpeg libtool localbase pathfix pkgconfig	19	USES= gmake jpeg libtool localbase pathfix pkgconfig
		20
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \	22	CONFIGURE_ARGS= --disable-locking \
23	--disable-latex \
24	--disable-locking \
25	--enable-pthread \	23	--enable-pthread \
26	--without-systemd	24	--without-systemd
27	INSTALL_TARGET= install-strip	25	INSTALL_TARGET= install-strip
28	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
29	USE_RC_SUBR= saned	27	USE_RC_SUBR= saned
30	WRKSRC= ${WRKDIR}/${PORTNAME}-1.0.25
31		28
32	SUB_FILES= pkg-message	29	SUB_FILES= pkg-message
33		30
Lines 34-42 Link Here
34	USERS= saned	31	USERS= saned
35	GROUPS= saned	32	GROUPS= saned
36		33
37	PORTDOCS= *	34	PORTDOCS = *
38		35
39	OPTIONS_DEFINE= AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L	36	OPTIONS_DEFINE= AVAHI IEEE1284 DOCS GPHOTO IPV6 NLS SNMP USB V4L
		37	OPTIONS_DEFINE_i386= IEEE1284
40	OPTIONS_DEFAULT= USB	38	OPTIONS_DEFAULT= USB
41	OPTIONS_SUB= yes	39	OPTIONS_SUB= yes
42		40
Lines 49-60 Link Here
49	IEEE1284_CONFIGURE_ENV_OFF= sane_cv_use_libieee1284=no	47	IEEE1284_CONFIGURE_ENV_OFF= sane_cv_use_libieee1284=no
50	IPV6_CONFIGURE_ENABLE= ipv6	48	IPV6_CONFIGURE_ENABLE= ipv6
51	NLS_USES= gettext	49	NLS_USES= gettext
52	NLS_CONFIGURE_ENABLE= translations	50	NLS_CONFIGURE_ENABLE= nls
53	SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp	51	SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
54	SNMP_CONFIGURE_WITH= snmp	52	SNMP_CONFIGURE_WITH= snmp
55	USB_DESC= USB support	53	USB_DESC= USB support
56	USB_CONFIGURE_ON= --enable-libusb_1_0	54	USB_CONFIGURE_ON= --with-usb
57	USB_CONFIGURE_OFF= --enable-libusb=no	55	USB_CONFIGURE_OFF= --with-usb=no
58	V4L_LIB_DEPENDS= libv4l1.so:multimedia/libv4l	56	V4L_LIB_DEPENDS= libv4l1.so:multimedia/libv4l
59	V4L_CONFIGURE_WITH= v4l	57	V4L_CONFIGURE_WITH= v4l
60		58

Lines 1-6 Link Here

(-)graphics/sane-backends/files/patch-backend__Makefile.in (-4 / +4 lines)
1	--- backend/Makefile.in.orig 2015-10-11 21:13:46 UTC	1	--- backend/Makefile.in.orig 2018-08-28 15:10:08 UTC
2	+++ backend/Makefile.in	2	+++ backend/Makefile.in
3	@@ -1508,7 +1508,7 @@ AM_V_at = $(am__v_at_@AM_V@)	3	@@ -1518,7 +1518,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	@@ -5567,7 +5567,7 @@ install-becfg:	12	@@ -5609,7 +5609,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	@@ -5575,7 +5575,7 @@ install-becfg:	21	@@ -5617,7 +5617,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-13 Link Here

(-)graphics/sane-backends/files/patch-backend__kodakaio.c (-13 lines)
1	--- backend/kodakaio.c.orig 2015-09-26 00:53:42 UTC
2	+++ backend/kodakaio.c
3	@@ -207,6 +207,10 @@ normal levels. This system is a plan rat
4	#include <math.h>
5	#include <poll.h>
6	#include <time.h>
7	+#include <sys/types.h>
8	+#ifdef HAVE_SYS_SOCKET_H
9	+#include <sys/socket.h>
10	+#endif
11
12	#if WITH_AVAHI
13	/* used for auto detecting network printers */

Lines 1-19 Link Here

(-)graphics/sane-backends/files/patch-backend__kvs40xx.h (-19 lines)
1	--- backend/kvs40xx.h.orig 2013-08-25 21:22:58 UTC
2	+++ backend/kvs40xx.h
3	@@ -10,6 +10,7 @@
4
5	#include "../include/sane/config.h"
6	#include <semaphore.h>
7	+#include <pthread.h>
8
9	#undef BACKEND_NAME
10	#define BACKEND_NAME kvs40xx
11	@@ -208,7 +209,7 @@ SANE_Status kvs40xx_read_image_data (str
12	SANE_Status kvs40xx_document_exist (struct scanner *s);
13	SANE_Status get_buffer_status (struct scanner s, unsigned data_avalible);
14	SANE_Status kvs40xx_scan (struct scanner *s);
15	-SANE_Status kvs40xx_sense_handler (int fd, u_char * sense_buffer, void *arg);
16	+SANE_Status kvs40xx_sense_handler (int fd, unsigned char * sense_buffer, void *arg);
17	SANE_Status stop_adf (struct scanner *s);
18	SANE_Status hopper_down (struct scanner *s);
19	SANE_Status inquiry (struct scanner s, char id);

Lines 1-24 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 */

Lines 1-4 Link Here

(-)graphics/sane-backends/files/patch-backend__v4l.c (-1 / +10 lines)
1	--- backend/v4l.c.orig 2015-09-20 11:55:39 UTC	1	--- backend/v4l.c.orig 2016-10-06 00:02:57 UTC
2	+++ backend/v4l.c	2	+++ backend/v4l.c
3	@@ -72,7 +72,10 @@	3	@@ -72,7 +72,10 @@
4	#include "../include/sane/saneopts.h"	4	#include "../include/sane/saneopts.h"
Lines 11-13 Link Here
11		11
12	#define BACKEND_NAME v4l	12	#define BACKEND_NAME v4l
13	#include "../include/sane/sanei_backend.h"	13	#include "../include/sane/sanei_backend.h"
		14	@@ -1046,7 +1049,7 @@ sane_start (SANE_Handle handle)
		15	/* v4l1 actually returns BGR when we ask for RGB, so convert it */
		16	if (s->pict.palette == VIDEO_PALETTE_RGB24)
		17	{
		18	- __u32 loop;
		19	+ uint32_t loop;
		20	DBG (3, "sane_start: converting from BGR to RGB\n");
		21	for (loop = 0; loop < (s->window.width * s->window.height * 3); loop += 3)
		22	{

Lines 1-12 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 */

Line 0 Link Here

(-)graphics/sane-backends/files/patch-sanei_sanei__pa4s2.c (+15 lines)
	1	--- sanei/sanei_pa4s2.c.orig 2017-05-15 01:19:11 UTC
	2	+++ sanei/sanei_pa4s2.c
	3	@@ -112,6 +112,12 @@ inb (u_long port)
	4
	5	#endif /* HAVE_LIBIEEE1284 */
	6
	7	+#if defined(__FreeBSD__) && defined(__i386__)
	8	+#define HAVE_IOPERM
	9	+#define ioperm i386_set_ioperm
	10	+#include <machine/sysarch.h>
	11	+#endif
	12	+
	13	#include "../include/sane/sane.h"
	14	#include "../include/sane/sanei.h"
	15	#include "../include/sane/sanei_pa4s2.h"

Lines 1-15 Link Here

(-)graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c (-15 lines)
1	--- sanei/sanei_pa4s2.c.orig 2015-09-20 11:55:39 UTC
2	+++ sanei/sanei_pa4s2.c
3	@@ -112,6 +112,12 @@ inb (u_long port)
4
5	#endif /* HAVE_LIBIEEE1284 */
6
7	+#if defined(__FreeBSD__) && defined(__i386__)
8	+#define HAVE_IOPERM
9	+#define ioperm i386_set_ioperm
10	+#include <machine/sysarch.h>
11	+#endif
12	+
13	#include "../include/sane/sane.h"
14	#include "../include/sane/sanei.h"
15	#include "../include/sane/sanei_pa4s2.h"

Lines 12-19 Link Here

(-)graphics/sane-backends/pkg-plist (-90 / +93 lines)
12	@sample etc/sane.d/dist/bh.conf etc/sane.d/bh.conf	12	@sample etc/sane.d/dist/bh.conf etc/sane.d/bh.conf
13	@sample etc/sane.d/dist/canon.conf etc/sane.d/canon.conf	13	@sample etc/sane.d/dist/canon.conf etc/sane.d/canon.conf
14	@sample etc/sane.d/dist/canon630u.conf etc/sane.d/canon630u.conf	14	@sample etc/sane.d/dist/canon630u.conf etc/sane.d/canon630u.conf
		15	@sample etc/sane.d/dist/canon_dr.conf etc/sane.d/canon_dr.conf
15	%%IEEE1284%%@sample etc/sane.d/dist/canon_pp.conf etc/sane.d/canon_pp.conf	16	%%IEEE1284%%@sample etc/sane.d/dist/canon_pp.conf etc/sane.d/canon_pp.conf
16	@sample etc/sane.d/dist/canon_dr.conf etc/sane.d/canon_dr.conf
17	@sample etc/sane.d/dist/cardscan.conf etc/sane.d/cardscan.conf	17	@sample etc/sane.d/dist/cardscan.conf etc/sane.d/cardscan.conf
18	@sample etc/sane.d/dist/coolscan.conf etc/sane.d/coolscan.conf	18	@sample etc/sane.d/dist/coolscan.conf etc/sane.d/coolscan.conf
19	@sample etc/sane.d/dist/coolscan2.conf etc/sane.d/coolscan2.conf	19	@sample etc/sane.d/dist/coolscan2.conf etc/sane.d/coolscan2.conf
Lines 41-46 Link Here
41	@sample etc/sane.d/dist/ibm.conf etc/sane.d/ibm.conf	41	@sample etc/sane.d/dist/ibm.conf etc/sane.d/ibm.conf
42	@sample etc/sane.d/dist/kodak.conf etc/sane.d/kodak.conf	42	@sample etc/sane.d/dist/kodak.conf etc/sane.d/kodak.conf
43	@sample etc/sane.d/dist/kodakaio.conf etc/sane.d/kodakaio.conf	43	@sample etc/sane.d/dist/kodakaio.conf etc/sane.d/kodakaio.conf
		44	@sample etc/sane.d/dist/kvs1025.conf etc/sane.d/kvs1025.conf
44	@sample etc/sane.d/dist/leo.conf etc/sane.d/leo.conf	45	@sample etc/sane.d/dist/leo.conf etc/sane.d/leo.conf
45	@sample etc/sane.d/dist/lexmark.conf etc/sane.d/lexmark.conf	46	@sample etc/sane.d/dist/lexmark.conf etc/sane.d/lexmark.conf
46	@sample etc/sane.d/dist/ma1509.conf etc/sane.d/ma1509.conf	47	@sample etc/sane.d/dist/ma1509.conf etc/sane.d/ma1509.conf
Lines 85-352 Link Here
85	include/sane/saneopts.h	86	include/sane/saneopts.h
86	lib/libsane.so	87	lib/libsane.so
87	lib/libsane.so.1	88	lib/libsane.so.1
88	lib/libsane.so.1.0.25	89	lib/libsane.so.1.0.27
89	lib/sane/libsane-abaton.so	90	lib/sane/libsane-abaton.so
90	lib/sane/libsane-abaton.so.1	91	lib/sane/libsane-abaton.so.1
91	lib/sane/libsane-abaton.so.1.0.25	92	lib/sane/libsane-abaton.so.1.0.27
92	lib/sane/libsane-agfafocus.so	93	lib/sane/libsane-agfafocus.so
93	lib/sane/libsane-agfafocus.so.1	94	lib/sane/libsane-agfafocus.so.1
94	lib/sane/libsane-agfafocus.so.1.0.25	95	lib/sane/libsane-agfafocus.so.1.0.27
95	lib/sane/libsane-apple.so	96	lib/sane/libsane-apple.so
96	lib/sane/libsane-apple.so.1	97	lib/sane/libsane-apple.so.1
97	lib/sane/libsane-apple.so.1.0.25	98	lib/sane/libsane-apple.so.1.0.27
98	lib/sane/libsane-artec.so	99	lib/sane/libsane-artec.so
99	lib/sane/libsane-artec.so.1	100	lib/sane/libsane-artec.so.1
100	lib/sane/libsane-artec.so.1.0.25	101	lib/sane/libsane-artec.so.1.0.27
101	lib/sane/libsane-artec_eplus48u.so	102	lib/sane/libsane-artec_eplus48u.so
102	lib/sane/libsane-artec_eplus48u.so.1	103	lib/sane/libsane-artec_eplus48u.so.1
103	lib/sane/libsane-artec_eplus48u.so.1.0.25	104	lib/sane/libsane-artec_eplus48u.so.1.0.27
104	lib/sane/libsane-as6e.so	105	lib/sane/libsane-as6e.so