Skip to content

Commit

Permalink
Merge pull request #4783 from daschuer/hidapi_11
Browse files Browse the repository at this point in the history
Update hidapi to 0.11.2
  • Loading branch information
uklotzde authored Jun 5, 2022
2 parents d6dd5b8 + ba3c3aa commit 4e90c68
Show file tree
Hide file tree
Showing 47 changed files with 1,034 additions and 2,846 deletions.
23 changes: 18 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,24 @@ lib/googletest/googletest/test

# Exclude unneeded files from the bundled hidapi library in the lib/
# directory for future updates
lib/hidapi/android
lib/hidapi/dist
lib/hidapi/doxygen
lib/hidapi/hidtest
lib/hidapi/testgui
lib/hidapi/android/
lib/hidapi/dist/
lib/hidapi/documentation/
lib/hidapi/doxygen/
lib/hidapi/hidtest/
lib/hidapi/m4/
lib/hidapi/pc/
lib/hidapi/src/
lib/hidapi/testgui/
lib/hidapi/bootstrap
lib/hidapi/configure.ac
lib/hidapi/BUILD.*
lib/hidapi/windows/*
!lib/hidapi/windows/*.c
!lib/hidapi/windows/*.h
lib/hidapi/**/.gitignore
lib/hidapi/**/CMakeLists.txt
lib/hidapi/**/Makefile*

# Legacy compilation artifacts that are obsolete starting with 2.3
# TODO: Delete after 2.2 with SCons has been abandoned. Developers
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2792,7 +2792,9 @@ find_package(LibUSB)
# USB HID controller support
option(HID "USB HID controller support" ON)
if(HID)
find_package(hidapi 0.10.1)
# hidapi 0.11.2 is the first release, that implements hid_get_input_report
# for the Linux hidraw backend.
find_package(hidapi 0.11.2)
if(NOT hidapi_FOUND)
message(STATUS "Linking internal libhidapi statically")
add_library(mixxx-hidapi STATIC EXCLUDE_FROM_ALL)
Expand Down
7 changes: 0 additions & 7 deletions lib/hidapi/.gitattributes

This file was deleted.

24 changes: 0 additions & 24 deletions lib/hidapi/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion lib/hidapi/AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ libusb/hidapi Team:
Development/maintainance since June 4th 2019

For a comprehensive list of contributions, see the commit list at github:
https://github.com/libusb/hidapi/commits/master
https://github.com/libusb/hidapi/graphs/contributors

85 changes: 0 additions & 85 deletions lib/hidapi/Makefile.am

This file was deleted.

Loading

0 comments on commit 4e90c68

Please sign in to comment.