diff options
Diffstat (limited to 'graphics/sane-backends/files')
12 files changed, 97 insertions, 107 deletions
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 */ |