diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb2a6cc123..0fc992d8dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -221,7 +221,7 @@ jobs: run: | export DEBIAN_FRONTEND=noninteractive sudo apt-get -qy update - sudo apt-get install ccache libfuse2 + sudo apt-get install ccache libfuse2 libusb-1.0-0-dev pushd src sudo apt-get -qy build-dep . - name: Compile diff --git a/debian/control b/debian/control index 7f5871bbd7..f4fef2cba7 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 11), libpcap-dev, libslirp-dev, libvulkan-dev, + libusb-1.0-0-dev, libcurl4-gnutls-dev, Standards-Version: 3.9.8 Homepage: https://xemu.app diff --git a/meson.build b/meson.build index c1e9612bbf..81bfb851e6 100644 --- a/meson.build +++ b/meson.build @@ -2158,7 +2158,7 @@ if not get_option('usb_redir').auto() or have_system endif libusb = not_found if not get_option('libusb').auto() or have_system - libusb = dependency('libusb-1.0', required: get_option('libusb'), + libusb = dependency('libusb-1.0', required: get_option('libusb').enabled(), version: '>=1.0.13', method: 'pkg-config') endif diff --git a/scripts/download-macos-libs.py b/scripts/download-macos-libs.py index 15baa7543b..c1b2adbd1b 100755 --- a/scripts/download-macos-libs.py +++ b/scripts/download-macos-libs.py @@ -187,7 +187,8 @@ def main(): 'libpixman', 'libepoxy', 'libpcap', - 'libslirp']) + 'libslirp', + 'libusb']) if __name__ == '__main__': - main() + main() \ No newline at end of file diff --git a/ubuntu-win64-cross/Dockerfile b/ubuntu-win64-cross/Dockerfile index a3aeb78329..0731f86501 100644 --- a/ubuntu-win64-cross/Dockerfile +++ b/ubuntu-win64-cross/Dockerfile @@ -92,6 +92,7 @@ RUN make \ -C ${MXE_PATH} \ glib \ libepoxy \ + libusb1 \ pixman \ libsamplerate \ libressl \