Skip to content

Commit b60e027

Browse files
committed
hidapi-async: update libusb/hidapi submodule of the hidapi dep
This fixes BitBoxSwiss#43 - a regression where libusb/hidapi would report the interface number of both (HWW and U2F) as 0 instead of 0 and 1 on macOS 13.3. The fix is to pull the upstream fix: libusb/hidapi#534. hidapi-rs was forked to benma/hidapi-rs to pull in the latest libusb/hidapi that contains the fix. This also led me down a rabbit-hole of updating the Docker base image and all sorts of dependencies. Code changes are clippy fixes. libusb dep was changed to libudev, as hidapi-rs switched to the hidraw hidapi backend by default (was libusb backend before) in ruabmbua/hidapi-rs@bbb7f3e. Docker base image updated from 16.04 to 20.04 as as 16.04 and 18.04 reached end-of-life.
1 parent 72660c2 commit b60e027

File tree

14 files changed

+628
-568
lines changed

14 files changed

+628
-568
lines changed

.cargo/config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[target.x86_64-apple-darwin]
2-
linker = "x86_64-apple-darwin20.2-clang"
3-
ar = "x86_64-apple-darwin20.2-ar"
2+
linker = "x86_64-apple-darwin21.4-clang"
3+
ar = "x86_64-apple-darwin21.4-ar"
44

55
[target.aarch64-apple-darwin]
6-
linker = "aarch64-apple-darwin20.2-clang"
7-
ar = "aarch64-apple-darwin20.2-ar"
6+
linker = "aarch64-apple-darwin21.4-clang"
7+
ar = "aarch64-apple-darwin21.4-ar"
88

99
[target.x86_64-pc-windows-gnu]
1010
linker = "x86_64-w64-mingw32-gcc"

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
override: true
2222

2323
- name: Install system package deps
24-
run: sudo apt-get install libusb-1.0-0-dev
24+
run: sudo apt-get install libudev-dev
2525

2626
- name: Run cargo check
2727
uses: actions-rs/cargo@v1
@@ -44,7 +44,7 @@ jobs:
4444
components: rustfmt, clippy
4545

4646
- name: Install system package deps
47-
run: sudo apt-get install libusb-1.0-0-dev
47+
run: sudo apt-get install libudev-dev
4848

4949
- name: Run cargo fmt
5050
uses: actions-rs/cargo@v1
@@ -73,7 +73,7 @@ jobs:
7373
override: true
7474

7575
- name: Install system package deps
76-
run: sudo apt-get install libusb-1.0-0-dev
76+
run: sudo apt-get install libudev-dev
7777

7878
- name: Run cargo test
7979
uses: actions-rs/cargo@v1
@@ -95,7 +95,7 @@ jobs:
9595
override: true
9696

9797
- name: Install package deps
98-
run: sudo apt-get install libusb-1.0-0-dev -y
98+
run: sudo apt-get install libudev-dev -y
9999

100100
- name: Run cargo build
101101
uses: actions-rs/cargo@v1
@@ -125,7 +125,7 @@ jobs:
125125

126126
- name: Install package deps
127127
run: >
128-
sudo apt-get install libusb-1.0-0-dev -y;
128+
sudo apt-get install libudev-dev -y;
129129
sudo apt-get install ruby -y;
130130
sudo gem install --no-doc fpm;
131131
cargo install toml-echo

0 commit comments

Comments
 (0)