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 devel/libusb1 to 1.0.21



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fd6158d87bd0
branches:  trunk
changeset: 369613:fd6158d87bd0
user:      leot <leot%pkgsrc.org@localhost>
date:      Mon Oct 02 13:20:28 2017 +0000

description:
libusb1: Update devel/libusb1 to 1.0.21

pkgsrc changes:
* Delete several Solaris backend patches, 1.0.21 contains all of them
  (patch-libusb_os_sunos__usb.c is still needed though)

Changes:
2016-10-01: v1.0.21:
* Core: Refactor code related to transfer flags and timeout handling
* Darwin: Ignore root hub simulation devices
* Darwin: Improved support for OS X El Capitan
* Darwin: Work around devices with buggy endpoint descriptors
* Darwin: Do not use objc_registerThreadWithCollector after its deprecation
* Darwin: Use C11 atomics on 10.12+ as the OS atomics are now deprecated
* Linux: Support preallocating kernel memory for zerocopy USB
* Linux: Deal with receiving POLLERR before all transfers have completed
* Solaris: Add solaris backend
* Windows: Add Visual Studio 2015 support
* Windows: Add usbdk backend
* Prevent attempts to recursively handle events
* Fix race condition in handle_timeout()
* Allow transferred argument to be optional in bulk APIs
* Various other bug fixes and improvements

diffstat:

 devel/libusb1/Makefile                             |     4 +-
 devel/libusb1/distinfo                             |    22 +-
 devel/libusb1/patches/patch-config.h.in            |    14 -
 devel/libusb1/patches/patch-configure              |    93 +-
 devel/libusb1/patches/patch-configure.ac           |    42 +-
 devel/libusb1/patches/patch-libusb_Makefile.am     |    33 -
 devel/libusb1/patches/patch-libusb_Makefile.in     |   118 -
 devel/libusb1/patches/patch-libusb_core.c          |    15 -
 devel/libusb1/patches/patch-libusb_libusbi.h       |    24 -
 devel/libusb1/patches/patch-libusb_os_sunos__usb.c |  1324 +-------------------
 devel/libusb1/patches/patch-libusb_os_sunos__usb.h |    81 -
 11 files changed, 43 insertions(+), 1727 deletions(-)

diffs (truncated from 1861 to 300 lines):

diff -r 92d01b380d93 -r fd6158d87bd0 devel/libusb1/Makefile
--- a/devel/libusb1/Makefile    Mon Oct 02 13:10:18 2017 +0000
+++ b/devel/libusb1/Makefile    Mon Oct 02 13:20:28 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2017/01/23 18:50:02 maya Exp $
+# $NetBSD: Makefile,v 1.15 2017/10/02 13:20:28 leot Exp $
 
-DISTNAME=      libusb-1.0.20
+DISTNAME=      libusb-1.0.21
 PKGNAME=       ${DISTNAME:S/libusb/libusb1/}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libusb/}
diff -r 92d01b380d93 -r fd6158d87bd0 devel/libusb1/distinfo
--- a/devel/libusb1/distinfo    Mon Oct 02 13:10:18 2017 +0000
+++ b/devel/libusb1/distinfo    Mon Oct 02 13:20:28 2017 +0000
@@ -1,15 +1,9 @@
-$NetBSD: distinfo,v 1.7 2016/04/09 08:18:58 richard Exp $
+$NetBSD: distinfo,v 1.8 2017/10/02 13:20:28 leot Exp $
 
-SHA1 (libusb-1.0.20.tar.bz2) = 9537243f165927bde74ad742e6b3effb0bd50cd2
-RMD160 (libusb-1.0.20.tar.bz2) = 9019942b2c0528ef5488b4ce747720616893dbb2
-SHA512 (libusb-1.0.20.tar.bz2) = 4230047dbc18db402f399a6b228f70da37ce4f9da9d57203e5c31cf0edec5ddd664865b4f16038a2ae72c26097e713b709b9e882a11b65a274e84993d617c765
-Size (libusb-1.0.20.tar.bz2) = 795247 bytes
-SHA1 (patch-config.h.in) = 8617eb16720a7a3c0c443b54e243d6459322dbae
-SHA1 (patch-configure) = 03a4a61dae70a1373ba840e27b1c572c49d0d622
-SHA1 (patch-configure.ac) = 5ae1bb4788401da7d95365771e91e9298e384381
-SHA1 (patch-libusb_Makefile.am) = 814828a2e36f8636f0708cb12859146212f2676c
-SHA1 (patch-libusb_Makefile.in) = 225cc2bb53b29c2af3f032347c4759ee11cd9ba2
-SHA1 (patch-libusb_core.c) = 669d92da7ed40a496a40140e0a91ef5070f336eb
-SHA1 (patch-libusb_libusbi.h) = 3a916dcb0f5c4bf8f31850d7fb529df8dbad46f7
-SHA1 (patch-libusb_os_sunos__usb.c) = afa51c153cf589a1c979b96b4b34bd7a12a690cc
-SHA1 (patch-libusb_os_sunos__usb.h) = d1aefc5e050c50df711a73e9ecdd22ff2ec6770c
+SHA1 (libusb-1.0.21.tar.bz2) = 54d71841542eb1a6f0b0420878a4d5434efe8d28
+RMD160 (libusb-1.0.21.tar.bz2) = 0257fc72b3b4dd6ed00132d3277cbe4feb041d2c
+SHA512 (libusb-1.0.21.tar.bz2) = 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
+Size (libusb-1.0.21.tar.bz2) = 607417 bytes
+SHA1 (patch-configure) = b64f751a2d148b97833b47ecc5cd154a432d487d
+SHA1 (patch-configure.ac) = cc8a2c863060e3143f6953bbc19808b9fbec08c6
+SHA1 (patch-libusb_os_sunos__usb.c) = 06cdcead5cb915b4ee7f8ef19e8ff74644a9a93a
diff -r 92d01b380d93 -r fd6158d87bd0 devel/libusb1/patches/patch-config.h.in
--- a/devel/libusb1/patches/patch-config.h.in   Mon Oct 02 13:10:18 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-config.h.in,v 1.1 2016/04/09 08:18:58 richard Exp $
-prepare SunOS support
---- config.h.in.orig   2015-09-14 00:38:38.000000000 +0000
-+++ config.h.in
-@@ -97,6 +97,9 @@
- /* OpenBSD backend */
- #undef OS_OPENBSD
- 
-+/* SunOS backend */
-+#undef OS_SUNOS
-+
- /* Windows backend */
- #undef OS_WINDOWS
- 
diff -r 92d01b380d93 -r fd6158d87bd0 devel/libusb1/patches/patch-configure
--- a/devel/libusb1/patches/patch-configure     Mon Oct 02 13:10:18 2017 +0000
+++ b/devel/libusb1/patches/patch-configure     Mon Oct 02 13:20:28 2017 +0000
@@ -1,26 +1,9 @@
-$NetBSD: patch-configure,v 1.4 2016/04/09 08:18:58 richard Exp $
+$NetBSD: patch-configure,v 1.5 2017/10/02 13:20:28 leot Exp $
 
-prepare DragonFlyBSD and SunOS backend support
+prepare DragonFlyBSD backend support
 
 --- configure.orig     2016-03-25 05:42:03.826039410 +0000
 +++ configure
-@@ -657,6 +657,8 @@ OS_WINDOWS_FALSE
- OS_WINDOWS_TRUE
- OS_NETBSD_FALSE
- OS_NETBSD_TRUE
-+OS_SUNOS_FALSE
-+OS_SUNOS_TRUE
- OS_OPENBSD_FALSE
- OS_OPENBSD_TRUE
- OS_DARWIN_FALSE
-@@ -666,6 +668,7 @@ OS_LINUX_TRUE
- OS_HAIKU
- OS_WINDOWS
- OS_NETBSD
-+OS_SUNOS
- OS_OPENBSD
- OS_DARWIN
- USE_UDEV
 @@ -11939,6 +11942,11 @@ $as_echo "OpenBSD" >&6; }
        backend="openbsd"
        threads="posix"
@@ -33,75 +16,3 @@
  *-netbsd*)
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: NetBSD" >&5
  $as_echo "NetBSD" >&6; }
-@@ -11969,6 +11977,13 @@ subdirs="$subdirs libusb/os/haiku"
-       backend="haiku"
-       threads="posix"
-       ;;
-+*-solaris*)
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: SunOS" >&5
-+$as_echo "SunOS" >&6; }
-+      backend="sunos"
-+      threads="posix"
-+      ;;
-+
- *)
-       as_fn_error $? "unsupported operating system" "$LINENO" 5
- esac
-@@ -12230,6 +12245,31 @@ done
- $as_echo "#define POLL_NFDS_TYPE nfds_t" >>confdefs.h
- 
-       ;;
-+
-+sunos)
-+
-+$as_echo "#define OS_SUNOS 1" >>confdefs.h
-+
-+
-+      THREAD_CFLAGS="-pthread"
-+      LIBS="-pthread -ldevinfo"
-+      for ac_header in poll.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default"
-+if test "x$ac_cv_header_poll_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_POLL_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+$as_echo "#define POLL_NFDS_TYPE nfds_t" >>confdefs.h
-+
-+      ;;
-+
- netbsd)
- 
- $as_echo "#define OS_NETBSD 1" >>confdefs.h
-@@ -12317,6 +12357,14 @@ else
-   OS_OPENBSD_FALSE=
- fi
- 
-+ if test "x$backend" = xsunos; then
-+  OS_SUNOS_TRUE=
-+  OS_SUNOS_FALSE='#'
-+else
-+  OS_SUNOS_TRUE='#'
-+  OS_SUNOS_FALSE=
-+fi
-+
-  if test "x$backend" = xnetbsd; then
-   OS_NETBSD_TRUE=
-   OS_NETBSD_FALSE='#'
-@@ -12834,6 +12882,10 @@ if test -z "${OS_OPENBSD_TRUE}" && test
-   as_fn_error $? "conditional \"OS_OPENBSD\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${OS_SUNOS_TRUE}" && test -z "${OS_SUNOS_FALSE}"; then
-+  as_fn_error $? "conditional \"OS_SUNOS\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${OS_NETBSD_TRUE}" && test -z "${OS_NETBSD_FALSE}"; then
-   as_fn_error $? "conditional \"OS_NETBSD\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff -r 92d01b380d93 -r fd6158d87bd0 devel/libusb1/patches/patch-configure.ac
--- a/devel/libusb1/patches/patch-configure.ac  Mon Oct 02 13:10:18 2017 +0000
+++ b/devel/libusb1/patches/patch-configure.ac  Mon Oct 02 13:20:28 2017 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.4 2016/04/09 08:18:58 richard Exp $
+$NetBSD: patch-configure.ac,v 1.5 2017/10/02 13:20:28 leot Exp $
 
-prepare DragonFlyBSD and SunOS backend support
+prepare DragonFlyBSD support
 
 --- configure.ac.orig  2015-09-05 17:20:40.000000000 +0000
 +++ configure.ac
@@ -15,41 +15,3 @@
  *-netbsd*)
        AC_MSG_RESULT([NetBSD])
        backend="netbsd"
-@@ -95,6 +99,12 @@ case $host in
-       backend="haiku"
-       threads="posix"
-       ;;
-+*-solaris*)
-+      AC_MSG_RESULT([SunOS])
-+      backend="sunos"
-+      threads="posix"
-+      ;;
-+
- *)
-       AC_MSG_ERROR([unsupported operating system])
- esac
-@@ -157,6 +167,16 @@ openbsd)
-       AC_CHECK_HEADERS([poll.h])
-       AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument])
-       ;;
-+
-+sunos)
-+      AC_DEFINE(OS_SUNOS, 1, [SunOS backend])
-+      AC_SUBST(OS_SUNOS)
-+      THREAD_CFLAGS="-pthread"
-+      LIBS="-pthread -ldevinfo"
-+      AC_CHECK_HEADERS([poll.h])
-+      AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument])
-+      ;;
-+
- netbsd)
-       AC_DEFINE(OS_NETBSD, 1, [NetBSD backend])
-       AC_SUBST(OS_NETBSD)
-@@ -187,6 +207,7 @@ AC_SUBST(LIBS)
- AM_CONDITIONAL(OS_LINUX, test "x$backend" = xlinux)
- AM_CONDITIONAL(OS_DARWIN, test "x$backend" = xdarwin)
- AM_CONDITIONAL(OS_OPENBSD, test "x$backend" = xopenbsd)
-+AM_CONDITIONAL(OS_SUNOS, test "x$backend" = xsunos)
- AM_CONDITIONAL(OS_NETBSD, test "x$backend" = xnetbsd)
- AM_CONDITIONAL(OS_WINDOWS, test "x$backend" = xwindows)
- AM_CONDITIONAL(OS_HAIKU, test "x$backend" = xhaiku)
diff -r 92d01b380d93 -r fd6158d87bd0 devel/libusb1/patches/patch-libusb_Makefile.am
--- a/devel/libusb1/patches/patch-libusb_Makefile.am    Mon Oct 02 13:10:18 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-libusb_Makefile.am,v 1.1 2016/04/09 08:18:58 richard Exp $
-
-prepare SunOS backend support
-
---- libusb/Makefile.am.orig    2015-09-05 17:20:40.000000000 +0000
-+++ libusb/Makefile.am
-@@ -9,13 +9,14 @@ LINUX_USBFS_SRC = os/linux_usbfs.c
- DARWIN_USB_SRC = os/darwin_usb.c
- OPENBSD_USB_SRC = os/openbsd_usb.c
- NETBSD_USB_SRC = os/netbsd_usb.c
-+SUNOS_USB_SRC = os/sunos_usb.c os/sunos_usb.h
- WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def
- WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h
- 
- DIST_SUBDIRS = 
- 
- EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \
--      $(NETBSD_USB_SRC) $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \
-+      $(NETBSD_USB_SRC) $(SUNOS_USB_SRC) $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \
-       $(POSIX_POLL_SRC) \
-       os/threads_posix.c os/threads_windows.c \
-       os/linux_udev.c os/linux_netlink.c
-@@ -49,6 +50,10 @@ if OS_NETBSD
- OS_SRC = $(NETBSD_USB_SRC) $(POSIX_POLL_SRC)
- endif
- 
-+if OS_SUNOS
-+OS_SRC = $(SUNOS_USB_SRC) $(POSIX_POLL_SRC)
-+endif
-+
- if OS_HAIKU
- OS_SRC = $(POSIX_POLL_SRC)
- SUBDIRS = os/haiku
diff -r 92d01b380d93 -r fd6158d87bd0 devel/libusb1/patches/patch-libusb_Makefile.in
--- a/devel/libusb1/patches/patch-libusb_Makefile.in    Mon Oct 02 13:10:18 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-$NetBSD: patch-libusb_Makefile.in,v 1.1 2016/04/09 08:18:58 richard Exp $
-
-prepare SunOS backend support
-
---- libusb/Makefile.in.orig    2016-03-25 05:31:21.617024817 +0000
-+++ libusb/Makefile.in
-@@ -138,9 +138,9 @@ am__libusb_1_0_la_SOURCES_DIST = libusbi
-       os/threads_windows.h os/threads_windows.c os/threads_posix.h \
-       os/threads_posix.c os/darwin_usb.c os/poll_posix.c \
-       os/linux_usbfs.c os/linux_netlink.c os/linux_udev.c \
--      os/netbsd_usb.c os/openbsd_usb.c os/poll_windows.c \
--      os/windows_usb.c libusb-1.0.rc libusb-1.0.def os/poll_posix.h \
--      os/poll_windows.h
-+      os/netbsd_usb.c os/openbsd_usb.c os/sunos_usb.c os/sunos_usb.h \
-+      os/poll_windows.c os/windows_usb.c libusb-1.0.rc \
-+      libusb-1.0.def os/poll_posix.h os/poll_windows.h
- am__dirstamp = $(am__leading_dot)dirstamp
- @THREADS_POSIX_FALSE@am__objects_1 =  \
- @THREADS_POSIX_FALSE@ os/libusb_1_0_la-threads_windows.lo
-@@ -150,25 +150,28 @@ am__objects_3 = os/libusb_1_0_la-poll_po
- am__objects_4 = os/libusb_1_0_la-linux_usbfs.lo
- am__objects_5 = os/libusb_1_0_la-netbsd_usb.lo
- am__objects_6 = os/libusb_1_0_la-openbsd_usb.lo
--am__objects_7 = os/libusb_1_0_la-poll_windows.lo \
-+am__objects_7 = os/libusb_1_0_la-sunos_usb.lo
-+am__objects_8 = os/libusb_1_0_la-poll_windows.lo \
-       os/libusb_1_0_la-windows_usb.lo libusb-1.0.lo
--@OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_FALSE@@OS_WINDOWS_TRUE@am__objects_8 = $(am__objects_7)
--@OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_TRUE@am__objects_8 = $(am__objects_6) \
-+@OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_FALSE@@OS_SUNOS_FALSE@@OS_WINDOWS_TRUE@am__objects_9 = $(am__objects_8)
-+@OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_FALSE@@OS_SUNOS_TRUE@am__objects_9 = $(am__objects_7) \
-+@OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_FALSE@@OS_SUNOS_TRUE@   $(am__objects_3)
-+@OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_TRUE@am__objects_9 = $(am__objects_6) \
- @OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_FALSE@@OS_OPENBSD_TRUE@   $(am__objects_3)
--@OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_TRUE@am__objects_8 = $(am__objects_5) \
-+@OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_TRUE@am__objects_9 = $(am__objects_5) \
- @OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_FALSE@@OS_NETBSD_TRUE@     $(am__objects_3)
--@OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@am__objects_8 = $(am__objects_4) \
-+@OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@am__objects_9 = $(am__objects_4) \
- @OS_DARWIN_FALSE@@OS_HAIKU_FALSE@@OS_LINUX_TRUE@@USE_UDEV_FALSE@      $(am__objects_3) \



Home | Main Index | Thread Index | Old Index