Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: Add libusb support to builds #1532

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2b0c5bf
Enabled libusb passthrough in builds
faha223 Sep 23, 2023
297f79a
Added libusb1 to the list of libraries to install on macos to see if …
faha223 Feb 25, 2024
5555385
changed libusb1 to libusb to see if that will make the package instal…
faha223 Feb 25, 2024
6270cb5
Merge branch 'master' of https://github.com/faha223/xemu into enable_…
faha223 Feb 26, 2024
3aba8f6
commented out the libusb package to see what effect that has on the b…
faha223 Feb 26, 2024
abfe59f
uncommented libusb in the download-macos-libs.py file
faha223 Feb 26, 2024
c142113
added some debugging logging to the download-macos-libs.py script to …
faha223 Feb 26, 2024
2a5dc41
changed the print on line 49 to print the length of the pkgs array
faha223 Feb 26, 2024
3fe5cd0
added logic to print pkg_list data when len(pkgs) == 0
faha223 Feb 26, 2024
2157fdb
changed darwin target for arm64 from 20 to 21 to see if this fixes pa…
faha223 Feb 26, 2024
859eecb
Added logic to check for packages with darwin_any or noarch before gi…
faha223 Feb 26, 2024
5ca1a2d
added libusb-1.0-0-dev to the list of packages to install for the lin…
faha223 Feb 26, 2024
6f08d43
Removed all of the debug print calls and matched the layout and forma…
faha223 Feb 28, 2024
98aa18b
Merge pull request #24 from xemu-project/master
faha223 Mar 10, 2024
c7013be
Merge branch 'master' into enable_libusb
faha223 Mar 10, 2024
c73a42d
Merge branch 'xemu-project:master' into master
faha223 Sep 20, 2024
6aea3ea
Merge branch 'master' into enable_libusb
faha223 Sep 20, 2024
c1cf79e
Merge branch 'master' into enable_libusb
faha223 Dec 29, 2024
3f9ee81
Merge branch 'master' into enable_libusb
faha223 Jan 10, 2025
8058f64
Added libusb1 back to the ubuntu-win64-cross dockerfile
faha223 Jan 10, 2025
a25574b
Added libusb-1.0-0-dev to debian/control and removed .enabled() from …
faha223 Jan 11, 2025
2df8f89
Added .enabled() back to the meson.build for libusb, because it's sti…
faha223 Jan 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,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
Expand Down
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 11),
libpcap-dev,
libslirp-dev,
libvulkan-dev,
libusb-1.0-0-dev,
Standards-Version: 3.9.8
Homepage: https://xemu.app
XS-Debian-Vcs-Browser: https://github.com/mborgerson/xemu
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2129,7 +2129,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

Expand Down
5 changes: 3 additions & 2 deletions scripts/download-macos-libs.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ def main():
'libepoxy',
'openssl11',
'libpcap',
'libslirp'])
'libslirp',
'libusb'])

if __name__ == '__main__':
main()
main()
1 change: 1 addition & 0 deletions ubuntu-win64-cross/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ RUN make \
-C ${MXE_PATH} \
glib \
libepoxy \
libusb1 \
pixman \
libsamplerate \
libressl \
Expand Down
Loading