sane_backends: bump to 1.0.30 (#5125)

* sane_backends: bump version

media-gfx/sane_backends/patches/sane_backends-1.0.25.patchset

@@ -1,126 +0,0 @@
-From a3963c94ca858b1232d8b7fa36166e6e18ebeddd 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
-
-
-diff --git a/backend/epsonds-jpeg.c b/backend/epsonds-jpeg.c
-index 76a52cb..cb01bd4 100644
---- a/backend/epsonds-jpeg.c
-+++ b/backend/epsonds-jpeg.c
-@@ -13,6 +13,10 @@
- 
- #define DEBUG_DECLARE_ONLY
- 
-+#ifdef __HAIKU__
-+#define _STDLIB_H_
-+#endif
-+
- #include <math.h>
- 
- #include "epsonds.h"
-@@ -47,8 +51,8 @@ jpeg_term_source(j_decompress_ptr UNUSEDARG 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/backend/pixma_bjnp.c b/backend/pixma_bjnp.c
-index 7d2d541..b21bc97 100644
---- a/backend/pixma_bjnp.c
-+++ b/backend/pixma_bjnp.c
-@@ -106,6 +106,10 @@
- # define SSIZE_MAX      LONG_MAX
- #endif 
- 
-+#ifdef __HAIKU__
-+#undef HAVE_IFADDRS_H
-+#endif
-+
- /* static data */
- static bjnp_device_t device[BJNP_NO_DEVICES];
- static int bjnp_no_devices = 0;
-diff --git a/sanei/sanei_ir.c b/sanei/sanei_ir.c
-index 42e82ba..f2971f3 100644
---- a/sanei/sanei_ir.c
-+++ b/sanei/sanei_ir.c
-@@ -29,7 +29,9 @@
- 
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __HAIKU__
- #include <values.h>
-+#endif
- #include <math.h>
- 
- #define BACKEND_NAME sanei_ir	/* name of this module for debugging */
-diff --git a/sanei/sanei_thread.c b/sanei/sanei_thread.c
-index 8db4a21..56444c2 100644
---- a/sanei/sanei_thread.c
-+++ b/sanei/sanei_thread.c
-@@ -487,6 +487,7 @@ SANE_Pid
- sanei_thread_waitpid( SANE_Pid pid, int *status )
- {
- #ifdef USE_PTHREAD
-+	int rc;
- 	int *ls;
- #else
- 	int ls;
-@@ -499,7 +500,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
--	int rc;
- 	rc = pthread_join( (pthread_t)pid, (void*)&ls );
- 
- 	if( 0 == rc ) {
-diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c
-index f210d4f..9c07d22 100644
---- a/sanei/sanei_usb.c
-+++ b/sanei/sanei_usb.c
-@@ -2185,6 +2185,7 @@ sanei_usb_clear_halt (SANE_Int dn)
-       return SANE_STATUS_INVAL;
-     }
- 
-+#ifndef __HAIKU__
- #ifdef HAVE_LIBUSB
- 
-   /* This call seems to be required by Linux xhci driver
-@@ -2227,7 +2228,7 @@ sanei_usb_clear_halt (SANE_Int dn)
- #else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
-   DBG (1, "sanei_usb_clear_halt: libusb support missing\n");
- #endif /* HAVE_LIBUSB || HAVE_LIBUSB_1_0 */
--
-+#endif
-   return SANE_STATUS_GOOD;
- }
- 
--- 
-2.2.2
-
-
-From 1e17da6b666d2b438bfd0a3b7007421c51788312 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Fri, 13 Nov 2015 11:38:32 +0000
-Subject: Disable IPV6 for pixma_bjnp
-
-
-diff --git a/backend/pixma_bjnp.c b/backend/pixma_bjnp.c
-index b21bc97..b8e3f7c 100644
---- a/backend/pixma_bjnp.c
-+++ b/backend/pixma_bjnp.c
-@@ -108,6 +108,7 @@
- 
- #ifdef __HAIKU__
- #undef HAVE_IFADDRS_H
-+#undef ENABLE_IPV6
- #endif
- 
- /* static data */
--- 
-2.2.2
-

media-gfx/sane_backends/patches/sane_disable_libusb_context.patchset

@@ -1,50 +0,0 @@
-From ed4c9a8b17ced9f1668084539509d7866438fdc4 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 16 Nov 2015 11:13:48 +0000
-Subject: Disable libusb context for Haiku
-
-
-diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c
-index 9c07d22..e4f8b1d 100644
---- a/sanei/sanei_usb.c
-+++ b/sanei/sanei_usb.c
-@@ -498,7 +498,12 @@ sanei_usb_init (void)
-   if (!sanei_usb_ctx)
-     {
-       DBG (4, "%s: initializing libusb-1.0\n", __func__);
-+#ifdef __HAIKU__
-+      ret = libusb_init (NULL);
-+      sanei_usb_ctx = -1;
-+#else
-       ret = libusb_init (&sanei_usb_ctx);
-+#endif      
-       if (ret < 0)
- 	{
- 	  DBG (1,
-@@ -556,7 +561,11 @@ int i;
- #ifdef HAVE_LIBUSB_1_0
-       if (sanei_usb_ctx)
-         {
-+#ifdef __HAIKU__
-+          libusb_exit (NULL);
-+#else
-           libusb_exit (sanei_usb_ctx);
-+#endif          
- 	  /* reset libusb-1.0 context */
- 	  sanei_usb_ctx=NULL;
-         }
-@@ -880,7 +889,11 @@ static void libusb_scan_devices(void)
- 
-   DBG (4, "%s: Looking for libusb-1.0 devices\n", __func__);
- 
-+#ifdef __HAIKU__
-+  ndev = libusb_get_device_list (NULL, &devlist);
-+#else
-   ndev = libusb_get_device_list (sanei_usb_ctx, &devlist);
-+#endif  
-   if (ndev < 0)
-     {
-       DBG (1,
--- 
-2.2.2
-

media-gfx/sane_backends/sane_backends-1.0.25.recipe

@@ -1,125 +0,0 @@
-SUMMARY="Scanner Access Now Easy (SANE)"
-DESCRIPTION="
-SANE stands for \"Scanner Access Now Easy\" and is an application programming \
-interface (API) that provides standardized access to any raster image scanner \
-hardware (flatbed scanner, hand-held scanner, video- and still-cameras, frame-\
-grabbers, etc.).
-
-The SANE standard is free and its discussion and development \
-are open to everybody. The current source code is written to support several \
-operating systems, including GNU/Linux, OS/2, Win32 and various Unices and is \
-available under the GNU General Public License (commercial applications and \
-backends are welcome, too, however).
-
-This package includes scanners backends, the command line frontend scanimage, \
-the saned server and the sane-find-scanner utility, along with their \
-documentation.
-"
-HOMEPAGE="http://www.sane-project.org"
-COPYRIGHT="David Mosberger-Tang, Andy Beck"
-LICENSE="GNU LGPL v2"
-REVISION="6"
-SOURCE_URI="https://alioth.debian.org/frs/download.php/file/4146/sane-backends-$portVersion.tar.gz"
-CHECKSUM_SHA256="a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c"
-SOURCE_DIR="sane-backends-$portVersion"
-PATCHES="
-	sane_backends-$portVersion.patchset
-	sane_disable_libusb_context.patchset
-	"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-GLOBAL_WRITABLE_FILES="
-	settings/sane.d directory keep-old
-	"
-
-PROVIDES="
-	sane_backends$secondaryArchSuffix = $portVersion
-	cmd:gamma4scanimage$secondaryArchSuffix = $portVersion
-	cmd:sane_config$secondaryArchSuffix = $portVersion
-	cmd:sane_find_scanner$secondaryArchSuffix = $portVersion
-	cmd:saned$secondaryArchSuffix = $portVersion
-	cmd:scanimage$secondaryArchSuffix = $portVersion
-	cmd:umax_pp$secondaryArchSuffix
-	lib:libsane$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libjpeg$secondaryArchSuffix
-	lib:libtiff$secondaryArchSuffix
-	lib:libusb_1.0$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	sane_backends${secondaryArchSuffix}_devel = $portVersion
-	devel:libsane$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES_devel="
-	sane_backends$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	devel:libjpeg$secondaryArchSuffix
-	devel:libtiff$secondaryArchSuffix
-	devel:libusb_1.0$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:awk
-	cmd:find
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-
-	runConfigure configure \
-		--prefix=$prefix \
-		--bindir=$binDir \
-		--sbindir=$binDir \
-		--libdir=$libDir \
-		--includedir=$includeDir \
-		--datadir=$dataDir \
-		--with-docdir=$docDir \
-		--enable-pthread \
-		--disable-latex \
-		--disable-translations \
-		--enable-libusb_1_0 \
-		--enable-rpath \
-		--enable-pnm-backend \
-		LIBS=-lnetwork
-
-	make
-}
-
-INSTALL()
-{
-	make install-strip
-
-	rm $libDir/libsane.la
-
-	# prepare develop/lib
-	prepareInstalledDevelLibs libsane
-	fixPkgconfig
-
-	# hack for old BeOS apps (Sanity)
-	ln -s $libDir/libsane.so.1 $libDir/libsane.so
-
-	# devel package
-	packageEntries devel \
-		$developDir
-
-}

media-gfx/sane_backends/sane_backends-1.0.30.recipe

@@ -13,17 +13,16 @@ backends are welcome, too, however).
 This package includes scanners backends, the command line frontend scanimage, \
 the saned server and the sane-find-scanner utility, along with their \
 documentation."
-
 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/54f858b20a364fc35d820df935a86478/sane-backends-$portVersion.tar.gz"
+SOURCE_URI="https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-$portVersion.tar.gz"
-CHECKSUM_SHA256="aa027b4e5f59849cd41b8c26d54584cf31fffd986049019be6ad4140e11ea8ed"
+CHECKSUM_SHA256="3f5d96a9c47f6124a46bb577c776bbc4896dd17b9203d8bfbc7fe8cbbcf279a3"
 SOURCE_DIR="sane-backends-$portVersion"
 PATCHES="sane_backends-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+ARCHITECTURES="?x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 GLOBAL_WRITABLE_FILES="