From 0c04e27df33056ee9cc4e5e63d36a6099d43210b Mon Sep 17 00:00:00 2001 From: zeltermann <136022354+zeltermann@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:06:49 +0700 Subject: [PATCH] Re-enable SDL's CPUinfo subsystem See https://github.com/libsdl-org/SDL/issues/7809. Disabling CPUinfo triggers a bug in SDL's audio subsystem, which breaks SDL's JACK output on Linux. We're lucky it hasn't broken anything else. --- externals/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 500eb21e3..a763e0c32 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -63,8 +63,9 @@ if (YUZU_USE_EXTERNAL_SDL2) # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095) # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) + # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809) set(SDL_UNUSED_SUBSYSTEMS - CPUinfo File Filesystem + File Filesystem Locale Power Render) foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) string(TOUPPER ${_SUB} _OPT)