Skip to content

Commit 90829aa

Browse files
committed
fix: try install dep from source
1 parent 4a0e89d commit 90829aa

3 files changed

Lines changed: 30 additions & 7 deletions

File tree

.github/workflows/release.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,28 @@ jobs:
3737
if: runner.os == 'Linux'
3838
run: |
3939
sudo apt-get update
40-
sudo apt-get install -y libgtk-4-dev libpixman-1-dev libusbredirparser-dev libusbredirhost-dev pkg-config dpkg-dev desktop-file-utils
40+
sudo apt-get install -y libgtk-4-dev libpixman-1-dev libusb-1.0-0-dev pkg-config dpkg-dev desktop-file-utils meson ninja-build
41+
42+
- name: Install usbredir for qemu-display
43+
if: runner.os == 'Linux'
44+
shell: bash
45+
run: |
46+
set -euo pipefail
47+
48+
git clone --branch usbredir-0.13.0 --depth 1 https://gitlab.freedesktop.org/spice/usbredir.git /tmp/usbredir
49+
meson setup /tmp/usbredir/build /tmp/usbredir --prefix=/usr/local
50+
meson compile -C /tmp/usbredir/build
51+
sudo meson install -C /tmp/usbredir/build
52+
sudo ldconfig
53+
54+
multiarch="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
55+
{
56+
echo "PKG_CONFIG_PATH=/usr/local/lib/${multiarch}/pkgconfig:/usr/local/lib/pkgconfig"
57+
echo "LD_LIBRARY_PATH=/usr/local/lib/${multiarch}:/usr/local/lib"
58+
} >> "$GITHUB_ENV"
59+
60+
pkg-config --modversion libusbredirhost
61+
pkg-config --modversion libusbredirparser-0.5
4162
4263
- name: Validate desktop launcher
4364
if: runner.os == 'Linux'

CONTRIBUTING.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ QD2 currently builds from source with:
1717
- Rust stable with Cargo
1818
- GTK4 development files
1919
- pixman development files
20-
- libusbredirparser development files
21-
- libusbredirhost development files
20+
- usbredir 0.13+ libraries visible to `pkg-config` (`libusbredirhost.pc` and `libusbredirparser-0.5.pc`)
2221
- `pkg-config` or `pkgconf`
2322

2423
Typical package names:
2524

26-
- Debian/Ubuntu: `libgtk-4-dev`, `libpixman-1-dev`, `libusbredirparser-dev`, `libusbredirhost-dev`, `pkg-config`
25+
- Debian/Ubuntu: `libgtk-4-dev`, `libpixman-1-dev`, `libusb-1.0-0-dev`, `pkg-config`, `meson`, `ninja-build`
26+
27+
If your distro packages do not provide the `usbredir` pkg-config files expected by `qemu-display`, install `usbredir` 0.13+ from source first.
2728

2829
Useful commands:
2930

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,14 @@ Building from source currently requires:
6363
- Rust stable with Cargo
6464
- GTK4 development files
6565
- pixman development files
66-
- libusbredirparser development files
67-
- libusbredirhost development files
66+
- usbredir 0.13+ libraries visible to `pkg-config` (`libusbredirhost.pc` and `libusbredirparser-0.5.pc`)
6867
- `pkg-config` or `pkgconf`
6968

7069
Typical package names:
7170

72-
- Debian/Ubuntu: `libgtk-4-dev`, `libpixman-1-dev`, `libusbredirparser-dev`, `libusbredirhost-dev`, `pkg-config`
71+
- Debian/Ubuntu: `libgtk-4-dev`, `libpixman-1-dev`, `libusb-1.0-0-dev`, `pkg-config`, `meson`, `ninja-build`
72+
73+
If your distro packages do not provide the `usbredir` pkg-config files expected by `qemu-display`, install `usbredir` 0.13+ from source before building QD2.
7374

7475
Build from source with:
7576

0 commit comments

Comments
 (0)