libhidapi: update to 0.11.0

needed for newer mixxx.

5 files changed, 33 insertions, 54 deletions

diff --git a/comms/libhidapi/Makefile b/comms/libhidapi/Makefile
index 898efdaefc1..427d018dc94 100644
--- a/comms/libhidapi/Makefile
+++ b/comms/libhidapi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2019/07/08 12:52:42 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/11/20 18:59:05 nia Exp $
 
 GITHUB_PROJECT=	hidapi
-GITHUB_TAG=	${GITHUB_PROJECT}-0.9.0
+GITHUB_TAG=	${GITHUB_PROJECT}-0.11.0
 DISTNAME=	${GITHUB_TAG}
 PKGNAME=	lib${DISTNAME}
 CATEGORIES=	comms devel
@@ -20,6 +20,10 @@ HAS_CONFIGURE=	yes
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
+PKGCONFIG_OVERRIDE+=	pc/hidapi-hidraw.pc.in
+PKGCONFIG_OVERRIDE+=	pc/hidapi-libusb.pc.in
+PKGCONFIG_OVERRIDE+=	pc/hidapi.pc.in
+
 pre-configure:
 	cd ${WRKSRC} && ${SH} ./bootstrap
 
diff --git a/comms/libhidapi/PLIST b/comms/libhidapi/PLIST
index 4c2c2b4b692..89cd367c377 100644
--- a/comms/libhidapi/PLIST
+++ b/comms/libhidapi/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2019/07/08 12:52:42 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/11/20 18:59:05 nia Exp $
 include/hidapi/hidapi.h
+include/hidapi/hidapi_libusb.h
 lib/libhidapi.la
 lib/pkgconfig/hidapi.pc
 share/doc/hidapi/AUTHORS.txt
diff --git a/comms/libhidapi/distinfo b/comms/libhidapi/distinfo
index a66531552b6..cecca6cb39a 100644
--- a/comms/libhidapi/distinfo
+++ b/comms/libhidapi/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:06:00 nia Exp $
+$NetBSD: distinfo,v 1.7 2021/11/20 18:59:05 nia Exp $
 
-BLAKE2s (hidapi-0.9.0.tar.gz) = 46a57f44a1f5c539dbb477067ff3dcba8f37d11d10034681e88919c606a5c795
-SHA512 (hidapi-0.9.0.tar.gz) = d9f28d394b78daece7d2dfb946e62349a56b388b3a06241585c6fad5a4e24dc914723de6c0f12a9e51cd23fb245f6b5ac9b3721319646d5ba5912bbe0a3f9a52
-Size (hidapi-0.9.0.tar.gz) = 112963 bytes
+BLAKE2s (hidapi-0.11.0.tar.gz) = 02dafe2ed9d145768a4b36ac2ce9c50292824eec3fde39e9ad3f68f8a65d49c0
+SHA512 (hidapi-0.11.0.tar.gz) = 0de4abc963600d159ce231416c468b9e81a8361e4d2c2202988d6eb2e58a923700e9b9be639fbddc6bc14625131848409e2e88dbc4b34a1f8a726c8fa4692d92
+Size (hidapi-0.11.0.tar.gz) = 232631 bytes
 SHA1 (patch-Makefile.am) = 8e39fc4650601af39c510107ca2b3c85029fb2df
-SHA1 (patch-configure.ac) = ddc85e7421f79ef7d037223802292ed27fbdfdaf
-SHA1 (patch-libusb_Makefile.am) = 4e325f56caff55f6e3b26948a43afd3f30606cd7
+SHA1 (patch-configure.ac) = caf23d94ec0af608f63dfd3acba7b3624af78bdc
+SHA1 (patch-libusb_Makefile.am) = 2caf718bd7538bcc43b7eaea75dc5a7024f12581
diff --git a/comms/libhidapi/patches/patch-configure.ac b/comms/libhidapi/patches/patch-configure.ac
index da68d034656..38c07d8e925 100644
--- a/comms/libhidapi/patches/patch-configure.ac
+++ b/comms/libhidapi/patches/patch-configure.ac
@@ -1,42 +1,15 @@
-$NetBSD: patch-configure.ac,v 1.2 2021/03/25 10:47:24 nia Exp $
+$NetBSD: patch-configure.ac,v 1.3 2021/11/20 18:59:05 nia Exp $
 
 - Fix syntax for autoconf-2.71
 - Always use pkg-config to find libusb1.
 - Support NetBSD.
 
---- configure.ac.orig	2019-06-19 10:34:38.000000000 +0000
+--- configure.ac.orig	2021-09-27 10:08:20.000000000 +0000
 +++ configure.ac
-@@ -20,7 +20,6 @@ LTLDFLAGS="-version-info ${lt_current}:$
- 
- AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE([foreign -Wall -Werror])
--AC_CONFIG_MACRO_DIR([m4])
- 
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
- LT_INIT
-@@ -92,9 +91,10 @@ case $host in
- 	CFLAGS="$CFLAGS -I/usr/local/include"
- 	LDFLAGS="$LDFLAGS -L/usr/local/lib"
- 	LIBS="${LIBS}"
--	AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
-+	PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], true, [hidapi_lib_error libusb-1.0])
-+	LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} $libusb_LIBS"
-+	CFLAGS_LIBUSB="${CFLAGS_LIBUSB} $libusb_CFLAGS"
+@@ -92,6 +92,22 @@ case $host in
+ 	CFLAGS_LIBUSB="${CFLAGS_LIBUSB} $libusb_CFLAGS"
  	AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
--	echo libs_priv: $LIBS_LIBUSB_PRIVATE
  	;;
- *-kfreebsd*)
- 	AC_MSG_RESULT([ (kFreeBSD back-end)])
-@@ -104,8 +104,25 @@ case $host in
- 	os="kfreebsd"
- 	threads="pthreads"
- 
--	AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb])
--	echo libs_priv: $LIBS_LIBUSB_PRIVATE
-+	PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], true, [hidapi_lib_error libusb-1.0])
-+	LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} $libusb_LIBS"
-+	CFLAGS_LIBUSB="${CFLAGS_LIBUSB} $libusb_CFLAGS"
-+	;;
 +*-netbsd*)
 +	AC_MSG_RESULT([ (NetBSD back-end)])
 +	AC_DEFINE(OS_NETBSD, 1, [NetBSD implementation])
@@ -45,21 +18,22 @@ $NetBSD: patch-configure.ac,v 1.2 2021/03/25 10:47:24 nia Exp $
 +	os="netbsd"
 +	threads="pthreads"
 +
-+	CFLAGS="${CFLAGS}"
-+	LDFLAGS="${LDFLAGS}"
++	CFLAGS="$CFLAGS"
++	LDFLAGS="$LDFLAGS"
 +	LIBS="${LIBS}"
-+	AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
 +	PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], true, [hidapi_lib_error libusb-1.0])
 +	LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} $libusb_LIBS"
 +	CFLAGS_LIBUSB="${CFLAGS_LIBUSB} $libusb_CFLAGS"
- 	;;
- *-mingw*)
- 	AC_MSG_RESULT([ (Windows back-end, using MinGW)])
-@@ -213,6 +230,7 @@ AM_CONDITIONAL(OS_LINUX, test "x$os" = x
++	AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv])
++	;;
+ *-kfreebsd*)
+ 	AC_MSG_RESULT([ (kFreeBSD back-end)])
+ 	AC_DEFINE(OS_KFREEBSD, 1, [kFreeBSD implementation])
+@@ -230,6 +246,7 @@ AM_CONDITIONAL(OS_LINUX, test "x$os" = x
  AM_CONDITIONAL(OS_DARWIN, test "x$os" = xdarwin)
  AM_CONDITIONAL(OS_FREEBSD, test "x$os" = xfreebsd)
  AM_CONDITIONAL(OS_KFREEBSD, test "x$os" = xkfreebsd)
 +AM_CONDITIONAL(OS_NETBSD, test "x$os" = xnetbsd)
+ AM_CONDITIONAL(OS_HAIKU, test "x$os" = xhaiku)
  AM_CONDITIONAL(OS_WINDOWS, test "x$os" = xwindows)
  
- AC_CONFIG_HEADERS([config.h])
diff --git a/comms/libhidapi/patches/patch-libusb_Makefile.am b/comms/libhidapi/patches/patch-libusb_Makefile.am
index 13a77b4169d..dce2ef95569 100644
--- a/comms/libhidapi/patches/patch-libusb_Makefile.am
+++ b/comms/libhidapi/patches/patch-libusb_Makefile.am
@@ -1,10 +1,10 @@
-$NetBSD: patch-libusb_Makefile.am,v 1.1 2019/07/08 12:52:42 nia Exp $
+$NetBSD: patch-libusb_Makefile.am,v 1.2 2021/11/20 18:59:05 nia Exp $
 
 Support NetBSD.
 
---- libusb/Makefile.am.orig	2019-06-19 10:34:38.000000000 +0000
+--- libusb/Makefile.am.orig	2021-09-27 10:08:20.000000000 +0000
 +++ libusb/Makefile.am
-@@ -21,6 +21,13 @@ libhidapi_la_LDFLAGS = $(LTLDFLAGS)
+@@ -14,6 +14,13 @@ libhidapi_la_LDFLAGS = $(LTLDFLAGS)
  libhidapi_la_LIBADD = $(LIBS_LIBUSB)
  endif
  
@@ -15,6 +15,6 @@ Support NetBSD.
 +libhidapi_la_LIBADD = $(LIBS_LIBUSB)
 +endif
 +
- hdrdir = $(includedir)/hidapi
- hdr_HEADERS = $(top_srcdir)/hidapi/hidapi.h
- 
+ if OS_KFREEBSD
+ lib_LTLIBRARIES = libhidapi.la
+ libhidapi_la_SOURCES = hid.c