CVS commit: pkgsrc/devel/libusb1

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Sun Dec 22 16:49:05 UTC 2019

Modified Files:
        pkgsrc/devel/libusb1: Makefile distinfo
Added Files:
        pkgsrc/devel/libusb1/patches: patch-libusb_os_netbsd__usb.c

Log Message:
Fix debug logging on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/libusb1/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/libusb1/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c

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.20 pkgsrc/devel/libusb1/Makefile:1.21
--- pkgsrc/devel/libusb1/Makefile:1.20  Sun Nov  3 10:39:18 2019
+++ pkgsrc/devel/libusb1/Makefile       Sun Dec 22 16:49:05 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2019/11/03 10:39:18 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2019/12/22 16:49:05 jmcneill Exp $
 
 DISTNAME=      libusb-1.0.22
 PKGNAME=       ${DISTNAME:S/libusb/libusb1/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libusb/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/devel/libusb1/distinfo
diff -u pkgsrc/devel/libusb1/distinfo:1.11 pkgsrc/devel/libusb1/distinfo:1.12
--- pkgsrc/devel/libusb1/distinfo:1.11  Tue Aug  6 08:50:28 2019
+++ pkgsrc/devel/libusb1/distinfo       Sun Dec 22 16:49:05 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2019/08/06 08:50:28 maya Exp $
+$NetBSD: distinfo,v 1.12 2019/12/22 16:49:05 jmcneill Exp $
 
 SHA1 (libusb-1.0.22.tar.bz2) = 10116aa265aac4273a0c894faa089370262ec0dc
 RMD160 (libusb-1.0.22.tar.bz2) = 59b800abb0b4c088dbee950fa67bb31240b8a134
@@ -6,5 +6,6 @@ SHA512 (libusb-1.0.22.tar.bz2) = 2a93ba4
 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_sunos__usb.c) = 4896e497d451487a09b3be9ad74f72595a441086
 SHA1 (patch-ub) = 14bffca93ec8445cbfccb613dfda92f652b0ceb0

Added files:

Index: pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c
diff -u /dev/null pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c:1.1
--- /dev/null   Sun Dec 22 16:49:05 2019
+++ pkgsrc/devel/libusb1/patches/patch-libusb_os_netbsd__usb.c  Sun Dec 22 16:49:05 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-libusb_os_netbsd__usb.c,v 1.1 2019/12/22 16:49:05 jmcneill Exp $
+
+Do not emit log messages from netbsd_clock_gettime as it is called from
+the logger.
+
+--- libusb/os/netbsd_usb.c.orig        2018-03-17 07:23:37.000000000 +0000
++++ libusb/os/netbsd_usb.c
+@@ -493,8 +493,6 @@ netbsd_handle_transfer_completion(struct
+ int
+ netbsd_clock_gettime(int clkid, struct timespec *tp)
+ {
+-      usbi_dbg("clock %d", clkid);
+-
+       if (clkid == USBI_CLOCK_REALTIME)
+               return clock_gettime(CLOCK_REALTIME, tp);
+