CVS commit: pkgsrc/devel/libusb1

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Apr  3 20:05:41 UTC 2020

Modified Files:
        pkgsrc/devel/libusb1: Makefile distinfo
        pkgsrc/devel/libusb1/patches: patch-libusb_os_netbsd__usb.c
Removed Files:
        pkgsrc/devel/libusb1/patches: patch-configure patch-configure.ac
            patch-libusb_os_sunos__usb.c patch-ub

Log Message:
libusb1: Update to 1.0.23

2019-08-28: v1.0.23
* Add German translation (#446)
* Add Hungarian translation (#493)
* Android: Improved support for Android
* BSD: Remove infinite recursion in OpenBSD backend
* configure.ac: Fix detection of clock_gettime library (#439)
* Core: abandon synchronous transfers when device closure is detected.
* Core: fix error in handling the removal of file descriptors while handling
  events.
* Darwin(macOS): Switch from using ResetDevice to USBDeviceReEnumerate (#455)
* Darwin(macOS): Remove code that changed the device class used (#428)
* Darwin(macOS): Reduce hotplug timeout to 1ms (from 5s)
* New API libusb_set_log_cb() to redirect global and per context log
  messages to the provided log handling function
* New API libusb_wrap_sys_device to allow the user to specify the
  usb device to use.
* Solaris: Break infinite recursion in backend clock_gettime
* Solaris: Enable timerfd on sunos when available
* Windows: Add support for isochronous transfers with WinUSB
* Various other bug fixes and improvements


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/libusb1/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/libusb1/distinfo
cvs rdiff -u -r1.7 -r0 pkgsrc/devel/libusb1/patches/patch-configure \
    pkgsrc/devel/libusb1/patches/patch-configure.ac
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/devel/libusb1/patches/patch-libusb_os_sunos__usb.c
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/libusb1/patches/patch-ub

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libusb1/Makefile
diff -u pkgsrc/devel/libusb1/Makefile:1.22 pkgsrc/devel/libusb1/Makefile:1.23
--- pkgsrc/devel/libusb1/Makefile:1.22  Sun Dec 22 17:06:39 2019
+++ pkgsrc/devel/libusb1/Makefile       Fri Apr  3 20:05:41 2020
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2019/12/22 17:06:39 jmcneill Exp $
+# $NetBSD: Makefile,v 1.23 2020/04/03 20:05:41 nia Exp $
 
-DISTNAME=      libusb-1.0.22
+DISTNAME=      libusb-1.0.23
 PKGNAME=       ${DISTNAME:S/libusb/libusb1/}
-PKGREVISION=   3
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libusb/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=libusb/}
+GITHUB_PROJECT=        libusb
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/libusb1/distinfo
diff -u pkgsrc/devel/libusb1/distinfo:1.13 pkgsrc/devel/libusb1/distinfo:1.14
--- pkgsrc/devel/libusb1/distinfo:1.13  Sun Dec 22 17:06:39 2019
+++ pkgsrc/devel/libusb1/distinfo       Fri Apr  3 20:05:41 2020
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.13 2019/12/22 17:06:39 jmcneill Exp $
+$NetBSD: distinfo,v 1.14 2020/04/03 20:05:41 nia Exp $
 
-SHA1 (libusb-1.0.22.tar.bz2) = 10116aa265aac4273a0c894faa089370262ec0dc
-RMD160 (libusb-1.0.22.tar.bz2) = 59b800abb0b4c088dbee950fa67bb31240b8a134
-SHA512 (libusb-1.0.22.tar.bz2) = 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
-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) = 3ea7568379683c9a8660b308d2c52b4a48b3c8e6
-SHA1 (patch-libusb_os_sunos__usb.c) = 4896e497d451487a09b3be9ad74f72595a441086
-SHA1 (patch-ub) = 14bffca93ec8445cbfccb613dfda92f652b0ceb0
+SHA1 (libusb-1.0.23.tar.bz2) = 0140200398306b5e91c294d4a3c0f63aa0ef07b3
+RMD160 (libusb-1.0.23.tar.bz2) = b6ffe2441951d37d671bfbb1d84821269e8aef7c
+SHA512 (libusb-1.0.23.tar.bz2) = 73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b
+Size (libusb-1.0.23.tar.bz2) = 602860 bytes
+SHA1 (patch-libusb_os_netbsd__usb.c) = 8b1a71ceec1b96089ebfaa0fa900845b2e3ff572

Index: pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c
diff -u pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c:1.2 pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c:1.3
--- pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c:1.2      Sun Dec 22 17:06:39 2019
+++ pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c  Fri Apr  3 20:05:41 2020
@@ -1,12 +1,98 @@
-$NetBSD: patch-libusb_os_netbsd__usb.c,v 1.2 2019/12/22 17:06:39 jmcneill Exp $
+$NetBSD: patch-libusb_os_netbsd__usb.c,v 1.3 2020/04/03 20:05:41 nia Exp $
 
+* Set structure values by name
 * 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.orig        2019-08-09 16:39:49.000000000 +0000
 +++ libusb/os/netbsd_usb.c
-@@ -493,8 +493,6 @@ netbsd_handle_transfer_completion(struct
+@@ -87,55 +87,35 @@ static int _sync_gen_transfer(struct usb
+ static int _access_endpoint(struct libusb_transfer *);
+ 
+ const struct usbi_os_backend usbi_backend = {
+-      "Synchronous NetBSD backend",
+-      0,
+-      NULL,                           /* init() */
+-      NULL,                           /* exit() */
+-      NULL,                           /* set_option() */
+-      netbsd_get_device_list,
+-      NULL,                           /* hotplug_poll */
+-      netbsd_open,
+-      netbsd_close,
+-
+-      netbsd_get_device_descriptor,
+-      netbsd_get_active_config_descriptor,
+-      netbsd_get_config_descriptor,
+-      NULL,                           /* get_config_descriptor_by_value() */
+-
+-      netbsd_get_configuration,
+-      netbsd_set_configuration,
+-
+-      netbsd_claim_interface,
+-      netbsd_release_interface,
+-
+-      netbsd_set_interface_altsetting,
+-      netbsd_clear_halt,
+-      netbsd_reset_device,
+-
+-      NULL,                           /* alloc_streams */
+-      NULL,                           /* free_streams */
+-
+-      NULL,                           /* dev_mem_alloc() */
+-      NULL,                           /* dev_mem_free() */
+-
+-      NULL,                           /* kernel_driver_active() */
+-      NULL,                           /* detach_kernel_driver() */
+-      NULL,                           /* attach_kernel_driver() */
+-
+-      netbsd_destroy_device,
+-
+-      netbsd_submit_transfer,
+-      netbsd_cancel_transfer,
+-      netbsd_clear_transfer_priv,
+-
+-      NULL,                           /* handle_events() */
+-      netbsd_handle_transfer_completion,
+-
+-      netbsd_clock_gettime,
+-      0,                              /* context_priv_size */
+-      sizeof(struct device_priv),
+-      sizeof(struct handle_priv),
+-      0,                              /* transfer_priv_size */
++      .name = "Synchronous NetBSD backend",
++      .get_device_list = netbsd_get_device_list,
++      .open = netbsd_open,
++      .close = netbsd_close,
++
++      .get_device_descriptor = netbsd_get_device_descriptor,
++      .get_active_config_descriptor = netbsd_get_active_config_descriptor,
++      .get_config_descriptor = netbsd_get_config_descriptor,
++
++      .get_configuration = netbsd_get_configuration,
++      .set_configuration = netbsd_set_configuration,
++
++      .claim_interface = netbsd_claim_interface,
++      .release_interface = netbsd_release_interface,
++
++      .set_interface_altsetting = netbsd_set_interface_altsetting,
++      .clear_halt = netbsd_clear_halt,
++      .reset_device = netbsd_reset_device,
++      .destroy_device = netbsd_destroy_device,
++
++      .submit_transfer = netbsd_submit_transfer,
++      .cancel_transfer = netbsd_cancel_transfer,
++      .clear_transfer_priv = netbsd_clear_transfer_priv,
++
++      .handle_transfer_completion = netbsd_handle_transfer_completion,
++
++      .clock_gettime = netbsd_clock_gettime,
++      .device_priv_size = sizeof(struct device_priv),
++      .device_handle_priv_size = sizeof(struct handle_priv),
+ };
+ 
+ int
+@@ -498,8 +478,6 @@ netbsd_handle_transfer_completion(struct
  int
  netbsd_clock_gettime(int clkid, struct timespec *tp)
  {
@@ -15,7 +101,7 @@ $NetBSD: patch-libusb_os_netbsd__usb.c,v
        if (clkid == USBI_CLOCK_REALTIME)
                return clock_gettime(CLOCK_REALTIME, tp);
  
-@@ -516,6 +514,8 @@ _errno_to_libusb(int err)
+@@ -521,6 +499,8 @@ _errno_to_libusb(int err)
                return (LIBUSB_ERROR_NO_DEVICE);
        case ENOMEM:
                return (LIBUSB_ERROR_NO_MEM);