pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/argyllcms
Module Name: pkgsrc
Committed By: jakllsch
Date: Wed Feb 11 02:41:15 UTC 2026
Modified Files:
pkgsrc/graphics/argyllcms: Makefile PLIST distinfo
pkgsrc/graphics/argyllcms/patches: patch-spectro_Jamfile
patch-spectro_hidio.c patch-spectro_hidio.h
patch-spectro_usbio__bsd.c
Added Files:
pkgsrc/graphics/argyllcms/patches: patch-Jamfile
Log Message:
Update argyllcms to 3.5.0
Change log since 3.4.1:
Version 3.5.0 4th February 2026
-------------
* Added MSWindows ARM release.
* Added Mac ARM release.
* Removed Mac PowerPC build from release.
* Added test profile forward and backward lookup error checks to
release sanity checking script.
* Changed colprof so that rather than just warning about an ink limit
being set for an additive device space, it ignores it.
* Fixed bug in targen introduced in V3.3.0 where it adds a default
ink limit for all device types. If not overidden later in the
profiling process, this can introduce an ink limit 10% less
than the unconstrained limit. This is a problem for additive devices.
* Fixed reported problem with some models of Spyder2024.
* Upgraded built-in libpng to V1.6.51
* Upgraded built-in zlib to V1.3.1
* Took a stab at adding libusb-win32 ARM64 system driver support.
Reported to work, but installing libusb-win32 system driver
is more difficult.
* Added Munsell Linear Grayscale scanin reference files.
(Thanks to Tarek A. Haila and Frank Schaumann)
* Added -g option to xicc/fakeCMY to emit RGB values rather
than CMY values.
* Tweaked i1d3 frequency measurement mode to return exactly
zero on measuring perfect black rather than the correctly
rounded value, so as to make it more consistent with the
period measurement mode. This inconsistency shows up with a
Rev. B when I1D3_DISABLE_AIO is set and the 0x83 bug
is triggered, and frequency measurement is used as a fallback
to period measurement mode.
Rev. A instruments shouldn't see any change since for them
the period measurement mode doesn't suffer from the 0x83 bug.
* Added -o observer option to xicc/specplot
* Improved robustness of command name filename parsing in a number of utilities.
* Expand spectro/average to handle input test charts.
* Improve JETI Specbos 2501 operation.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/argyllcms/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/argyllcms/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/argyllcms/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/argyllcms/patches/patch-Jamfile
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/graphics/argyllcms/patches/patch-spectro_Jamfile \
pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.h
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c
cvs rdiff -u -r1.3 -r1.4 \
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.8 pkgsrc/graphics/argyllcms/Makefile:1.9
--- pkgsrc/graphics/argyllcms/Makefile:1.8 Sun Sep 14 17:22:41 2025
+++ pkgsrc/graphics/argyllcms/Makefile Wed Feb 11 02:41:15 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2025/09/14 17:22:41 jakllsch Exp $
+# $NetBSD: Makefile,v 1.9 2026/02/11 02:41:15 jakllsch Exp $
-DISTNAME= Argyll_V3.4.1_src
+DISTNAME= Argyll_V3.5.0_src
PKGNAME= ${DISTNAME:S/_V/cms-/:S/_src$//:tl}
CATEGORIES= graphics
MASTER_SITES= http://www.argyllcms.com/
@@ -22,6 +22,8 @@ PKGCONFIG_OVERRIDE+= zlib/zlib.pc.in
TOOL_DEPENDS+= jam>=2.5.2:../../devel/jam
+INSTALLATION_DIRS+= share/metainfo
+
do-build:
cd ${WRKSRC} && ${SETENV} DESTDIR=${DESTDIR} PREFIX=${PREFIX} \
REFSUBDIR=share/argyll/ref \
@@ -33,7 +35,6 @@ do-install:
${MAKE_ENV} jam -q -fJambase ${_MAKE_JOBS} install
${MV} ${DESTDIR}${PREFIX}/bin/License.txt \
${DESTDIR}${PREFIX}/share/argyll/
- ${MKDIR} ${DESTDIR}${PREFIX}/share/metainfo
${MV} ${DESTDIR}${PREFIX}/bin/com.argyllcms.metainfo.xml \
${DESTDIR}${PREFIX}/share/metainfo/
@@ -49,5 +50,6 @@ do-install:
.include "../../graphics/tiff/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/argyllcms/PLIST
diff -u pkgsrc/graphics/argyllcms/PLIST:1.2 pkgsrc/graphics/argyllcms/PLIST:1.3
--- pkgsrc/graphics/argyllcms/PLIST:1.2 Sun Jul 13 12:59:03 2025
+++ pkgsrc/graphics/argyllcms/PLIST Wed Feb 11 02:41:15 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2025/07/13 12:59:03 jakllsch Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/02/11 02:41:15 jakllsch Exp $
bin/applycal
bin/average
bin/cb2ti3
@@ -103,6 +103,8 @@ share/argyll/ref/ISO12641_2_3_1.cht
share/argyll/ref/ISO12641_2_3_2.cht
share/argyll/ref/ISO12641_2_3_3.cht
share/argyll/ref/LaserSoftDCPro.cht
+share/argyll/ref/MLG.cht
+share/argyll/ref/MLG.cie
share/argyll/ref/Office.sp
share/argyll/ref/ProPhoto.icm
share/argyll/ref/ProPhotoLin.icm
Index: pkgsrc/graphics/argyllcms/distinfo
diff -u pkgsrc/graphics/argyllcms/distinfo:1.5 pkgsrc/graphics/argyllcms/distinfo:1.6
--- pkgsrc/graphics/argyllcms/distinfo:1.5 Sun Sep 14 17:22:41 2025
+++ pkgsrc/graphics/argyllcms/distinfo Wed Feb 11 02:41:15 2026
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.5 2025/09/14 17:22:41 jakllsch Exp $
+$NetBSD: distinfo,v 1.6 2026/02/11 02:41:15 jakllsch Exp $
-BLAKE2s (Argyll_V3.4.1_src.zip) = 60e9c14aba39588a6d668609fb7705ee27745527a97ae920d71e935c61f6a16c
-SHA512 (Argyll_V3.4.1_src.zip) = c2671fc67263a115c81014feeaf29af6197a9dc564b66a769e776c60ae29e1dfef773ee340c5bfcc04a85b007b92eafedb1eb95e600388643438dacdf7752d8d
-Size (Argyll_V3.4.1_src.zip) = 14810106 bytes
+BLAKE2s (Argyll_V3.5.0_src.zip) = f085f99e73060025bec1f54911290f1aa9d3f90b553ae6680470915ba5b3bb0c
+SHA512 (Argyll_V3.5.0_src.zip) = c0a995c090b44d3981cfed541140ae3422ea5ebaa8d5e3d4c3c71599b527b8808e17f037283b08b4c10ad6f48976b5f48e9c6802355a6940a52682020e820b17
+Size (Argyll_V3.5.0_src.zip) = 15352322 bytes
+SHA1 (patch-Jamfile) = fe1d1851cd40da71de7efb2676592c20b18fae4d
SHA1 (patch-Jamtop) = b2df031cea2ac829e18d52033a469f1fbe1bef93
-SHA1 (patch-spectro_Jamfile) = 1e40d46df292dc73b55163c66e7bb4c7f89acf19
-SHA1 (patch-spectro_hidio.c) = bf61035b9ccca00a4da4af717db26c9f3048fe78
-SHA1 (patch-spectro_hidio.h) = cdf6600dd0c346fcc1e6b2d514e8a488dc3c771f
+SHA1 (patch-spectro_Jamfile) = 8800444d05bbabdc58b62982abf3f5a1ef7d817e
+SHA1 (patch-spectro_hidio.c) = 84d6208bd6e6b5db29a748b72ec6d197d68dd500
+SHA1 (patch-spectro_hidio.h) = abc6ae2dbb522acc5860e36671ccf46d66ef3883
SHA1 (patch-spectro_icoms__ux.c) = d37ef6b64805e1fa3919cedf9a1c39f696612494
SHA1 (patch-spectro_usbio.c) = 762d01c3dd65c27605e2abfb3cfc957bef1ba8e5
-SHA1 (patch-spectro_usbio__bsd.c) = 981ec261cb29eae14a1c1d11a06ccbcf6bc7ea4b
+SHA1 (patch-spectro_usbio__bsd.c) = c55d9a8a42bdfa64acde1b7d9368f1e02eba6e2a
Index: pkgsrc/graphics/argyllcms/patches/patch-spectro_Jamfile
diff -u pkgsrc/graphics/argyllcms/patches/patch-spectro_Jamfile:1.1 pkgsrc/graphics/argyllcms/patches/patch-spectro_Jamfile:1.2
--- pkgsrc/graphics/argyllcms/patches/patch-spectro_Jamfile:1.1 Fri Nov 17 17:37:48 2023
+++ pkgsrc/graphics/argyllcms/patches/patch-spectro_Jamfile Wed Feb 11 02:41:15 2026
@@ -1,15 +1,15 @@
-$NetBSD: patch-spectro_Jamfile,v 1.1 2023/11/17 17:37:48 jakllsch Exp $
+$NetBSD: patch-spectro_Jamfile,v 1.2 2026/02/11 02:41:15 jakllsch Exp $
-Try to make linking work on NetBSD 9.3
+Try to make linking work on NetBSD
---- spectro/Jamfile.orig 2023-10-23 00:56:14.000000000 +0000
+--- spectro/Jamfile.orig 2026-02-09 22:25:23.000000000 +0000
+++ spectro/Jamfile
-@@ -166,7 +166,7 @@ LINKLIBS = libinst libinstapp
+@@ -174,7 +174,7 @@ LINKLIBS = libinst libinstapp
../ccast/libccast $(SSLLIB) ../yajl/libyajl
$(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIB)
../numlib/libui libconv ../numlib/libnum
- $(CMMLIBS) ;
+ $(CMMLIBS) libconv ;
- if $(LIBUSB_IS_DLL) = true {
- LINKSHLIBS = $(LIBUSBDIR)/$(LIBUSB) ;
+ if $(USE_USB) = true {
+ if $(LIBUSB_IS_DLL) = true {
Index: pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.h
diff -u pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.h:1.1 pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.h:1.2
--- pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.h:1.1 Fri Nov 17 17:37:48 2023
+++ pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.h Wed Feb 11 02:41:15 2026
@@ -1,12 +1,12 @@
-$NetBSD: patch-spectro_hidio.h,v 1.1 2023/11/17 17:37:48 jakllsch Exp $
+$NetBSD: patch-spectro_hidio.h,v 1.2 2026/02/11 02:41:15 jakllsch Exp $
Attempt to add NetBSD support to spectro/hidio
---- spectro/hidio.h.orig 2023-10-23 00:56:17.000000000 +0000
+--- spectro/hidio.h.orig 2026-02-09 22:25:25.000000000 +0000
+++ spectro/hidio.h
@@ -80,6 +80,15 @@ struct hid_idevice {
int bread; /* Bytes read by callback */
- #endif /* __MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
+ #endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1060 */
#endif
+#if defined(UNIX_X11)
+#if defined(__NetBSD__)
@@ -17,6 +17,6 @@ Attempt to add NetBSD support to spectro
+ int wchunk;
+#endif
+#endif
+ char *SerialNumber; /* If not-NULL, USB serial number string */
};
- /* Cleanup and then free an hidd entry */
Index: pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c
diff -u pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c:1.2 pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c:1.3
--- pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c:1.2 Mon Mar 10 15:38:12 2025
+++ pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c Wed Feb 11 02:41:15 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-spectro_hidio.c,v 1.2 2025/03/10 15:38:12 jakllsch Exp $
+$NetBSD: patch-spectro_hidio.c,v 1.3 2026/02/11 02:41:15 jakllsch Exp $
Recognize NetBSD.
---- spectro/hidio.c.orig 2024-09-24 22:29:21.000000000 +0000
+--- spectro/hidio.c.orig 2026-02-09 22:25:25.000000000 +0000
+++ spectro/hidio.c
@@ -92,6 +92,10 @@
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
@@ -15,7 +15,7 @@ Recognize NetBSD.
#else /* assume Linux */
# include <asm/types.h>
# include <linux/hiddev.h>
-@@ -432,11 +436,54 @@ int hid_get_paths(icompaths *p) {
+@@ -437,11 +441,54 @@ int hid_get_paths(icompaths *p) {
#endif /* UNIX_APPLE */
#if defined(UNIX_X11)
@@ -71,8 +71,8 @@ Recognize NetBSD.
/* We need to scan for /dev/hiddev* or /dev/usb/hiddev* device names, */
/* and then read their vid & pid */
{
-@@ -652,6 +699,24 @@ char **pnames /* List of process names
- #endif /* __MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
+@@ -723,6 +770,24 @@ char **pnames /* List of process names
+ #endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1060 */
#endif /* UNIX_APPLE */
+#if defined(UNIX_X11) && defined(__NetBSD__)
@@ -96,19 +96,21 @@ Recognize NetBSD.
p->is_open = 1;
a1logd(p->log, 8, "hid_open_port: HID port is now open\n");
}
-@@ -709,6 +774,10 @@ void hid_close_port(icoms *p) {
- #endif /* __MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
+@@ -780,6 +845,12 @@ void hid_close_port(icoms *p) {
+ #endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1060 */
#endif /* UNIX_APPLE */
-+#if defined(UNIX_X11) && defined(__NetBSD__)
++#if defined(UNIX_X11)
++#if defined(__NetBSD__)
+ close(p->hidd->fd);
+#endif
++#endif
+
p->is_open = 0;
a1logd(p->log, 8, "hid_close_port: has been released and closed\n");
}
-@@ -907,6 +976,19 @@ printf("~1 IOHIDDeviceGet returned 0x%x\
- #endif /* __MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
+@@ -988,6 +1059,19 @@ printf("~1 IOHIDDeviceGet returned 0x%x\
+ #endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1060 */
#endif /* UNIX_APPLE */
+#if defined(UNIX_X11) && defined(__NetBSD__)
@@ -127,8 +129,8 @@ Recognize NetBSD.
if (breadp != NULL)
*breadp = bread;
-@@ -1047,6 +1129,19 @@ printf("~1 IOHIDDeviceSetReportWithCallb
- #endif /* __MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
+@@ -1138,6 +1222,19 @@ printf("~1 IOHIDDeviceSetReportWithCallb
+ #endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1060 */
#endif /* UNIX_APPLE */
+#if defined(UNIX_X11) && defined(__NetBSD__)
@@ -147,27 +149,27 @@ Recognize NetBSD.
if (bwrittenp != NULL)
*bwrittenp = bwritten;
-@@ -1116,7 +1211,11 @@ int hid_copy_hid_idevice(icoms *d, icomp
- IOObjectRetain(d->hidd->ioob);
- #endif /* __MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
+@@ -1208,6 +1305,12 @@ int hid_copy_hid_idevice(icoms *d, icomp
+ #endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1060 */
#endif /* UNIX_APPLE */
--#if defined (UNIX_X11)
-+#if defined (UNIX_X11) && defined (__NetBSD__)
+ #if defined (UNIX_X11)
++# if defined (__NetBSD__)
+ if ((d->hidd->dpath = strdup(s->hidd->dpath)) == NULL) {
+ a1loge(d->log, ICOM_SYS, "hid_copy_hid_idevice: malloc\n");
+ return ICOM_SYS;
+ }
++# endif
#endif
- return ICOM_OK;
- }
-@@ -1139,7 +1238,9 @@ void hid_del_hid_idevice(struct hid_idev
- IOObjectRelease(hidd->ioob);
- #endif /* __MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
+ if (s->hidd->SerialNumber != NULL
+ && (d->hidd->SerialNumber = strdup(s->hidd->SerialNumber)) == NULL) {
+@@ -1237,6 +1340,10 @@ void hid_del_hid_idevice(struct hid_idev
+ #endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1060 */
#endif /* UNIX_APPLE */
--#if defined (UNIX_X11)
-+#if defined (UNIX_X11) && defined (__NetBSD__)
+ #if defined (UNIX_X11)
++# if defined (__NetBSD__)
+ if (hidd->dpath != NULL)
+ free(hidd->dpath);
++# endif
#endif
- free(hidd);
- }
+ if (hidd->SerialNumber != NULL)
+ free(hidd->SerialNumber);
Index: pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c
diff -u pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c:1.3 pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c:1.4
--- pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c:1.3 Mon Mar 10 22:40:50 2025
+++ pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c Wed Feb 11 02:41:15 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-spectro_usbio__bsd.c,v 1.3 2025/03/10 22:40:50 jakllsch Exp $
+$NetBSD: patch-spectro_usbio__bsd.c,v 1.4 2026/02/11 02:41:15 jakllsch Exp $
Attempt to make actually function with NetBSD ugen(4).
---- spectro/usbio_bsd.c.orig 2024-09-24 22:29:21.000000000 +0000
+--- spectro/usbio_bsd.c.orig 2026-02-09 22:25:25.000000000 +0000
+++ spectro/usbio_bsd.c
@@ -69,13 +69,16 @@ icompaths *p
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -32,12 +32,15 @@ Attempt to make actually function with N
int rv, found = 0;
if (paths[j] == NULL)
-@@ -123,12 +129,8 @@ icompaths *p
+@@ -123,15 +129,8 @@ icompaths *p
continue;
}
- // ~~99 need to check number of end points ~~~
- // ~~99 and number of configs
+- // ~~99 and read any USB serial numbert
+-# pragma message("######### usbio_bsd.c missing USB code !!!!! ########")
+-
- nconfig = 1;
-
-//USB_GET_DEVICEINFO struct usb_device_info
@@ -47,11 +50,14 @@ Attempt to make actually function with N
/* Allocate an idevice so that we can fill in the end point information */
if ((usbd = (struct usb_idevice *) calloc(sizeof(struct usb_idevice), 1)) == NULL) {
-@@ -138,8 +140,55 @@ icompaths *p
+@@ -141,8 +140,58 @@ icompaths *p
return ICOM_SYS;
}
- usbd->nconfig = nconfig;
++ //usbd->iserialno = udd.iSerialNumber;
++ usbd->SerialNumber = strdup(di.udi_serial); /* XXX check NULL */
++
+ usbd->nconfig = nconfig = udd.bNumConfigurations;
+ /* Read the configuration descriptors looking for the first configuration, first interface, */
@@ -104,7 +110,7 @@ Attempt to make actually function with N
/* Found a known instrument ? */
if ((itype = inst_usb_match(vid, pid, nep)) != instUnknown) {
char pname[400], *cp;
-@@ -312,7 +361,6 @@ char **pnames /* List of process names
+@@ -315,7 +364,6 @@ char **pnames /* List of process names
if (p->is_open)
p->close_port(p);
@@ -112,7 +118,7 @@ Attempt to make actually function with N
/* Make sure the port is open */
if (!p->is_open) {
int rv, i, iface;
-@@ -347,12 +395,16 @@ char **pnames /* List of process names
+@@ -350,12 +398,16 @@ char **pnames /* List of process names
p->cconfig = 1;
if (p->cconfig != config) {
@@ -129,7 +135,7 @@ Attempt to make actually function with N
}
/* We're done */
-@@ -365,6 +417,7 @@ char **pnames /* List of process names
+@@ -368,6 +420,7 @@ char **pnames /* List of process names
/* Claim all the interfaces */
for (iface = 0; iface < p->nifce; iface++) {
@@ -137,7 +143,7 @@ Attempt to make actually function with N
if ((rv = ioctl(p->usbd->fd, USBDEVFS_CLAIMINTERFACE, &iface)) < 0) {
struct usbdevfs_getdriver getd;
getd.interface = iface;
-@@ -389,6 +442,30 @@ char **pnames /* List of process names
+@@ -392,6 +445,30 @@ char **pnames /* List of process names
return ICOM_SYS;
}
}
@@ -168,7 +174,7 @@ Attempt to make actually function with N
}
/* Clear any errors. */
-@@ -410,25 +487,10 @@ char **pnames /* List of process names
+@@ -413,25 +490,10 @@ char **pnames /* List of process names
p->rd_qa = 8;
a1logd(p->log, 8, "usb_open_port: 'serial' read quanta = packet size = %d\n",p->rd_qa);
@@ -194,7 +200,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,174 +509,31 @@ static int icoms_usb_transaction(
+@@ -450,174 +512,31 @@ static int icoms_usb_transaction(
int length,
unsigned int timeout /* In msec */
) {
@@ -215,9 +221,7 @@ Attempt to make actually function with N
- a1logv(p->log, 1, "icoms_usb_transaction: reaper thread is not running\n");
- return ICOM_SYS;
- }
-+ 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) {
- case icom_usb_trantype_command:
@@ -230,11 +234,7 @@ Attempt to make actually function with N
- type = USBDEVFS_URB_TYPE_BULK;
- break;
- }
-+ if ((endpoint & IUSB_ENDPOINT_DIR_MASK) == IUSB_ENDPOINT_OUT)
-+ xlength = write(p->ep[endpoint&0xf].fd, buffer, length);
-+ else
-+ xlength = read(p->ep[endpoint&0xf].fd, buffer, length);
-
+-
- /* Setup the icom req and urbs */
- req.urbs = NULL;
- pthread_mutex_init(&req.lock, NULL);
@@ -250,7 +250,9 @@ Attempt to make actually function with N
- a1loge(p->log, ICOM_SYS, "icoms_usb_transaction: control transfer too big! (%d)\n",length);
- return ICOM_SYS;
- }
--
++ if (ioctl(p->ep[endpoint&0xf].fd, USB_SET_TIMEOUT, &timeout) < 0)
++ a1logd(p->log, 8, "icoms_usb_transaction: SET_TIMEOUT failed\n");
+
- bp = buffer;
- remlen = length;
- for (i = 0; i < req.nurbs; i++) {
@@ -271,7 +273,11 @@ Attempt to make actually function with N
- req.urbs[i].urb.status = -EINPROGRESS;
- }
-a1logd(p->log, 8, "icoms_usb_transaction: reset req %p nourbs to %d\n",&req,req.nourbs);
--
++ if ((endpoint & IUSB_ENDPOINT_DIR_MASK) == IUSB_ENDPOINT_OUT)
++ xlength = write(p->ep[endpoint&0xf].fd, buffer, length);
++ else
++ xlength = read(p->ep[endpoint&0xf].fd, buffer, length);
+
- /* Add our request to the req list so that it can be cancelled on reap failure */
- pthread_mutex_lock(&p->usbd->lock);
- req.next = p->usbd->reqs;
@@ -378,7 +384,7 @@ Attempt to make actually function with N
/* requested size wasn't transferred ? */
if (reqrv == ICOM_OK && xlength != length)
-@@ -623,6 +542,7 @@ a1logd(p->log, 8, "icoms_usb_transaction
+@@ -626,6 +545,7 @@ a1logd(p->log, 8, "icoms_usb_transaction
if (transferred != NULL)
*transferred = xlength;
@@ -386,7 +392,7 @@ Attempt to make actually function with N
done:;
if (cancelt != NULL) {
amutex_lock(cancelt->cmtx);
-@@ -632,20 +552,7 @@ done:;
+@@ -635,20 +555,7 @@ done:;
cancelt->state = 2;
amutex_unlock(cancelt->cmtx);
}
@@ -408,7 +414,7 @@ Attempt to make actually function with N
if (in_usb_rw < 0)
exit(0);
-@@ -653,7 +560,6 @@ done:;
+@@ -656,7 +563,6 @@ done:;
in_usb_rw--;
a1logd(p->log, 8, "coms_usb_transaction: returning err 0x%x and %d bytes\n",reqrv, xlength);
@@ -416,7 +422,7 @@ Attempt to make actually function with N
return reqrv;
}
-@@ -668,51 +574,35 @@ int value, int index, unsigned char *byt
+@@ -671,51 +577,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;
@@ -485,7 +491,7 @@ Attempt to make actually function with N
/* Cancel i/o in another thread */
int icoms_usb_cancel_io(
-@@ -720,8 +610,9 @@ int icoms_usb_cancel_io(
+@@ -723,8 +613,9 @@ int icoms_usb_cancel_io(
usb_cancelt *cancelt
) {
int rv = ICOM_OK;
@@ -496,7 +502,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 +633,8 @@ int icoms_usb_resetep(
+@@ -745,6 +636,8 @@ int icoms_usb_resetep(
) {
int rv = ICOM_OK;
@@ -505,7 +511,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 +652,8 @@ int icoms_usb_clearhalt(
+@@ -762,6 +655,8 @@ int icoms_usb_clearhalt(
) {
int rv = ICOM_OK;
Added files:
Index: pkgsrc/graphics/argyllcms/patches/patch-Jamfile
diff -u /dev/null pkgsrc/graphics/argyllcms/patches/patch-Jamfile:1.1
--- /dev/null Wed Feb 11 02:41:15 2026
+++ pkgsrc/graphics/argyllcms/patches/patch-Jamfile Wed Feb 11 02:41:15 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-Jamfile,v 1.1 2026/02/11 02:41:15 jakllsch Exp $
+
+Don't build vendored libz/zlib
+
+--- Jamfile.orig 2026-02-09 22:25:03.000000000 +0000
++++ Jamfile
+@@ -61,7 +61,7 @@ if ! $(HAVE_JPEG) {
+ SubInclude jpeg ;
+ }
+
+-if ! $(HAVE_ZLIB) {
++if ! $(HAVE_Z) {
+ SubInclude zlib ;
+ }
+
Home |
Main Index |
Thread Index |
Old Index