pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libusb1 libusb1: Update to 1.0.23
details: https://anonhg.NetBSD.org/pkgsrc/rev/b9e8e9d36a2e
branches: trunk
changeset: 414876:b9e8e9d36a2e
user: nia <nia%pkgsrc.org@localhost>
date: Fri Apr 03 20:05:41 2020 +0000
description:
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
diffstat:
devel/libusb1/Makefile | 9 +-
devel/libusb1/distinfo | 16 +--
devel/libusb1/patches/patch-configure | 81 ------------------
devel/libusb1/patches/patch-configure.ac | 29 ------
devel/libusb1/patches/patch-libusb_os_netbsd__usb.c | 94 ++++++++++++++++++++-
devel/libusb1/patches/patch-libusb_os_sunos__usb.c | 52 -----------
devel/libusb1/patches/patch-ub | 36 --------
7 files changed, 101 insertions(+), 216 deletions(-)
diffs (truncated from 368 to 300 lines):
diff -r ab1324fa4d5f -r b9e8e9d36a2e devel/libusb1/Makefile
--- a/devel/libusb1/Makefile Fri Apr 03 19:47:00 2020 +0000
+++ b/devel/libusb1/Makefile Fri Apr 03 20:05:41 2020 +0000
@@ -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
diff -r ab1324fa4d5f -r b9e8e9d36a2e devel/libusb1/distinfo
--- a/devel/libusb1/distinfo Fri Apr 03 19:47:00 2020 +0000
+++ b/devel/libusb1/distinfo Fri Apr 03 20:05:41 2020 +0000
@@ -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
diff -r ab1324fa4d5f -r b9e8e9d36a2e devel/libusb1/patches/patch-configure
--- a/devel/libusb1/patches/patch-configure Fri Apr 03 19:47:00 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-$NetBSD: patch-configure,v 1.7 2019/06/21 16:58:23 sjmulder Exp $
-
-prepare DragonFlyBSD backend support
-
-Fix clock_gettime check
-https://github.com/libusb/libusb/pull/439
-
---- configure.orig 2019-06-21 01:40:18.666466601 +0200
-+++ configure 2019-06-21 01:40:50.766082708 +0200
-@@ -16266,6 +16266,11 @@
- backend=openbsd
- threads=posix
- ;;
-+*-dragonfly*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: DragonflyBSD (using OpenBSD backend)" >&5
-+$as_echo "DragonflyBSD (using OpenBSD backend)" >&6; }
-+ backend="openbsd"
-+ ;;
- *-netbsd*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: NetBSD" >&5
- $as_echo "NetBSD" >&6; }
-@@ -16308,9 +16313,9 @@
- $as_echo "#define OS_LINUX 1" >>confdefs.h
-
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime2" >&5
--$as_echo_n "checking for library containing clock_gettime2... " >&6; }
--if ${ac_cv_search_clock_gettime2+:} false; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
-+$as_echo_n "checking for library containing clock_gettime... " >&6; }
-+if ${ac_cv_search_clock_gettime+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_func_search_save_LIBS=$LIBS
-@@ -16323,11 +16328,11 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char clock_gettime2 ();
-+char clock_gettime ();
- int
- main ()
- {
--return clock_gettime2 ();
-+return clock_gettime ();
- ;
- return 0;
- }
-@@ -16340,25 +16345,25 @@
- LIBS="-l$ac_lib -pthread $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_search_clock_gettime2=$ac_res
-+ ac_cv_search_clock_gettime=$ac_res
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
-- if ${ac_cv_search_clock_gettime2+:} false; then :
-+ if ${ac_cv_search_clock_gettime+:} false; then :
- break
- fi
- done
--if ${ac_cv_search_clock_gettime2+:} false; then :
-+if ${ac_cv_search_clock_gettime+:} false; then :
-
- else
-- ac_cv_search_clock_gettime2=no
-+ ac_cv_search_clock_gettime=no
- fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime2" >&5
--$as_echo "$ac_cv_search_clock_gettime2" >&6; }
--ac_res=$ac_cv_search_clock_gettime2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
-+$as_echo "$ac_cv_search_clock_gettime" >&6; }
-+ac_res=$ac_cv_search_clock_gettime
- if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
diff -r ab1324fa4d5f -r b9e8e9d36a2e devel/libusb1/patches/patch-configure.ac
--- a/devel/libusb1/patches/patch-configure.ac Fri Apr 03 19:47:00 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.7 2019/06/21 16:58:23 sjmulder Exp $
-
-prepare DragonFlyBSD support
-
-Fix clock_gettime check
-https://github.com/libusb/libusb/pull/439
-
---- configure.ac.orig 2019-06-21 01:40:25.914379944 +0200
-+++ configure.ac 2019-06-21 01:40:52.394063231 +0200
-@@ -72,6 +72,10 @@
- backend=openbsd
- threads=posix
- ;;
-+*-dragonfly*)
-+ AC_MSG_RESULT([DragonflyBSD (using OpenBSD backend)])
-+ backend="openbsd"
-+ ;;
- *-netbsd*)
- AC_MSG_RESULT([NetBSD])
- backend=netbsd
-@@ -107,7 +111,7 @@
- linux)
- AC_DEFINE(OS_LINUX, 1, [Linux backend])
- AC_SUBST(OS_LINUX)
-- AC_SEARCH_LIBS([clock_gettime2], [rt], [], [], [-pthread])
-+ AC_SEARCH_LIBS([clock_gettime], [rt], [], [], [-pthread])
- AC_ARG_ENABLE([udev],
- [AC_HELP_STRING([--enable-udev], [use udev for device enumeration and hotplug support (recommended) [default=yes]])],
- [], [enable_udev=yes])
diff -r ab1324fa4d5f -r b9e8e9d36a2e devel/libusb1/patches/patch-libusb_os_netbsd__usb.c
--- a/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c Fri Apr 03 19:47:00 2020 +0000
+++ b/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c Fri Apr 03 20:05:41 2020 +0000
@@ -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 @@
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);
diff -r ab1324fa4d5f -r b9e8e9d36a2e devel/libusb1/patches/patch-libusb_os_sunos__usb.c
--- a/devel/libusb1/patches/patch-libusb_os_sunos__usb.c Fri Apr 03 19:47:00 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-$NetBSD: patch-libusb_os_sunos__usb.c,v 1.3 2018/11/25 17:03:34 gdt Exp $
-
-add di_prop_exists() for cases such as illumos not having the function yet
-add timerfd support for cases such as illumos already having support
-
---- libusb/os/sunos_usb.c.orig 2018-03-17 07:23:37.000000000 +0000
-+++ libusb/os/sunos_usb.c
-@@ -1,6 +1,7 @@
- /*
- *
- * Copyright (c) 2016, Oracle and/or its affiliates.
-+ * Copyright 2016 PALO, Richard.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -43,6 +44,12 @@
- #include "libusbi.h"
- #include "sunos_usb.h"
-
-+#ifndef di_prop_exists
-+static int di_prop_exists(dev_t dev, di_node_t node, const char *prop_name) {
-+ return (di_prop_find(dev, node, prop_name) != DI_PROP_NIL);
-+}
-+#endif
Home |
Main Index |
Thread Index |
Old Index