aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Tauner <stefan.tauner@gmx.at>2019-02-09 19:17:05 +0100
committerStefan Tauner <stefan.tauner@gmx.at>2019-02-11 12:10:46 +0100
commit1347aa82c4941f87175c434a3acc8142414cca9a (patch)
treeeb929b3fb39f1eb2531b14004e8ea63a1dcb2e61
parentf687d570dd5a92441d2ded7ee57edf03791fd673 (diff)
downloadusbutils-1347aa82c4941f87175c434a3acc8142414cca9a.tar.gz
Depend on libusb 1.0.14
This partially reverts commit 3fe9f89 of usbutils and updates the usbhid-dump submodule to 209c2b0, which works around possibly missing libusb_set_option() in older versions of libusb and thus does not require libusb 1.0.22. However, lsusb.c itself relies on libusb_get_port_number() since dddb696 which was added in libusb 1.0.12. Furthermore the enum values declaring the various debug levels have changed to their current state in libusb 1.0.13. This version temporarily fixed a typo in struct libusb_config_descriptor which was reverted in 1.0.14 again. So to sum up the previous version check for 1.0.9 in usbutils previous to 3fe9f89 was wrong and we should test against 1.0.14 instead. This change was tested against libusb 1.0.14 built from source. Signed-off-by: Stefan Tauner <stefan.tauner@gmx.at>
-rw-r--r--configure.ac2
m---------usbhid-dump0
2 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index da648b7..065c513 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_SYS_LARGEFILE
AC_CHECK_HEADERS([byteswap.h])
AC_CHECK_FUNCS([nl_langinfo iconv])
-PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.22)
+PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.14)
PKG_CHECK_MODULES(UDEV, libudev >= 196)
diff --git a/usbhid-dump b/usbhid-dump
-Subproject 6b50a9224fac005a3fef9d1ab7f748adf052785
+Subproject 209c2b042936d0b13c9d7530e374a669f99a556