[compat] fix libusb when disabled error (solaris, fbsd, etc) #2649

Merged
crueter merged 3 commits from fix-compat-libusb-1 into master 2025-10-22 19:12:34 +02:00
Member

This fixes an issue in builds where libusb is disabled, it also uses and prioritizes system dependencies over vendored ones (so ports is easier)

Signed-off-by: lizzie lizzie@eden-emu.dev

This fixes an issue in builds where libusb is disabled, it also uses and prioritizes system dependencies over vendored ones (so ports is easier) Signed-off-by: lizzie <lizzie@eden-emu.dev>
crueter requested changes 2025-10-02 17:25:36 +02:00
Dismissed
CMakeLists.txt Outdated
@ -172,3 +174,3 @@
mark_as_advanced(FORCE ENABLE_OPENGL)
option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
cmake_dependent_option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON "WIN32 OR ANDROID OR PLATFORM_LINUX OR APPLE" OFF)
Owner

why?

why?
Author
Member

Easier for FBSD ports when we eventually get there

Easier for FBSD ports when we eventually get there
Owner

It shouldn't be forced off, ever. You can change the default if you wish though

It shouldn't be forced off, ever. You can change the default if you wish though
crueter marked this conversation as resolved
crueter requested changes 2025-10-04 08:34:30 +02:00
Dismissed
CMakeLists.txt Outdated
@ -157,2 +157,3 @@
option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
# FreeBSD doesn't have a cubeb port yet, vendoring it isn't required (it's optional anyways)
cmake_dependent_option(ENABLE_CUBEB "Enables the cubeb audio backend" ON "NOT PLATFORM_FREEBSD" OFF)
Owner

Cmake dependent option forces it off here if the fourth argument is true, so you should just do

if (PLATFORM_FREEBSD)
    set(CUBEB_DEFAULT OFF)
else()
    set(CUBEB_DEFAULT ON)
endif()

option(ENABLE_CUBEB "Enables the cubeb audio backend" ${ENABLE_CUBEB})

also, it gets vendored either way, so idk if this is even needed

Cmake dependent option *forces* it off here if the fourth argument is true, so you should just do ```cmake if (PLATFORM_FREEBSD) set(CUBEB_DEFAULT OFF) else() set(CUBEB_DEFAULT ON) endif() option(ENABLE_CUBEB "Enables the cubeb audio backend" ${ENABLE_CUBEB}) ``` also, it gets vendored either way, so idk if this is even needed
crueter added this to the 0.0.4 (real) milestone 2025-10-10 02:45:43 +02:00
Lizzie force-pushed fix-compat-libusb-1 from 0cf6ee63b9
Some checks failed
eden-license / license-header (pull_request) Failing after 21s
to 8419f4089f
Some checks reported errors
eden-license / license-header (pull_request) Failing after 48s
GitHub Actions [CI] Build cancelled
2025-10-19 05:18:10 +02:00
Compare
Lizzie force-pushed fix-compat-libusb-1 from 507c5cca05
Some checks failed
eden-license / license-header (pull_request) Successful in 25s
GitHub Actions [CI] Build failed
to 437d12e891
Some checks failed
eden-license / license-header (pull_request) Successful in 29s
GitHub Actions [CI] Build failed
2025-10-20 03:12:32 +02:00
Compare
MaranBr force-pushed fix-compat-libusb-1 from 437d12e891
Some checks failed
eden-license / license-header (pull_request) Successful in 29s
GitHub Actions [CI] Build failed
to 1c207b2965
Some checks failed
eden-license / license-header (pull_request) Successful in 26s
GitHub Actions [CI] Build failed
2025-10-20 04:23:49 +02:00
Compare
Member

Need rebase

Need rebase
Shinmegumi force-pushed fix-compat-libusb-1 from 1c207b2965
Some checks failed
eden-license / license-header (pull_request) Successful in 26s
GitHub Actions [CI] Build failed
to fe9325b39b
All checks were successful
eden-license / license-header (pull_request) Successful in 30s
GitHub Actions [CI] Build succeeded
GitHub Releases [CD] Build succeeded – Release published
2025-10-22 18:26:28 +02:00
Compare
crueter approved these changes 2025-10-22 19:12:30 +02:00
crueter merged commit 05c721bb41 into master 2025-10-22 19:12:34 +02:00
crueter deleted branch fix-compat-libusb-1 2025-10-22 19:12:35 +02:00
Sign in to join this conversation.
No description provided.