CVS commit: pkgsrc/graphics/sane-backends

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Nov  1 19:27:59 UTC 2024

Modified Files:
        pkgsrc/graphics/sane-backends: Makefile distinfo
Added Files:
        pkgsrc/graphics/sane-backends/patches: patch-backend_epson.c

Log Message:
sane-backends: Fix build on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/graphics/sane-backends/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/sane-backends/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/sane-backends/patches/patch-backend_epson.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/sane-backends/Makefile
diff -u pkgsrc/graphics/sane-backends/Makefile:1.96 pkgsrc/graphics/sane-backends/Makefile:1.97
--- pkgsrc/graphics/sane-backends/Makefile:1.96 Fri Nov  1 12:53:02 2024
+++ pkgsrc/graphics/sane-backends/Makefile      Fri Nov  1 19:27:58 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2024/11/01 12:53:02 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2024/11/01 19:27:58 triaxx Exp $
 
-PKGREVISION=   3
+PKGREVISION=   4
 .include "Makefile.common"
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=sane-project/backends/uploads/83bdbb6c9a115184c2d48f1fdc6847db/}
 COMMENT=       API for access to scanners, digital cameras, frame grabbers, etc

Index: pkgsrc/graphics/sane-backends/distinfo
diff -u pkgsrc/graphics/sane-backends/distinfo:1.54 pkgsrc/graphics/sane-backends/distinfo:1.55
--- pkgsrc/graphics/sane-backends/distinfo:1.54 Wed Sep 25 13:04:00 2024
+++ pkgsrc/graphics/sane-backends/distinfo      Fri Nov  1 19:27:58 2024
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.54 2024/09/25 13:04:00 triaxx Exp $
+$NetBSD: distinfo,v 1.55 2024/11/01 19:27:58 triaxx Exp $
 
 BLAKE2s (sane-backends-1.3.1.tar.gz) = 470d826917835c901a3b5d6f57c8b0d38cba0e8e8491fba2aeb6e9e74bffbd11
 SHA512 (sane-backends-1.3.1.tar.gz) = c6c12bce5242fcdf208f034cc544605cad36fad60316cb51f0e1f6fe23d1566823778c7af4b0fc94ca4154e2cd3e38a9202073e4a4af05f641c3da081722a535
 Size (sane-backends-1.3.1.tar.gz) = 7432184 bytes
 SHA1 (patch-aa) = 6e2c605cbf6b437f4da2ba30d5e61c7d64e32bda
 SHA1 (patch-ab) = 0f5ceb8b2e80c354bc8661c0dbc80e23c4f80ebe
+SHA1 (patch-backend_epson.c) = e292ad2e74b9e2b88835706714806eb70e03d5d5
 SHA1 (patch-backend_pixma_pixma__bjnp.c) = c2e99ba6a4e6b177b0f8d151b65ece23cc44e3ef
 SHA1 (patch-m4_byteorder.m4) = 9e44d6a14b4c9de681dedcfb64344d21f6b549fc
 SHA1 (patch-tools_umax__pp.c) = debe660184a1380a894e8a5414983f5fdb19cded

Added files:

Index: pkgsrc/graphics/sane-backends/patches/patch-backend_epson.c
diff -u /dev/null pkgsrc/graphics/sane-backends/patches/patch-backend_epson.c:1.1
--- /dev/null   Fri Nov  1 19:27:59 2024
+++ pkgsrc/graphics/sane-backends/patches/patch-backend_epson.c Fri Nov  1 19:27:58 2024
@@ -0,0 +1,289 @@
+$NetBSD: patch-backend_epson.c,v 1.1 2024/11/01 19:27:58 triaxx Exp $
+
+Rename send() function as it conflicts with system function on Darwin with
+recent clang-16.
+https://gitlab.com/sane-project/backends/-/commit/1b12daf3d521495c6fb325d82035a83f100e0cc1
+
+--- backend/epson.c.orig       2024-11-01 18:21:24.509916894 +0000
++++ backend/epson.c
+@@ -851,7 +851,7 @@ static EpsonHdrUnion command (Epson_Scan
+                          SANE_Status * status);
+ static SANE_Status get_identity_information (SANE_Handle handle);
+ static SANE_Status get_identity2_information (SANE_Handle handle);
+-static int send (Epson_Scanner * s, void *buf, size_t buf_size,
++static int scanner_send (Epson_Scanner * s, void *buf, size_t buf_size,
+                  SANE_Status * status);
+ static ssize_t receive (Epson_Scanner * s, void *buf, ssize_t buf_size,
+                         SANE_Status * status);
+@@ -880,7 +880,7 @@ static void scan_finish (Epson_Scanner *
+  */
+ 
+ static int
+-send (Epson_Scanner * s, void *buf, size_t buf_size, SANE_Status * status)
++scanner_send (Epson_Scanner * s, void *buf, size_t buf_size, SANE_Status * status)
+ {
+   DBG (3, "send buf, size = %lu\n", (u_long) buf_size);
+ 
+@@ -1072,12 +1072,12 @@ set_cmd (Epson_Scanner * s, u_char cmd,
+   params[0] = ESC;
+   params[1] = cmd;
+ 
+-  send (s, params, 2, &status);
++  scanner_send (s, params, 2, &status);
+   if (SANE_STATUS_GOOD != (status = expect_ack (s)))
+     return status;
+ 
+   params[0] = val;
+-  send (s, params, 1, &status);
++  scanner_send (s, params, 1, &status);
+   status = expect_ack (s);
+ 
+   return status;
+@@ -1151,7 +1151,7 @@ set_zoom (Epson_Scanner * s, int x_zoom,
+   cmd[0] = ESC;
+   cmd[1] = s->hw->cmd->set_zoom;
+ 
+-  send (s, cmd, 2, &status);
++  scanner_send (s, cmd, 2, &status);
+   status = expect_ack (s);
+ 
+   if (status != SANE_STATUS_GOOD)
+@@ -1160,7 +1160,7 @@ set_zoom (Epson_Scanner * s, int x_zoom,
+   params[0] = x_zoom;
+   params[1] = y_zoom;
+ 
+-  send (s, params, 2, &status);
++  scanner_send (s, params, 2, &status);
+   status = expect_ack (s);
+ 
+   return status;
+@@ -1179,7 +1179,7 @@ set_resolution (Epson_Scanner * s, int x
+   params[0] = ESC;
+   params[1] = s->hw->cmd->set_resolution;
+ 
+-  send (s, params, 2, &status);
++  scanner_send (s, params, 2, &status);
+   status = expect_ack (s);
+ 
+   if (status != SANE_STATUS_GOOD)
+@@ -1190,7 +1190,7 @@ set_resolution (Epson_Scanner * s, int x
+   params[2] = yres;
+   params[3] = yres >> 8;
+ 
+-  send (s, params, 4, &status);
++  scanner_send (s, params, 4, &status);
+   status = expect_ack (s);
+ 
+   return status;
+@@ -1224,7 +1224,7 @@ set_scan_area (Epson_Scanner * s, int x,
+   params[0] = ESC;
+   params[1] = s->hw->cmd->set_scan_area;
+ 
+-  send (s, params, 2, &status);
++  scanner_send (s, params, 2, &status);
+   status = expect_ack (s);
+   if (status != SANE_STATUS_GOOD)
+     return status;
+@@ -1238,7 +1238,7 @@ set_scan_area (Epson_Scanner * s, int x,
+   params[6] = height;
+   params[7] = height >> 8;
+ 
+-  send (s, params, 8, &status);
++  scanner_send (s, params, 8, &status);
+   status = expect_ack (s);
+ 
+   return status;
+@@ -1267,7 +1267,7 @@ set_color_correction_coefficients (Epson
+   params[0] = ESC;
+   params[1] = cmd;
+ 
+-  send (s, params, 2, &status);
++  scanner_send (s, params, 2, &status);
+   if (SANE_STATUS_GOOD != (status = expect_ack (s)))
+     return status;
+ 
+@@ -1285,7 +1285,7 @@ set_color_correction_coefficients (Epson
+        cct[0], cct[1], cct[2], cct[3],
+        cct[4], cct[5], cct[6], cct[7], cct[8]);
+ 
+-  send (s, cct, length, &status);
++  scanner_send (s, cct, length, &status);
+   status = expect_ack (s);
+   DBG (1, "set_color_correction_coefficients: ending=%d.\n", status);
+ 
+@@ -1376,11 +1376,11 @@ set_gamma_table (Epson_Scanner * s)
+       }
+     }
+ 
+-    send (s, params, 2, &status);
++    scanner_send (s, params, 2, &status);
+     if (SANE_STATUS_GOOD != (status = expect_ack (s)))
+       return status;
+ 
+-    send (s, gamma, length, &status);
++    scanner_send (s, gamma, length, &status);
+     if (SANE_STATUS_GOOD != (status = expect_ack (s)))
+       return status;
+ 
+@@ -1621,7 +1621,7 @@ reset (Epson_Scanner * s)
+       return status;
+   }
+ 
+-  send (s, param, 2, &status);
++  scanner_send (s, param, 2, &status);
+   status = expect_ack (s);
+ 
+   if (needToClose)
+@@ -1658,7 +1658,7 @@ close_scanner (Epson_Scanner * s)
+     param[0] = ESC;
+     param[1] = s->hw->cmd->request_status;
+     param[2]='\0';
+-    send(s,param,2,&status);
++    scanner_send(s,param,2,&status);
+     receive(s,result,4,&status);
+   }
+ 
+@@ -1782,7 +1782,7 @@ feed (Epson_Scanner * s)
+ 
+   params[0] = cmd;
+ 
+-  send (s, params, 1, &status);
++  scanner_send (s, params, 1, &status);
+ 
+   if (SANE_STATUS_GOOD != (status = expect_ack (s)))
+   {
+@@ -1824,7 +1824,7 @@ eject (Epson_Scanner * s)
+ 
+   params[0] = cmd;
+ 
+-  send (s, params, 1, &status);
++  scanner_send (s, params, 1, &status);
+ 
+   if (SANE_STATUS_GOOD != (status = expect_ack (s)))
+   {
+@@ -1866,7 +1866,7 @@ command (Epson_Scanner * s, u_char * cmd
+ 
+   head = &(hdrunion->hdr);
+ 
+-  send (s, cmd, cmd_size, status);
++  scanner_send (s, cmd, cmd_size, status);
+ 
+   if (SANE_STATUS_GOOD != *status)
+   {
+@@ -1874,7 +1874,7 @@ command (Epson_Scanner * s, u_char * cmd
+        it seems to fix the problem. It should not have any
+        ill effects on other scanners.  */
+     *status = SANE_STATUS_GOOD;
+-    send (s, cmd, cmd_size, status);
++    scanner_send (s, cmd, cmd_size, status);
+     if (SANE_STATUS_GOOD != *status)
+       return (EpsonHdrUnion) 0;
+   }
+@@ -4958,7 +4958,7 @@ sane_start (SANE_Handle handle)
+     params[0] = ESC;
+     params[1] = s->hw->cmd->request_extended_status;
+ 
+-    send (s, params, 2, &status);       /* send ESC f (request extended status) */
++    scanner_send (s, params, 2, &status);       /* send ESC f (request extended status) */
+ 
+     if (SANE_STATUS_GOOD == status)
+     {
+@@ -4999,7 +4999,7 @@ sane_start (SANE_Handle handle)
+     params[0] = ESC;
+     params[1] = s->hw->cmd->request_condition;
+ 
+-    send (s, params, 2, &status);       /* send request condition */
++    scanner_send (s, params, 2, &status);       /* send request condition */
+ 
+     if (SANE_STATUS_GOOD != status)
+       return status;
+@@ -5081,7 +5081,7 @@ sane_start (SANE_Handle handle)
+   params[0] = ESC;
+   params[1] = s->hw->cmd->start_scanning;
+ 
+-  send (s, params, 2, &status);
++  scanner_send (s, params, 2, &status);
+ 
+   if (SANE_STATUS_GOOD != status)
+   {
+@@ -5120,7 +5120,7 @@ sane_auto_eject (Epson_Scanner * s)
+ 
+     params[0] = cmd;
+ 
+-    send (s, params, 1, &status);
++    scanner_send (s, params, 1, &status);
+ 
+     if (SANE_STATUS_GOOD != (status = expect_ack (s)))
+     {
+@@ -5207,7 +5207,7 @@ read_data_block (Epson_Scanner * s, Epso
+       param[0] = ESC;
+       param[1] = s->hw->cmd->start_scanning;
+ 
+-      send (s, param, 2, &status);
++      scanner_send (s, param, 2, &status);
+ 
+       if (SANE_STATUS_GOOD != status)
+       {
+@@ -5347,7 +5347,7 @@ START_READ:
+        * send the ACK signal to the scanner in order to make
+        * it ready for the next data block.
+        */
+-      send (s, S_ACK, 1, &status);
++      scanner_send (s, S_ACK, 1, &status);
+ 
+       /*
+        * ... and request the next data block
+@@ -5388,7 +5388,7 @@ START_READ:
+         return status;
+       }
+ 
+-      send (s, S_ACK, 1, &status);
++      scanner_send (s, S_ACK, 1, &status);
+ 
+       /*
+        * ... and the last data block
+@@ -5460,7 +5460,7 @@ START_READ:
+     {
+       if (s->canceling)
+       {
+-        send (s, S_CAN, 1, &status);
++        scanner_send (s, S_CAN, 1, &status);
+         expect_ack (s);
+ 
+         *length = 0;
+@@ -5470,7 +5470,7 @@ START_READ:
+         return SANE_STATUS_CANCELLED;
+       }
+       else
+-        send (s, S_ACK, 1, &status);
++        scanner_send (s, S_ACK, 1, &status);
+     }
+ 
+     s->end = s->buf + buf_len;
+@@ -6132,7 +6132,7 @@ get_identity2_information (SANE_Handle h
+   param[1] = s->hw->cmd->request_identity2;
+   param[2] = '\0';
+ 
+-  send (s, param, 2, &status);
++  scanner_send (s, param, 2, &status);
+ 
+   if (SANE_STATUS_GOOD != status)
+     return status;
+@@ -6234,7 +6234,7 @@ request_focus_position (SANE_Handle hand
+   param[1] = s->hw->cmd->request_focus_position;
+   param[2] = '\0';
+ 
+-  send (s, param, 2, &status);
++  scanner_send (s, param, 2, &status);
+ 
+   if (SANE_STATUS_GOOD != status)
+     return status;
+@@ -6287,7 +6287,7 @@ request_push_button_status (SANE_Handle
+   param[1] = s->hw->cmd->request_push_button_status;
+   param[2] = '\0';
+ 
+-  send (s, param, 2, &status);
++  scanner_send (s, param, 2, &status);
+ 
+   if (SANE_STATUS_GOOD != status)
+   {