Merge 9bf85759c2 into a143f66ce4

.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

debian/control

@@ -18,6 +18,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

meson.build

@@ -2157,7 +2157,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
 

scripts/download-macos-libs.py

@@ -186,7 +186,8 @@ def main():
 		'libpixman',
 		'libepoxy',
 		'libpcap',
-		'libslirp'])
+		'libslirp',
+		'libusb'])
 
 if __name__ == '__main__':
-	main()
+	main()

ubuntu-win64-cross/Dockerfile

@@ -92,6 +92,7 @@ RUN make \
     -C ${MXE_PATH} \
         glib \
         libepoxy \
+        libusb1 \
         pixman \
         libsamplerate \
         libressl \