This is a minor update, mostly just deleting patches merged into upstream.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libusb1/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile    5 Aug 2020 13:59:36 -0000       1.34
+++ Makefile    26 Aug 2021 03:45:17 -0000
@@ -2,10 +2,10 @@

 COMMENT =              library for USB device access from userspace

-VERSION =              1.0.23
+VERSION =              1.0.24
 DISTNAME =             libusb-${VERSION}
 PKGNAME =              libusb1-${VERSION}
-REVISION =             2
+REVISION =             1

 SHARED_LIBS +=         usb-1.0                 1.2     # 2.0

Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libusb1/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo    27 Nov 2019 20:15:17 -0000      1.6
+++ distinfo    26 Aug 2021 03:45:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (libusb-1.0.23.tar.bz2) = 2xHAbpWKgtrFLPPGXLTdLD8znIqYhmURDg0k0ZMSrY0=
-SIZE (libusb-1.0.23.tar.bz2) = 602860
+SHA256 (libusb-1.0.24.tar.bz2) = fv0mhfezJzJtz7hc7kJtm4cf1w4iyqFbto1ZXOKisSo=
+SIZE (libusb-1.0.24.tar.bz2) = 606593
Index: patches/patch-libusb_libusb_h
===================================================================
RCS file: patches/patch-libusb_libusb_h
diff -N patches/patch-libusb_libusb_h
--- patches/patch-libusb_libusb_h       10 Sep 2016 13:03:40 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-libusb_libusb_h,v 1.1 2016/09/10 13:03:40 ajacoutot Exp $
---- libusb/libusb.h.orig       Sat Sep 10 11:00:40 2016
-+++ libusb/libusb.h    Sat Sep 10 11:00:56 2016
-@@ -58,6 +58,7 @@ typedef unsigned __int32  uint32_t;
- #include <sys/time.h>
- #endif
-
-+#include <sys/select.h> /* timeval */
- #include <time.h>
- #include <limits.h>
-
Index: patches/patch-libusb_os_openbsd_usb_c
===================================================================
RCS file: patches/patch-libusb_os_openbsd_usb_c
diff -N patches/patch-libusb_os_openbsd_usb_c
--- patches/patch-libusb_os_openbsd_usb_c       5 Aug 2020 13:59:36 -0000       
1.10
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-libusb_os_openbsd_usb_c,v 1.10 2020/08/05 13:59:36 tb Exp $
-
-Export port number, fix github #314.
-https://github.com/libusb/libusb/pull/764
-
-Fix an OpenBSD backend bug where an existing open file descriptor is
-overwritten if a libusb user attempts to open the same ugen(4) device
-multiple times. This was observed with sane-backends and broke scanning.
-https://github.com/libusb/libusb/pull/763
-
-Index: libusb/os/openbsd_usb.c
---- libusb/os/openbsd_usb.c.orig
-+++ libusb/os/openbsd_usb.c
-@@ -183,6 +183,7 @@ obsd_get_device_list(struct libusb_context * ctx,
-                               dev->bus_number = di.udi_bus;
-                               dev->device_address = di.udi_addr;
-                               dev->speed = di.udi_speed;
-+                              dev->port_number = di.udi_port;
-
-                               dpriv = (struct device_priv *)dev->os_priv;
-                               dpriv->fd = -1;
-@@ -232,15 +233,17 @@ obsd_open(struct libusb_device_handle *handle)
-       char devnode[16];
-
-       if (dpriv->devname) {
-+              int fd;
-               /*
-                * Only open ugen(4) attached devices read-write, all
-                * read-only operations are done through the bus node.
-                */
-               snprintf(devnode, sizeof(devnode), DEVPATH "%s.00",
-                   dpriv->devname);
--              dpriv->fd = open(devnode, O_RDWR);
--              if (dpriv->fd < 0)
-+              fd = open(devnode, O_RDWR);
-+              if (fd < 0)
-                       return _errno_to_libusb(errno);
-+              dpriv->fd = fd;
-
-               usbi_dbg("open %s: fd %d", devnode, dpriv->fd);
-       }

Reply via email to