Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Don't merge yet] Upgrade vendored libhidapi to v0.12.0 #4779

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,21 @@ 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*
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2607,7 +2607,7 @@ find_package(LibUSB)
# USB HID controller support
option(HID "USB HID controller support" ON)
if(HID)
find_package(hidapi 0.10.1)
find_package(hidapi 0.12.0)
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

1 change: 1 addition & 0 deletions lib/hidapi/HACKING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ Firing a new release:
1. Update the Version (if not yet updated).
2. Build hidapi.dll/.lib for x86/x64.
3. Upload Windows binaries to Github release page.
4. Make sure to tag the release as: `hidapi-<VERSION>`, where <VERSION> as in VERSION file.
85 changes: 0 additions & 85 deletions lib/hidapi/Makefile.am

This file was deleted.

Loading