update hidapi to 0.9.0

The original maintainer of hidapi (signal11) stopped responding to communication for a long time, so hidapi has been forked. It is now hosted by libusb at https://github.com/libusb/hidapi 0.9.0 is the first stable release since the fork.
dine909 · Apr 6, 2020 · 1072d95 · 1072d95
1 parent 6882798
commit 1072d95
Show file tree

Hide file tree

Showing 71 changed files with 3,112 additions and 2,044 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1985,16 +1985,16 @@ if(HID)
   if(HIDAPI_STATIC)
     message(STATUS "Linking internal libhidapi statically")
     add_library(mixxx-hidapi STATIC EXCLUDE_FROM_ALL)
-    target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi-0.8.0-rc1/hidapi)
+    target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi/hidapi)
     if(WIN32)
-        target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/windows/hid.c)
+        target_sources(mixxx-hidapi PRIVATE lib/hidapi/windows/hid.c)
     elseif(APPLE)
-        target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/mac/hid.c)
+        target_sources(mixxx-hidapi PRIVATE lib/hidapi/mac/hid.c)
     elseif(UNIX)
       if(NOT LibUSB_FOUND)
         message(FATAL_ERROR "USB HID controller support on Unix with statically linked libhidapi-libusb requires libusb 1.0 and its development headers.")
       endif()
-      target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/libusb/hid.c)
+      target_sources(mixxx-hidapi PRIVATE lib/hidapi/libusb/hid.c)
       target_link_libraries(mixxx-hidapi PRIVATE LibUSB::LibUSB)
     else()
       message(FATAL_ERROR "USB HID controller support only possible on Windows/Mac OS/Linux/BSD.")

diff --git a/build/features.py b/build/features.py
@@ -45,7 +45,7 @@ def sources(self, build):
 
 class HID(Feature):
     INTERNAL_LINK = False
-    HIDAPI_INTERNAL_PATH = 'lib/hidapi-0.8.0-rc1'
+    HIDAPI_INTERNAL_PATH = 'lib/hidapi'
 
     def description(self):
         return "HID controller support"
@@ -707,7 +707,7 @@ def configure(self, build, conf):
             # https://bugs.launchpad.net/mixxx/+bug/1833225
             if not conf.CheckForPKG('shout', '2.4.4'):
                 self.INTERNAL_LINK = True
- 
+
         if not self.INTERNAL_LINK:
             self.INTERNAL_LINK = not conf.CheckLib(['libshout', 'shout'])
 

diff --git a/lib/hidapi-0.8.0-rc1/doxygen/Doxyfile b/lib/hidapi-0.8.0-rc1/doxygen/Doxyfile
diff --git a/lib/hidapi-0.8.0-rc1/.gitattributes → lib/hidapi/.gitattributes b/lib/hidapi-0.8.0-rc1/.gitattributes → lib/hidapi/.gitattributes
diff --git a/lib/hidapi-0.8.0-rc1/.gitignore → lib/hidapi/.gitignore b/lib/hidapi-0.8.0-rc1/.gitignore → lib/hidapi/.gitignore
diff --git a/lib/hidapi-0.8.0-rc1/AUTHORS.txt → lib/hidapi/AUTHORS.txt b/lib/hidapi-0.8.0-rc1/AUTHORS.txt → lib/hidapi/AUTHORS.txt
diff --git a/lib/hidapi-0.8.0-rc1/HACKING.txt → lib/hidapi/HACKING.txt b/lib/hidapi-0.8.0-rc1/HACKING.txt → lib/hidapi/HACKING.txt
diff --git a/lib/hidapi-0.8.0-rc1/LICENSE-bsd.txt → lib/hidapi/LICENSE-bsd.txt b/lib/hidapi-0.8.0-rc1/LICENSE-bsd.txt → lib/hidapi/LICENSE-bsd.txt
diff --git a/lib/hidapi-0.8.0-rc1/LICENSE-gpl3.txt → lib/hidapi/LICENSE-gpl3.txt b/lib/hidapi-0.8.0-rc1/LICENSE-gpl3.txt → lib/hidapi/LICENSE-gpl3.txt
diff --git a/lib/hidapi-0.8.0-rc1/LICENSE-orig.txt → lib/hidapi/LICENSE-orig.txt b/lib/hidapi-0.8.0-rc1/LICENSE-orig.txt → lib/hidapi/LICENSE-orig.txt
diff --git a/lib/hidapi-0.8.0-rc1/LICENSE.txt → lib/hidapi/LICENSE.txt b/lib/hidapi-0.8.0-rc1/LICENSE.txt → lib/hidapi/LICENSE.txt
diff --git a/lib/hidapi-0.8.0-rc1/Makefile.am → lib/hidapi/Makefile.am b/lib/hidapi-0.8.0-rc1/Makefile.am → lib/hidapi/Makefile.am
@@ -27,6 +27,10 @@ if OS_FREEBSD
 SUBDIRS += libusb
 endif
 
+if OS_KFREEBSD
+SUBDIRS += libusb
+endif
+
 if OS_WINDOWS
 SUBDIRS += windows
 endif
@@ -40,7 +44,7 @@ endif
 EXTRA_DIST = udev doxygen
 
 dist_doc_DATA = \
- README.txt \
+ README.md \
  AUTHORS.txt \
  LICENSE-bsd.txt \
  LICENSE-gpl3.txt \