From 4b7b7e80156ef503cae2e18f4cda72a8ced4a4c4 Mon Sep 17 00:00:00 2001 From: kenmays Date: Mon, 6 Jun 2022 08:47:11 -0700 Subject: [PATCH] sane-backends: bump to 1.1.1 (#6975) --- ....patchset => sane_backends-1.1.1.patchset} | 41 ++++--------------- ...0.32.recipe => sane_backends-1.1.1.recipe} | 7 +++- 2 files changed, 13 insertions(+), 35 deletions(-) rename media-gfx/sane_backends/patches/{sane_backends-1.0.32.patchset => sane_backends-1.1.1.patchset} (80%) rename media-gfx/sane_backends/{sane_backends-1.0.32.recipe => sane_backends-1.1.1.recipe} (90%) diff --git a/media-gfx/sane_backends/patches/sane_backends-1.0.32.patchset b/media-gfx/sane_backends/patches/sane_backends-1.1.1.patchset similarity index 80% rename from media-gfx/sane_backends/patches/sane_backends-1.0.32.patchset rename to media-gfx/sane_backends/patches/sane_backends-1.1.1.patchset index ce89c4234..4ec86bf1d 100644 --- a/media-gfx/sane_backends/patches/sane_backends-1.0.32.patchset +++ b/media-gfx/sane_backends/patches/sane_backends-1.1.1.patchset @@ -1,4 +1,4 @@ -From 42cdfe983ce6d2277bc3afbdc190aeb4b595881e Mon Sep 17 00:00:00 2001 +From 4d3d64b53ed21d35e68e96816396eaa96bb310ab 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,10 +18,10 @@ index 49cca1a..269fdbc 100644 { unsigned int shm_size = sizeof(struct urb_counters_t); -- -2.30.0 +2.36.1 -From 1b9ed880f9c7d22bb7b99de6363c331628e6ad9e Mon Sep 17 00:00:00 2001 +From 3fd5aa0d7466f101a08c6e1e74bd74925ed019f6 Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Thu, 5 Sep 2019 01:15:08 +0000 Subject: Fix strsep redefined @@ -46,10 +46,10 @@ index 9d7faea..7f95ff7 100644 /* Prototype for usleep */ #ifndef HAVE_USLEEP -- -2.30.0 +2.36.1 -From 9aa3b99faf7f1deaea4474379d7e23388a99aff7 Mon Sep 17 00:00:00 2001 +From 112d2bdf7929d042db39b320aceeb68ac9a7d742 Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Thu, 5 Sep 2019 01:15:08 +0000 Subject: Fix fcntl placement @@ -69,40 +69,15 @@ index 48f464a..143a044 100644 #include "../include/sane/sane.h" #include "../include/sane/sanei.h" -- -2.30.0 +2.36.1 -From cc163fd192034ef26dafeec1edf70a00f9a9b129 Mon Sep 17 00:00:00 2001 +From 4511b6b25ce4a80cdcbfe306a4041569d51e4ad9 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 -diff --git a/backend/epsonds-jpeg.c b/backend/epsonds-jpeg.c -index 244f442..12b4a90 100644 ---- a/backend/epsonds-jpeg.c -+++ b/backend/epsonds-jpeg.c -@@ -15,6 +15,10 @@ - - #include "sane/config.h" - -+#ifdef __HAIKU__ -+#define _STDLIB_H_ -+#endif -+ - #include - - #include "epsonds.h" -@@ -49,8 +53,8 @@ jpeg_term_source(j_decompress_ptr __sane_unused__ cinfo) - METHODDEF(boolean) - jpeg_fill_input_buffer(j_decompress_ptr cinfo) - { -- epsonds_src_mgr *src = (epsonds_src_mgr *)cinfo->src; - int avail, size; -+ epsonds_src_mgr *src = (epsonds_src_mgr *)cinfo->src; - - /* read from the scanner or the ring buffer */ - diff --git a/sanei/sanei_thread.c b/sanei/sanei_thread.c index a5dcae1..1d679cd 100644 --- a/sanei/sanei_thread.c @@ -181,5 +156,5 @@ index 022f6fa..8cf1ce6 100644 return SANE_STATUS_GOOD; } -- -2.30.0 +2.36.1 diff --git a/media-gfx/sane_backends/sane_backends-1.0.32.recipe b/media-gfx/sane_backends/sane_backends-1.1.1.recipe similarity index 90% rename from media-gfx/sane_backends/sane_backends-1.0.32.recipe rename to media-gfx/sane_backends/sane_backends-1.1.1.recipe index fcd07aab9..02eb18f7f 100644 --- a/media-gfx/sane_backends/sane_backends-1.0.32.recipe +++ b/media-gfx/sane_backends/sane_backends-1.1.1.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/104f09c07d35519cc8e72e604f11643f/sane-backends-$portVersion.tar.gz" -CHECKSUM_SHA256="3a28c237c0a72767086202379f6dc92dbb63ec08dfbab22312cba80e238bb114" +SOURCE_URI="https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/sane-backends-$portVersion.tar.gz" +CHECKSUM_SHA256="dd4b04c37a42f14c4619e8eea6a957f4c7c617fe59e32ae2872b373940a8b603" SOURCE_DIR="sane-backends-$portVersion" PATCHES="sane_backends-$portVersion.patchset" @@ -41,9 +41,11 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + cmd:python3$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng16$secondaryArchSuffix + lib:libpython3.7m$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libusb_1.0$secondaryArchSuffix lib:libxml2$secondaryArchSuffix @@ -62,6 +64,7 @@ BUILD_REQUIRES=" devel:libcurl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng16$secondaryArchSuffix + devel:libpython3.7m$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libusb_1.0$secondaryArchSuffix devel:libxml2$secondaryArchSuffix