diff --git a/media-gfx/sane_backends/patches/sane_backends-1.0.30.patchset b/media-gfx/sane_backends/patches/sane_backends-1.0.31.patchset similarity index 79% rename from media-gfx/sane_backends/patches/sane_backends-1.0.30.patchset rename to media-gfx/sane_backends/patches/sane_backends-1.0.31.patchset index b61a8d8c2..00de726c0 100644 --- a/media-gfx/sane_backends/patches/sane_backends-1.0.30.patchset +++ b/media-gfx/sane_backends/patches/sane_backends-1.0.31.patchset @@ -1,4 +1,4 @@ -From 95991ce262a4a45dc36dc8d3d3fb68d720d7eb42 Mon Sep 17 00:00:00 2001 +From 22f217554ee32548386902edd059f75ac56ca99f Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Sun, 10 May 2020 02:15:08 +0000 Subject: Use USE_PTHREAD on Haiku for SnapScan Backend @@ -18,20 +18,20 @@ index 116f9db..a9a2782 100644 { unsigned int shm_size = sizeof(struct urb_counters_t); -- -2.26.0 +2.30.0 -From 121ae68cbaaa08ccccb198930b84758e82f1e52d Mon Sep 17 00:00:00 2001 +From 7067ddbc5f1590f54d9e320ebb21013ea356ad1d Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Thu, 5 Sep 2019 01:15:08 +0000 Subject: Fix strsep redefined diff --git a/include/sane/config.h.in b/include/sane/config.h.in -index fd125c8..8e8eef7 100644 +index 9d7faea..7f95ff7 100644 --- a/include/sane/config.h.in +++ b/include/sane/config.h.in -@@ -693,11 +693,12 @@ char *strdup (const char * s); +@@ -702,11 +702,12 @@ char *strdup (const char * s); char *strndup(const char * s, size_t n); #endif @@ -46,10 +46,10 @@ index fd125c8..8e8eef7 100644 /* Prototype for usleep */ #ifndef HAVE_USLEEP -- -2.26.0 +2.30.0 -From 305ba99c32a3a74d5bc343f69429c5b27a020e2d Mon Sep 17 00:00:00 2001 +From 472850d2df371947fb5f377c02db9824caa1eac8 Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Thu, 5 Sep 2019 01:15:08 +0000 Subject: Fix fcntl placement @@ -69,10 +69,10 @@ index 48f464a..143a044 100644 #include "../include/sane/sane.h" #include "../include/sane/sanei.h" -- -2.26.0 +2.30.0 -From d504aa479ca37bedf802b30a98014c66e2117bba Mon Sep 17 00:00:00 2001 +From acfff8de93fb3b6988143b9b3cfc41a72fe660bd Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 13 Nov 2015 11:26:01 +0000 Subject: Fix build for Haiku @@ -103,22 +103,6 @@ index 244f442..12b4a90 100644 /* read from the scanner or the ring buffer */ -diff --git a/backend/pixma/pixma_bjnp.c b/backend/pixma/pixma_bjnp.c -index 34ba918..214ce97 100644 ---- a/backend/pixma/pixma_bjnp.c -+++ b/backend/pixma/pixma_bjnp.c -@@ -110,6 +110,11 @@ - # define SSIZE_MAX LONG_MAX - #endif - -+#ifdef __HAIKU__ -+#undef HAVE_IFADDRS_H -+#undef ENABLE_IPV6 -+#endif -+ - /* static data */ - static bjnp_device_t device[BJNP_NO_DEVICES]; - static int bjnp_no_devices = 0; diff --git a/sanei/sanei_thread.c b/sanei/sanei_thread.c index f701423..f48dd3c 100644 --- a/sanei/sanei_thread.c @@ -140,10 +124,10 @@ index f701423..f48dd3c 100644 if( 0 == rc ) { diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c -index db0f452..6ab40f4 100644 +index 4b49b11..1dd36a7 100644 --- a/sanei/sanei_usb.c +++ b/sanei/sanei_usb.c -@@ -1394,7 +1394,12 @@ sanei_usb_init (void) +@@ -1416,7 +1416,12 @@ sanei_usb_init (void) if (!sanei_usb_ctx) { DBG (4, "%s: initializing libusb-1.0\n", __func__); @@ -156,7 +140,7 @@ index db0f452..6ab40f4 100644 if (ret < 0) { DBG (1, -@@ -1464,7 +1469,11 @@ int i; +@@ -1486,7 +1491,11 @@ int i; #ifdef HAVE_LIBUSB if (sanei_usb_ctx) { @@ -168,7 +152,7 @@ index db0f452..6ab40f4 100644 /* reset libusb-1.0 context */ sanei_usb_ctx=NULL; } -@@ -1788,7 +1797,11 @@ static void libusb_scan_devices(void) +@@ -1810,7 +1819,11 @@ static void libusb_scan_devices(void) DBG (4, "%s: Looking for libusb-1.0 devices\n", __func__); @@ -180,7 +164,7 @@ index db0f452..6ab40f4 100644 if (ndev < 0) { DBG (1, -@@ -3034,6 +3047,7 @@ sanei_usb_clear_halt (SANE_Int dn) +@@ -3089,6 +3102,7 @@ sanei_usb_clear_halt (SANE_Int dn) if (testing_mode == sanei_usb_testing_mode_replay) return SANE_STATUS_GOOD; @@ -188,7 +172,7 @@ index db0f452..6ab40f4 100644 #ifdef HAVE_LIBUSB_LEGACY int ret; -@@ -3084,6 +3098,7 @@ sanei_usb_clear_halt (SANE_Int dn) +@@ -3139,6 +3153,7 @@ sanei_usb_clear_halt (SANE_Int dn) #else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */ DBG (1, "sanei_usb_clear_halt: libusb support missing\n"); #endif /* HAVE_LIBUSB_LEGACY || HAVE_LIBUSB */ @@ -197,5 +181,5 @@ index db0f452..6ab40f4 100644 return SANE_STATUS_GOOD; } -- -2.26.0 +2.30.0 diff --git a/media-gfx/sane_backends/sane_backends-1.0.30.recipe b/media-gfx/sane_backends/sane_backends-1.0.31.recipe similarity index 90% rename from media-gfx/sane_backends/sane_backends-1.0.30.recipe rename to media-gfx/sane_backends/sane_backends-1.0.31.recipe index 96e6de3aa..d3909e930 100644 --- a/media-gfx/sane_backends/sane_backends-1.0.30.recipe +++ b/media-gfx/sane_backends/sane_backends-1.0.31.recipe @@ -17,8 +17,8 @@ HOMEPAGE="http://www.sane-project.org" COPYRIGHT="David Mosberger-Tang, Andy Beck" LICENSE="GNU LGPL v2" REVISION="1" -SOURCE_URI="https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-$portVersion.tar.gz" -CHECKSUM_SHA256="3f5d96a9c47f6124a46bb577c776bbc4896dd17b9203d8bfbc7fe8cbbcf279a3" +SOURCE_URI="https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/sane-backends-$portVersion.tar.gz" +CHECKSUM_SHA256="4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa" SOURCE_DIR="sane-backends-$portVersion" PATCHES="sane_backends-$portVersion.patchset" @@ -46,6 +46,7 @@ REQUIRES=" lib:libpng16$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libusb_1.0$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -63,6 +64,7 @@ BUILD_REQUIRES=" devel:libpng16$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libusb_1.0$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -82,6 +84,7 @@ BUILD_PREREQUIRES=" BUILD() { + export LIBS="-lnetwork" runConfigure configure \ --prefix=$prefix \ --bindir=$binDir \ @@ -96,9 +99,8 @@ BUILD() --disable-locking \ --with-usb \ --enable-rpath \ - --enable-pnm-backend \ - LIBS=-lnetwork - + --enable-pnm-backend + make }