diff options
| author | jmcneill <jmcneill@pkgsrc.org> | 2019-12-22 17:06:39 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@pkgsrc.org> | 2019-12-22 17:06:39 +0000 |
| commit | b578c7c0634d8eaef319208dbd70d82f317fdbea (patch) | |
| tree | 85389f0031b2cd76da306487cedde9fcc6e692b5 /devel/libusb1 | |
| parent | c5edd662736785ecb178345982b99692d707d2ff (diff) | |
| download | pkgsrc-b578c7c0634d8eaef319208dbd70d82f317fdbea.tar.gz | |
Translate EWOULDBLOCK to LIBUSB_ERROR_TIMEOUT on NetBSD.
Diffstat (limited to 'devel/libusb1')
| -rw-r--r-- | devel/libusb1/Makefile | 4 | ||||
| -rw-r--r-- | devel/libusb1/distinfo | 4 | ||||
| -rw-r--r-- | devel/libusb1/patches/patch-libusb_os_netbsd__usb.c | 16 |
3 files changed, 17 insertions, 7 deletions
diff --git a/devel/libusb1/Makefile b/devel/libusb1/Makefile index 15a6d101313..67d8bb0d32d 100644 --- a/devel/libusb1/Makefile +++ b/devel/libusb1/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2019/12/22 16:49:05 jmcneill Exp $ +# $NetBSD: Makefile,v 1.22 2019/12/22 17:06:39 jmcneill Exp $ DISTNAME= libusb-1.0.22 PKGNAME= ${DISTNAME:S/libusb/libusb1/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/libusb1/distinfo b/devel/libusb1/distinfo index 37358643d42..58de438882b 100644 --- a/devel/libusb1/distinfo +++ b/devel/libusb1/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2019/12/22 16:49:05 jmcneill Exp $ +$NetBSD: distinfo,v 1.13 2019/12/22 17:06:39 jmcneill Exp $ SHA1 (libusb-1.0.22.tar.bz2) = 10116aa265aac4273a0c894faa089370262ec0dc RMD160 (libusb-1.0.22.tar.bz2) = 59b800abb0b4c088dbee950fa67bb31240b8a134 @@ -6,6 +6,6 @@ SHA512 (libusb-1.0.22.tar.bz2) = 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf Size (libusb-1.0.22.tar.bz2) = 598833 bytes SHA1 (patch-configure) = 2776ff354ea8f17663a9a5330f6fe990af27d8fe SHA1 (patch-configure.ac) = 9344b3d6439348164410d1b2071cf14c3f388354 -SHA1 (patch-libusb_os_netbsd__usb.c) = af3202b93596710a94345ccdfe6466d833f34028 +SHA1 (patch-libusb_os_netbsd__usb.c) = 3ea7568379683c9a8660b308d2c52b4a48b3c8e6 SHA1 (patch-libusb_os_sunos__usb.c) = 4896e497d451487a09b3be9ad74f72595a441086 SHA1 (patch-ub) = 14bffca93ec8445cbfccb613dfda92f652b0ceb0 diff --git a/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c b/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c index c787fb50ad9..c88d1d01c60 100644 --- a/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c +++ b/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c @@ -1,7 +1,8 @@ -$NetBSD: patch-libusb_os_netbsd__usb.c,v 1.1 2019/12/22 16:49:05 jmcneill Exp $ +$NetBSD: patch-libusb_os_netbsd__usb.c,v 1.2 2019/12/22 17:06:39 jmcneill Exp $ -Do not emit log messages from netbsd_clock_gettime as it is called from -the logger. +* Do not emit log messages from netbsd_clock_gettime as it is called from + the logger. +* Translate EWOULDBLOCK (ugen timeouts) errors to LIBUSB_ERROR_TIMEOUT. --- libusb/os/netbsd_usb.c.orig 2018-03-17 07:23:37.000000000 +0000 +++ libusb/os/netbsd_usb.c @@ -14,3 +15,12 @@ the logger. if (clkid == USBI_CLOCK_REALTIME) return clock_gettime(CLOCK_REALTIME, tp); +@@ -516,6 +514,8 @@ _errno_to_libusb(int err) + return (LIBUSB_ERROR_NO_DEVICE); + case ENOMEM: + return (LIBUSB_ERROR_NO_MEM); ++ case EWOULDBLOCK: ++ return (LIBUSB_ERROR_TIMEOUT); + } + + usbi_dbg("error: %s", strerror(err)); |