9 files changed, 126 insertions, 37 deletions
diff --git a/graphics/sane-backends/files/patch-backend_Makefile.in b/graphics/sane-backends/files/patch-backend_Makefile.in
new file mode 100644
index 000000000000..6e7f3d412118
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend_Makefile.in
@@ -0,0 +1,38 @@
+--- backend/Makefile.in.orig	2020-02-03 08:54:00 UTC
++++ backend/Makefile.in
+@@ -1645,7 +1645,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 = 
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane
++DEFAULT_INCLUDES = -I$(top_builddir)/include/sane -I$(top_builddir)/include -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__maybe_remake_depfiles = depfiles
+ am__depfiles_remade = ./$(DEPDIR)/libabaton_la-abaton.Plo \
+@@ -3270,7 +3270,7 @@ libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
+ libsane_la_LIBADD = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_LIBS) $(DL_LIBS) $(XML_LIBS)
+ 
+ # WARNING: Automake is getting this wrong so have to do it ourselves.
+-libsane_la_DEPENDENCIES = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
++libsane_la_DEPENDENCIES = ../lib/liblib.la $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+@@ -7174,7 +7174,7 @@ install-becfg: 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)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
++	test -z "$(configdir)/dist" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dist"
+ 	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; \
+@@ -7182,7 +7182,7 @@ install-becfg: becfg
+ 	  echo NOT overwriting $${cfg} in $(configdir)...; \
+ 	  else \
+ 	  echo installing $${cfg} in $(configdir)/$${cfg}...; \
+-	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \
++	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg} \
+ 	  || exit 1; \
+ 	  fi; \
+ 	  done
diff --git a/graphics/sane-backends/files/patch-backend__Makefile.in b/graphics/sane-backends/files/patch-backend__Makefile.in
deleted file mode 100644
index 075f101dc66e..000000000000
--- a/graphics/sane-backends/files/patch-backend__Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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 = 
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane
-+DEFAULT_INCLUDES = -I$(top_builddir)/include/sane -I$(top_builddir)/include -I.@am__isrc@
- 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)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
-+	test -z "$(configdir)/dist" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dist"
- 	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}...; \
--	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \
-+	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg} \
- 	  || exit 1; \
- 	  fi; \
- 	  done
diff --git a/graphics/sane-backends/files/patch-backend_genesys_low.cpp b/graphics/sane-backends/files/patch-backend_genesys_low.cpp
new file mode 100644
index 000000000000..c1218914e832
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend_genesys_low.cpp
@@ -0,0 +1,19 @@
+Fix build on big endian archs:
+
+genesys/low.cpp:544:9: error: 'depth' was not declared in this scope, see
+
+https://gitlab.com/sane-project/backends/-/merge_requests/329
+
+Obtained from:	OpenBSD
+
+--- backend/genesys/low.cpp.orig	2020-02-02 11:58:09 UTC
++++ backend/genesys/low.cpp
+@@ -539,7 +539,7 @@ Image read_unshuffled_image_from_scanner(Genesys_Devic
+     }
+ 
+ #ifdef WORDS_BIGENDIAN
+-    if (depth == 16) {
++    if (session.params.depth == 16) {
+         dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>();
+     }
+ #endif
diff --git a/graphics/sane-backends/files/patch-backend_pixma_pixma__bjnp.c b/graphics/sane-backends/files/patch-backend_pixma_pixma__bjnp.c
new file mode 100644
index 000000000000..cac58d20d3fa
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend_pixma_pixma__bjnp.c
@@ -0,0 +1,21 @@
+--- backend/pixma/pixma_bjnp.c.orig	2020-02-03 09:33:57 UTC
++++ backend/pixma/pixma_bjnp.c
+@@ -72,6 +72,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#include <sys/param.h>
+ 
+ /*
+  * networking stuff
+@@ -1990,8 +1991,8 @@ sanei_bjnp_find_devices (const char **conf_devices,
+   fd_set fdset;
+   fd_set active_fdset;
+   struct timeval timeout;
+-  char scanner_host[HOST_NAME_MAX];
+-  char uri[HOST_NAME_MAX + 32];
++  char scanner_host[MAXHOSTNAMELEN];
++  char uri[MAXHOSTNAMELEN + 32];
+   int dev_no;
+   int port;
+   int auto_detect = 1;
diff --git a/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c b/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c
index 2f84840e8483..f501a2d06195 100644
--- a/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c
+++ b/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c
@@ -1,11 +1,11 @@
---- backend/ricoh2_buffer.c.orig	2019-10-09 14:45:51 UTC
+--- backend/ricoh2_buffer.c.orig	2020-02-02 11:58:09 UTC
 +++ backend/ricoh2_buffer.c
-@@ -46,7 +46,7 @@
- 
- #include <memory.h>
- #include <assert.h>
+@@ -50,7 +50,7 @@
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <malloc/malloc.h>
+ #else
 -#include <malloc.h>
 +#include <stdlib.h>
+ #endif
  
  #include "../include/sane/sanei_debug.h"
- 
diff --git a/graphics/sane-backends/files/patch-backend__v4l.c b/graphics/sane-backends/files/patch-backend_v4l.c
index e50d809759ed..e50d809759ed 100644
--- a/graphics/sane-backends/files/patch-backend__v4l.c
+++ b/graphics/sane-backends/files/patch-backend_v4l.c
diff --git a/graphics/sane-backends/files/patch-configure b/graphics/sane-backends/files/patch-configure
new file mode 100644
index 000000000000..d9ed8b71fa0d
--- /dev/null
+++ b/graphics/sane-backends/files/patch-configure
@@ -0,0 +1,29 @@
+--- configure.orig	2020-02-02 11:58:46 UTC
++++ configure
+@@ -22138,7 +22138,7 @@ $as_echo_n "checking whether pthread_t is integer... "
+ int
+ main ()
+ {
+-pthread_t k; k * 1;
++pthread_t k; k = (pthread_t) -1;
+   ;
+   return 0;
+ }
+@@ -26130,7 +26130,7 @@ for be in ${BACKENDS}; do
+     ;;
+ 
+     v4l)
+-    if test "${have_linux_ioctl_defines}" != "yes" \
++    if test "${have_libv4l1}" != "yes" \
+       || test "${have_libv4l1}" != "yes"; then
+       echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
+       backend_supported="no"
+@@ -26339,7 +26339,7 @@ for be in ${BACKENDS}; do
+     ;;
+ 
+     v4l)
+-    if test "${have_linux_ioctl_defines}" != "yes" \
++    if test "${have_libv4l1}" != "yes" \
+       || test "${have_libv4l1}" != "yes"; then
+       echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
+       backend_supported="no"
diff --git a/graphics/sane-backends/files/patch-tools_sane-config.in b/graphics/sane-backends/files/patch-tools_sane-config.in
new file mode 100644
index 000000000000..94c46a977dc6
--- /dev/null
+++ b/graphics/sane-backends/files/patch-tools_sane-config.in
@@ -0,0 +1,11 @@
+--- tools/sane-config.in.orig	2020-02-02 11:58:09 UTC
++++ tools/sane-config.in
+@@ -11,7 +11,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+ # using our installed *.pc only - neither default nor user paths
+-export PKG_CONFIG_LIBDIR="@libdir@/pkgconfig"
++export PKG_CONFIG_LIBDIR="@prefix@/libdata/pkgconfig"
+ export PKG_CONFIG_PATH=""
+ 
+ pkgconfig_package=sane-backends
diff --git a/graphics/sane-backends/files/patch-tools_sane-desc.c b/graphics/sane-backends/files/patch-tools_sane-desc.c
index 0ee9db54e421..8c0288273a32 100644
--- a/graphics/sane-backends/files/patch-tools_sane-desc.c
+++ b/graphics/sane-backends/files/patch-tools_sane-desc.c
@@ -1,8 +1,8 @@
---- tools/sane-desc.c.orig	2015-09-01 00:31:54 UTC
+--- tools/sane-desc.c.orig	2020-02-02 11:58:09 UTC
 +++ tools/sane-desc.c
 @@ -2816,8 +2816,8 @@ html_print_footer (void)
       "<address>\n"
-      "<a href=\"http://www.sane-project.org/imprint.html\"\n"
+      "<a href=\"imprint.html\"\n"
       ">Contact</a>\n" "</address>\n" "<font size=-1>\n");
 -  printf ("This page was last updated on %s by sane-desc %s from %s\n",
 -	  asctime (localtime (&current_time)), SANE_DESC_VERSION, PACKAGE_STRING);