Merge pull request #19770 from lazka/sane-genesys

sane: add the genesys backend

mingw-w64-sane/001-fix-build-on-mingw.patch

@@ -390,7 +390,7 @@
        first_time = 0;
  
        DBG_INIT ();
-+#ifndef __WIN32
++#ifndef _WIN32
        /* set root uid */
        if (0 > setuid (0))
  	{
@@ -414,3 +414,29 @@
  
  #if defined (HAVE_LIBIEEE1284)
  
+--- backends-1.2.1/backend/genesys/genesys.cpp.orig	2024-01-16 06:44:21.772481200 +0100
++++ backends-1.2.1/backend/genesys/genesys.cpp	2024-01-16 06:44:49.795923100 +0100
+@@ -4447,7 +4447,11 @@
+         /* make sure .sane directory exists in existing store dir */
+         size = std::snprintf(&ret.front(), ret.size(), "%s%c.sane", ptr, PATH_SEP);
+         ret.resize(size);
+-        mkdir(ret.c_str(), 0700);
++#ifndef _WIN32
++        mkdir(ret.c_str(), 0700);
++#else
++        mkdir(ret.c_str());
++#endif
+ 
+         ret.resize(PATH_MAX);
+ #endif
+--- backends-1.2.1/acinclude.m4.orig	2024-01-16 06:41:13.923812800 +0100
++++ backends-1.2.1/acinclude.m4	2024-01-16 06:41:24.753478300 +0100
+@@ -714,7 +714,7 @@
+ /* Prototype for sigprocmask */
+ #ifndef HAVE_SIGPROCMASK
+ #define sigprocmask sanei_sigprocmask
+-int sigprocmask (int how, int *new, int *old);
++int sigprocmask (int how, int *new_, int *old);
+ #endif
+ 
+ /* Prototype for snprintf */

mingw-w64-sane/PKGBUILD

@@ -4,7 +4,7 @@ _realname=sane
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Scanner Access Now Easy ― Backends. (mingw-w64)"
 arch=('any')
 mingw_arch=('ucrt64' 'clang64' 'clangarm64')
@@ -30,7 +30,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
 source=("https://gitlab.com/sane-project/backends/-/archive/${pkgver}/backends-${pkgver}.tar.bz2"
         "001-fix-build-on-mingw.patch")
 sha256sums=('e432107d700ae07409755fe1193d6be27be3aa12533b76e25f6b0e1a98967671'
-            '814d09b3c862185ddab475bef56599d57d52c7f6f5cc8c10a32ec73ee5253c0f')
+            'c7d84a80d4f91000024562500b95de165b8200bae66f48d807e9f07e7e8f4bb2')
 
 prepare() {
   cd "backends-${pkgver}"
@@ -46,7 +46,7 @@ prepare() {
 build() {
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
-  export BACKENDS="abaton apple artec bh canon canon630u canon_dr canon_lide70 canon_pp cardscan coolscan2 coolscan3 dell1600n_net dmc epjitsu epson epson2 epsonds fujitsu gt68xx hp3900 hp4200 hp5400 hp5590 hpsj5s hpljm1005 hs2p ibm kodak kvs1025 kvs20xx leo lexmark ma1509 matsushita microtek mustek_usb mustek_usb2 nec niash ricoh ricoh2 rts8891 s9036 sceptre sharp sm3600 sm3840 st400 stv680 teco1 teco2 teco3 umax_pp xerox_mfp p5"
+  export BACKENDS="abaton apple artec bh canon canon630u canon_dr canon_lide70 canon_pp cardscan coolscan2 coolscan3 dell1600n_net dmc epjitsu epson epson2 epsonds fujitsu genesys gt68xx hp3900 hp4200 hp5400 hp5590 hpsj5s hpljm1005 hs2p ibm kodak kvs1025 kvs20xx leo lexmark ma1509 matsushita microtek mustek_usb mustek_usb2 nec niash ricoh ricoh2 rts8891 s9036 sceptre sharp sm3600 sm3840 st400 stv680 teco1 teco2 teco3 umax_pp xerox_mfp p5"
   CFLAGS+=" -Wno-implicit-function-declaration -Wno-int-conversion" \
   ../backends-${pkgver}/configure \
     --prefix="${MINGW_PREFIX}" \