diff --git a/media-gfx/sane_backends/patches/sane_backends-1.0.31.patchset b/media-gfx/sane_backends/patches/sane_backends-1.0.32.patchset similarity index 83% rename from media-gfx/sane_backends/patches/sane_backends-1.0.31.patchset rename to media-gfx/sane_backends/patches/sane_backends-1.0.32.patchset index 00de726c0..ce89c4234 100644 --- a/media-gfx/sane_backends/patches/sane_backends-1.0.31.patchset +++ b/media-gfx/sane_backends/patches/sane_backends-1.0.32.patchset @@ -1,14 +1,14 @@ -From 22f217554ee32548386902edd059f75ac56ca99f Mon Sep 17 00:00:00 2001 +From 42cdfe983ce6d2277bc3afbdc190aeb4b595881e 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 diff --git a/backend/snapscan-usb.c b/backend/snapscan-usb.c -index 116f9db..a9a2782 100644 +index 49cca1a..269fdbc 100644 --- a/backend/snapscan-usb.c +++ b/backend/snapscan-usb.c -@@ -534,7 +534,7 @@ static void snapscani_usb_shm_exit(void) +@@ -533,7 +533,7 @@ static void snapscani_usb_shm_exit(void) } #else #include @@ -21,7 +21,7 @@ index 116f9db..a9a2782 100644 2.30.0 -From 7067ddbc5f1590f54d9e320ebb21013ea356ad1d Mon Sep 17 00:00:00 2001 +From 1b9ed880f9c7d22bb7b99de6363c331628e6ad9e Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Thu, 5 Sep 2019 01:15:08 +0000 Subject: Fix strsep redefined @@ -49,7 +49,7 @@ index 9d7faea..7f95ff7 100644 2.30.0 -From 472850d2df371947fb5f377c02db9824caa1eac8 Mon Sep 17 00:00:00 2001 +From 9aa3b99faf7f1deaea4474379d7e23388a99aff7 Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Thu, 5 Sep 2019 01:15:08 +0000 Subject: Fix fcntl placement @@ -72,7 +72,7 @@ index 48f464a..143a044 100644 2.30.0 -From acfff8de93fb3b6988143b9b3cfc41a72fe660bd Mon Sep 17 00:00:00 2001 +From cc163fd192034ef26dafeec1edf70a00f9a9b129 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 @@ -104,10 +104,10 @@ index 244f442..12b4a90 100644 /* read from the scanner or the ring buffer */ diff --git a/sanei/sanei_thread.c b/sanei/sanei_thread.c -index f701423..f48dd3c 100644 +index a5dcae1..1d679cd 100644 --- a/sanei/sanei_thread.c +++ b/sanei/sanei_thread.c -@@ -486,6 +486,7 @@ SANE_Pid +@@ -484,6 +484,7 @@ SANE_Pid sanei_thread_waitpid( SANE_Pid pid, int *status ) { #ifdef USE_PTHREAD @@ -115,7 +115,7 @@ index f701423..f48dd3c 100644 int *ls; #else int ls; -@@ -498,7 +499,6 @@ sanei_thread_waitpid( SANE_Pid pid, int *status ) +@@ -496,7 +497,6 @@ sanei_thread_waitpid( SANE_Pid pid, int *status ) DBG(2, "sanei_thread_waitpid() - %ld\n", sanei_thread_pid_to_long(pid)); #ifdef USE_PTHREAD @@ -124,10 +124,10 @@ index f701423..f48dd3c 100644 if( 0 == rc ) { diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c -index 4b49b11..1dd36a7 100644 +index 022f6fa..8cf1ce6 100644 --- a/sanei/sanei_usb.c +++ b/sanei/sanei_usb.c -@@ -1416,7 +1416,12 @@ sanei_usb_init (void) +@@ -1431,7 +1431,12 @@ sanei_usb_init (void) if (!sanei_usb_ctx) { DBG (4, "%s: initializing libusb-1.0\n", __func__); @@ -140,7 +140,7 @@ index 4b49b11..1dd36a7 100644 if (ret < 0) { DBG (1, -@@ -1486,7 +1491,11 @@ int i; +@@ -1501,7 +1506,11 @@ int i; #ifdef HAVE_LIBUSB if (sanei_usb_ctx) { @@ -152,7 +152,7 @@ index 4b49b11..1dd36a7 100644 /* reset libusb-1.0 context */ sanei_usb_ctx=NULL; } -@@ -1810,7 +1819,11 @@ static void libusb_scan_devices(void) +@@ -1825,7 +1834,11 @@ static void libusb_scan_devices(void) DBG (4, "%s: Looking for libusb-1.0 devices\n", __func__); @@ -164,7 +164,7 @@ index 4b49b11..1dd36a7 100644 if (ndev < 0) { DBG (1, -@@ -3089,6 +3102,7 @@ sanei_usb_clear_halt (SANE_Int dn) +@@ -3104,6 +3117,7 @@ sanei_usb_clear_halt (SANE_Int dn) if (testing_mode == sanei_usb_testing_mode_replay) return SANE_STATUS_GOOD; @@ -172,7 +172,7 @@ index 4b49b11..1dd36a7 100644 #ifdef HAVE_LIBUSB_LEGACY int ret; -@@ -3139,6 +3153,7 @@ sanei_usb_clear_halt (SANE_Int dn) +@@ -3154,6 +3168,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 */ diff --git a/media-gfx/sane_backends/sane_backends-1.0.31.recipe b/media-gfx/sane_backends/sane_backends-1.0.32.recipe similarity index 93% rename from media-gfx/sane_backends/sane_backends-1.0.31.recipe rename to media-gfx/sane_backends/sane_backends-1.0.32.recipe index d3909e930..2cd2cda68 100644 --- a/media-gfx/sane_backends/sane_backends-1.0.31.recipe +++ b/media-gfx/sane_backends/sane_backends-1.0.32.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/8bf1cae2e1803aefab9e5331550e5d5d/sane-backends-$portVersion.tar.gz" -CHECKSUM_SHA256="4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa" +SOURCE_URI="https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-$portVersion.tar.gz" +CHECKSUM_SHA256="3a28c237c0a72767086202379f6dc92dbb63ec08dfbab22312cba80e238bb114" SOURCE_DIR="sane-backends-$portVersion" PATCHES="sane_backends-$portVersion.patchset"