Sun Dec 22 17:06:39 2019 UTC ()
Translate EWOULDBLOCK to LIBUSB_ERROR_TIMEOUT on NetBSD.


(jmcneill)
diff -r1.21 -r1.22 pkgsrc/devel/libusb1/Makefile
diff -r1.12 -r1.13 pkgsrc/devel/libusb1/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c
cvs diff -r1.21 -r1.22 pkgsrc/devel/libusb1/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libusb1/Makefile 2019/12/22 16:49:05 1.21
+++ pkgsrc/devel/libusb1/Makefile 2019/12/22 17:06:39 1.22
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.21 2019/12/22 16:49:05 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.22 2019/12/22 17:06:39 jmcneill Exp $
2 2
3DISTNAME= libusb-1.0.22 3DISTNAME= libusb-1.0.22
4PKGNAME= ${DISTNAME:S/libusb/libusb1/} 4PKGNAME= ${DISTNAME:S/libusb/libusb1/}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://libusb.info/ 11HOMEPAGE= https://libusb.info/
12COMMENT= USB Access Library (version 1) 12COMMENT= USB Access Library (version 1)
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15# Works on Dragonfly but explicitly not wanted by DragonFly upstream; 15# Works on Dragonfly but explicitly not wanted by DragonFly upstream;
16# see PR 47042. 16# see PR 47042.
17NOT_FOR_PLATFORM= DragonFly-*-* 17NOT_FOR_PLATFORM= DragonFly-*-*
18 18
cvs diff -r1.12 -r1.13 pkgsrc/devel/libusb1/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libusb1/distinfo 2019/12/22 16:49:05 1.12
+++ pkgsrc/devel/libusb1/distinfo 2019/12/22 17:06:39 1.13
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.12 2019/12/22 16:49:05 jmcneill Exp $ 1$NetBSD: distinfo,v 1.13 2019/12/22 17:06:39 jmcneill Exp $
2 2
3SHA1 (libusb-1.0.22.tar.bz2) = 10116aa265aac4273a0c894faa089370262ec0dc 3SHA1 (libusb-1.0.22.tar.bz2) = 10116aa265aac4273a0c894faa089370262ec0dc
4RMD160 (libusb-1.0.22.tar.bz2) = 59b800abb0b4c088dbee950fa67bb31240b8a134 4RMD160 (libusb-1.0.22.tar.bz2) = 59b800abb0b4c088dbee950fa67bb31240b8a134
5SHA512 (libusb-1.0.22.tar.bz2) = 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4 5SHA512 (libusb-1.0.22.tar.bz2) = 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
6Size (libusb-1.0.22.tar.bz2) = 598833 bytes 6Size (libusb-1.0.22.tar.bz2) = 598833 bytes
7SHA1 (patch-configure) = 2776ff354ea8f17663a9a5330f6fe990af27d8fe 7SHA1 (patch-configure) = 2776ff354ea8f17663a9a5330f6fe990af27d8fe
8SHA1 (patch-configure.ac) = 9344b3d6439348164410d1b2071cf14c3f388354 8SHA1 (patch-configure.ac) = 9344b3d6439348164410d1b2071cf14c3f388354
9SHA1 (patch-libusb_os_netbsd__usb.c) = af3202b93596710a94345ccdfe6466d833f34028 9SHA1 (patch-libusb_os_netbsd__usb.c) = 3ea7568379683c9a8660b308d2c52b4a48b3c8e6
10SHA1 (patch-libusb_os_sunos__usb.c) = 4896e497d451487a09b3be9ad74f72595a441086 10SHA1 (patch-libusb_os_sunos__usb.c) = 4896e497d451487a09b3be9ad74f72595a441086
11SHA1 (patch-ub) = 14bffca93ec8445cbfccb613dfda92f652b0ceb0 11SHA1 (patch-ub) = 14bffca93ec8445cbfccb613dfda92f652b0ceb0
cvs diff -r1.1 -r1.2 pkgsrc/devel/libusb1/patches/Attic/patch-libusb_os_netbsd__usb.c (expand / switch to unified diff)

--- pkgsrc/devel/libusb1/patches/Attic/patch-libusb_os_netbsd__usb.c 2019/12/22 16:49:05 1.1
+++ pkgsrc/devel/libusb1/patches/Attic/patch-libusb_os_netbsd__usb.c 2019/12/22 17:06:39 1.2
@@ -1,16 +1,26 @@ @@ -1,16 +1,26 @@
1$NetBSD: patch-libusb_os_netbsd__usb.c,v 1.1 2019/12/22 16:49:05 jmcneill Exp $ 1$NetBSD: patch-libusb_os_netbsd__usb.c,v 1.2 2019/12/22 17:06:39 jmcneill Exp $
2 2
3Do not emit log messages from netbsd_clock_gettime as it is called from 3* Do not emit log messages from netbsd_clock_gettime as it is called from
4the logger. 4 the logger.
 5* Translate EWOULDBLOCK (ugen timeouts) errors to LIBUSB_ERROR_TIMEOUT.
5 6
6--- libusb/os/netbsd_usb.c.orig 2018-03-17 07:23:37.000000000 +0000 7--- libusb/os/netbsd_usb.c.orig 2018-03-17 07:23:37.000000000 +0000
7+++ libusb/os/netbsd_usb.c 8+++ libusb/os/netbsd_usb.c
8@@ -493,8 +493,6 @@ netbsd_handle_transfer_completion(struct 9@@ -493,8 +493,6 @@ netbsd_handle_transfer_completion(struct
9 int 10 int
10 netbsd_clock_gettime(int clkid, struct timespec *tp) 11 netbsd_clock_gettime(int clkid, struct timespec *tp)
11 { 12 {
12- usbi_dbg("clock %d", clkid); 13- usbi_dbg("clock %d", clkid);
13- 14-
14 if (clkid == USBI_CLOCK_REALTIME) 15 if (clkid == USBI_CLOCK_REALTIME)
15 return clock_gettime(CLOCK_REALTIME, tp); 16 return clock_gettime(CLOCK_REALTIME, tp);
16  17
 18@@ -516,6 +514,8 @@ _errno_to_libusb(int err)
 19 return (LIBUSB_ERROR_NO_DEVICE);
 20 case ENOMEM:
 21 return (LIBUSB_ERROR_NO_MEM);
 22+ case EWOULDBLOCK:
 23+ return (LIBUSB_ERROR_TIMEOUT);
 24 }
 25
 26 usbi_dbg("error: %s", strerror(err));