Merge remote-tracking branch 'upstream/master' into clang-cl

.github/workflows/builds.yml

@@ -169,6 +169,7 @@ jobs:
       with:
         path: hidapisrc
     - name: Install dependencies
+      shell: cmd
       run: |
         choco install ninja
         pip3 install meson
@@ -202,7 +203,7 @@ jobs:
     - name: Run CTest MSVC
       shell: cmd
       working-directory: build/msvc
-      run: ctest -C RelWithDebInfo --rerun-failed --output-on-failure
+      run: ctest -C RelWithDebInfo --no-compress-output --output-on-failure
 
     - name: Configure CMake ClangCL
       shell: cmd
@@ -269,7 +270,7 @@ jobs:
         nmake install
     - name: Run CTest NMake
       working-directory: build\nmake
-      run: ctest --rerun-failed --output-on-failure
+      run: ctest --no-compress-output --output-on-failure
 
     - name: Configure CMake MinGW
       shell: cmd
@@ -300,7 +301,7 @@ jobs:
         cmake --build . --target install
     - name: Run CTest MinGW
       working-directory: build\mingw
-      run: ctest --rerun-failed --output-on-failure
+      run: ctest --no-compress-output --output-on-failure
 
     - name: Check Meson build
       shell: cmd
@@ -430,7 +431,7 @@ jobs:
     - name: Install dependencies
       run: |
         pacman -Sy
-        pacman -S --noconfirm gcc pkg-config autoconf automake libtool libusb libudev0 cmake make
+        pacman -S --noconfirm glibc lib32-glibc gcc pkg-config autoconf automake libtool libusb libudev0 cmake make
     - name: Configure CMake
       run: |
         rm -rf build install

.github/workflows/checks.yml

@@ -139,7 +139,9 @@ jobs:
       with:
         path: src
     - name: Install dependencies
-      run: sudo apt install libudev-dev libusb-1.0-0-dev ninja-build
+      run: |
+        sudo apt update
+        sudo apt install libudev-dev libusb-1.0-0-dev ninja-build
     - name: Configure
       run: |
         cmake -B build -S src -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHIDAPI_WITH_TESTS=ON -DHIDAPI_BUILD_HIDTEST=ON -DCMAKE_C_COMPILER=gcc

AUTHORS.txt

@@ -11,7 +11,7 @@ Ludovic Rousseau <[email protected]>:
 	Correctness fixes
 
 libusb/hidapi Team:
-	Development/maintainance since June 4th 2019
+	Development/maintenance since June 4th 2019
 
 For a comprehensive list of contributions, see the commit list at github:
 	https://github.com/libusb/hidapi/graphs/contributors

BUILD.autotools.md

@@ -46,7 +46,9 @@ A simple command list, to build HIDAPI with Autotools as a _shared library_ and
 
 ```sh
 ./bootstrap # this prepares the configure script
-./configure
+mkdir build
+cd build # in-source builds are not recommended and known to be broken in some cases (https://github.com/libusb/hidapi/issues/621)
+../configure
 make # build the library
 make install # as root, or using sudo, this will install hidapi into your system
 ```

BUILD.cmake.md

@@ -16,7 +16,7 @@ most of this document may not be of interest for you; just check variables names
 CMake can be installed either using your system's package manager,
 or by downloading an installer/prebuilt version from the [official website](https://cmake.org/download/).
 
-On most \*nix systems, the prefered way to install CMake is via package manager,
+On most \*nix systems, the preferred way to install CMake is via package manager,
 e.g. `sudo apt install cmake`.
 
 On Windows CMake could be provided by your development environment (e.g. by Visual Studio Installer or MinGW installer),

CMakeLists.txt

@@ -42,6 +42,9 @@ elseif(NOT WIN32)
         option(HIDAPI_WITH_HIDRAW "Build HIDRAW-based implementation of HIDAPI" ON)
         option(HIDAPI_WITH_LIBUSB "Build LIBUSB-based implementation of HIDAPI" ON)
     endif()
+    if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+        option(HIDAPI_WITH_NETBSD "Build NetBSD/UHID implementation of HIDAPI" ON)
+    endif()
 endif()
 
 option(BUILD_SHARED_LIBS "Build shared version of the libraries, otherwise build statically" ON)

configure.ac

@@ -74,7 +74,7 @@ case $host in
 	backend="mac"
 	os="darwin"
 	threads="pthreads"
-	LIBS="${LIBS} -framework IOKit -framework CoreFoundation -framework AppKit"
+	LIBS="${LIBS} -framework IOKit -framework CoreFoundation"
 	;;
 *-freebsd*)
 	AC_MSG_RESULT([ (FreeBSD back-end)])

dist/hidapi.podspec

@@ -26,6 +26,6 @@ Pod::Spec.new do |spec|
 
   spec.public_header_files = "hidapi/hidapi.h", "mac/hidapi_darwin.h"
 
-  spec.frameworks   = "IOKit", "CoreFoundation", "AppKit"
+  spec.frameworks   = "IOKit", "CoreFoundation"
 
 end

libusb/CMakeLists.txt

@@ -66,7 +66,7 @@ else()
         else()
             # otherwise there is 2 options:
             # 1) iconv is provided by Standard C library and the build will be just fine
-            # 2) The _user_ has to provide additiona compilation options for this project/target
+            # 2) The _user_ has to provide additional compilation options for this project/target
         endif()
 
         # check for error: "conflicting types for 'iconv'"