CVS commit: pkgsrc/graphics/argyllcms

["Jonathan A. Kollasch" <jakllsch%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jakllsch
Date:           Mon Mar 10 22:40:50 UTC 2025

Modified Files:
        pkgsrc/graphics/argyllcms: Makefile distinfo
        pkgsrc/graphics/argyllcms/patches: patch-spectro_usbio__bsd.c

Log Message:
argyllcms: implement timeout setting for ugen(4) on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/argyllcms/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/argyllcms/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.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/argyllcms/Makefile
diff -u pkgsrc/graphics/argyllcms/Makefile:1.3 pkgsrc/graphics/argyllcms/Makefile:1.4
--- pkgsrc/graphics/argyllcms/Makefile:1.3      Mon Mar 10 15:38:12 2025
+++ pkgsrc/graphics/argyllcms/Makefile  Mon Mar 10 22:40:50 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2025/03/10 15:38:12 jakllsch Exp $
+# $NetBSD: Makefile,v 1.4 2025/03/10 22:40:50 jakllsch Exp $
 
 DISTNAME=      Argyll_V3.3.0_src
 PKGNAME=       ${DISTNAME:S/_V/cms-/:S/_src$//:tl}
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.argyllcms.com/
 EXTRACT_SUFX=  .zip

Index: pkgsrc/graphics/argyllcms/distinfo
diff -u pkgsrc/graphics/argyllcms/distinfo:1.2 pkgsrc/graphics/argyllcms/distinfo:1.3
--- pkgsrc/graphics/argyllcms/distinfo:1.2      Mon Mar 10 15:38:12 2025
+++ pkgsrc/graphics/argyllcms/distinfo  Mon Mar 10 22:40:50 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2025/03/10 15:38:12 jakllsch Exp $
+$NetBSD: distinfo,v 1.3 2025/03/10 22:40:50 jakllsch Exp $
 
 BLAKE2s (Argyll_V3.3.0_src.zip) = 31e822b2632c3c6d23059ac7b0a94e144a361015e24928a4a3edec91a7980062
 SHA512 (Argyll_V3.3.0_src.zip) = 96e9aeaec991ae005ea7156a691c1cff508fa1cad538261b1a128bceb763d641b93ab86b586eaa8b89eb37334f3eaaf97ac412db51b116690a9228232361651d
@@ -9,4 +9,4 @@ SHA1 (patch-spectro_hidio.c) = bf61035b9
 SHA1 (patch-spectro_hidio.h) = cdf6600dd0c346fcc1e6b2d514e8a488dc3c771f
 SHA1 (patch-spectro_icoms__ux.c) = 729883ffb5c7060a9b87b23f8eb79fd6458e13f4
 SHA1 (patch-spectro_usbio.c) = 762d01c3dd65c27605e2abfb3cfc957bef1ba8e5
-SHA1 (patch-spectro_usbio__bsd.c) = 27e70463027b00e780664acf00e010591a942efe
+SHA1 (patch-spectro_usbio__bsd.c) = 981ec261cb29eae14a1c1d11a06ccbcf6bc7ea4b

Index: pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c
diff -u pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c:1.2 pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c:1.3
--- pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c:1.2    Mon Mar 10 15:38:12 2025
+++ pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c        Mon Mar 10 22:40:50 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-spectro_usbio__bsd.c,v 1.2 2025/03/10 15:38:12 jakllsch Exp $
+$NetBSD: patch-spectro_usbio__bsd.c,v 1.3 2025/03/10 22:40:50 jakllsch Exp $
 
 Attempt to make actually function with NetBSD ugen(4).
 
@@ -194,7 +194,7 @@ Attempt to make actually function with N
        /* Install the cleanup signal handlers, and add to our cleanup list */
        usb_install_signal_handlers(p);
  
-@@ -447,88 +509,23 @@ static int icoms_usb_transaction(
+@@ -447,174 +509,31 @@ static int icoms_usb_transaction(
        int length,
        unsigned int timeout            /* In msec */
  ) {
@@ -215,7 +215,8 @@ Attempt to make actually function with N
 -              a1logv(p->log, 1, "icoms_usb_transaction: reaper thread is not running\n");
 -              return ICOM_SYS;
 -      }
-+      /* XXX USB_SET_TIMEOUT */
++      if (ioctl(p->ep[endpoint&0xf].fd, USB_SET_TIMEOUT, &timeout) < 0)
++              a1logd(p->log, 8, "icoms_usb_transaction: SET_TIMEOUT failed\n");
  
 -      /* Translate icoms transfer type of Linux */
 -      switch (ttype) {
@@ -290,7 +291,7 @@ Attempt to make actually function with N
        if (cancelt != NULL) {
                amutex_lock(cancelt->cmtx);
                cancelt->hcancel = (void *)&req;
-@@ -536,85 +533,7 @@ a1logd(p->log, 8, "icoms_usb_transaction
+-              cancelt->state = 1;
                amutex_unlock(cancelt->cond);           /* Signal any thread waiting for IO start */
                amutex_unlock(cancelt->cmtx);
        }
@@ -415,7 +416,7 @@ Attempt to make actually function with N
  
        return reqrv;
  }
-@@ -668,51 +574,34 @@ int value, int index, unsigned char *byt
+@@ -668,51 +574,35 @@ int value, int index, unsigned char *byt
  int timeout) {
        int reqrv = ICOM_OK;
        int dirw = (requesttype & IUSB_REQ_DIR_MASK) == IUSB_REQ_HOST_TO_DEV ? 1 : 0;
@@ -460,7 +461,8 @@ Attempt to make actually function with N
  
 -      if (transferred != NULL)        /* Adjust for header size requested */
 -              *transferred -= IUSB_REQ_HEADER_SIZE;
-+      /* XXX USB_SET_TIMEOUT */
++      if (ioctl(p->ep[0].fd, USB_SET_TIMEOUT, &timeout) < 0)
++              a1logd(p->log, 8, "icoms_usb_control_msg: SET_TIMEOUT failed\n");
  
 -      free(buf);
 +      if (ioctl(p->ep[0].fd, USB_DO_REQUEST, &ucr) < 0)
@@ -483,7 +485,7 @@ Attempt to make actually function with N
  
  /* Cancel i/o in another thread */
  int icoms_usb_cancel_io(
-@@ -720,8 +609,9 @@ int icoms_usb_cancel_io(
+@@ -720,8 +610,9 @@ int icoms_usb_cancel_io(
        usb_cancelt *cancelt
  ) {
        int rv = ICOM_OK;
@@ -494,7 +496,7 @@ Attempt to make actually function with N
        usb_lock_cancel(cancelt);
        if (cancelt->hcancel != NULL)
                rv = cancel_req(p, (usbio_req *)cancelt->hcancel, -1);
-@@ -742,6 +632,8 @@ int icoms_usb_resetep(
+@@ -742,6 +633,8 @@ int icoms_usb_resetep(
  ) {
        int rv = ICOM_OK;
  
@@ -503,7 +505,7 @@ Attempt to make actually function with N
  #ifdef NEVER    // ~~99
        if ((rv = ioctl(p->usbd->fd, USBDEVFS_RESETEP, &ep)) != 0) {
                a1logd(p->log, 1, "icoms_usb_resetep failed with %d\n",rv);
-@@ -759,6 +651,8 @@ int icoms_usb_clearhalt(
+@@ -759,6 +652,8 @@ int icoms_usb_clearhalt(
  ) {
        int rv = ICOM_OK;