diff --git a/scripts/deps/build-dependencies-linux-cross.sh b/scripts/deps/build-dependencies-linux-cross.sh index 1cf7792c5..c6fbb9e0d 100755 --- a/scripts/deps/build-dependencies-linux-cross.sh +++ b/scripts/deps/build-dependencies-linux-cross.sh @@ -108,7 +108,7 @@ LIBJPEGTURBO=3.1.0 LIBPNG=1.6.45 LIBWEBP=1.5.0 LIBZIP=1.11.3 -SDL3=3.2.4 +SDL3=3.2.8 QT=6.8.2 ZLIBNG=2.2.4 ZSTD=1.5.6 @@ -137,7 +137,7 @@ fi cat > SHASUMS < SHASUMS < SHASUMS < -Date: Mon, 10 Feb 2025 22:52:50 +1000 -Subject: [PATCH] joystick: Fix PS5 player LED hint change callback name - -The LED hint was getting registered for SDL_HINT_JOYSTICK_ENHANCED_REPORTS -instead of SDL_HINT_JOYSTICK_HIDAPI_PS5_PLAYER_LED, which results in a -use-after-free followed by a crash. ---- - src/joystick/hidapi/SDL_hidapi_ps5.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/joystick/hidapi/SDL_hidapi_ps5.c b/src/joystick/hidapi/SDL_hidapi_ps5.c -index 94b720d42..abf59a87f 100644 ---- a/src/joystick/hidapi/SDL_hidapi_ps5.c -+++ b/src/joystick/hidapi/SDL_hidapi_ps5.c -@@ -952,7 +952,7 @@ static bool HIDAPI_DriverPS5_OpenJoystick(SDL_HIDAPI_Device *device, SDL_Joystic - - SDL_AddHintCallback(SDL_HINT_JOYSTICK_ENHANCED_REPORTS, - SDL_PS5EnhancedReportsChanged, ctx); -- SDL_AddHintCallback(SDL_HINT_JOYSTICK_ENHANCED_REPORTS, -+ SDL_AddHintCallback(SDL_HINT_JOYSTICK_HIDAPI_PS5_PLAYER_LED, - SDL_PS5PlayerLEDHintChanged, ctx); - - return true; --- -2.48.1 - diff --git a/scripts/packaging/flatpak/modules/30-sdl3.yaml b/scripts/packaging/flatpak/modules/30-sdl3.yaml index d6088e150..e46c6e555 100644 --- a/scripts/packaging/flatpak/modules/30-sdl3.yaml +++ b/scripts/packaging/flatpak/modules/30-sdl3.yaml @@ -15,10 +15,8 @@ build-options: no-debuginfo: true sources: - type: archive - url: "https://github.com/libsdl-org/SDL/releases/download/release-3.2.4/SDL3-3.2.4.tar.gz" - sha256: "2938328317301dfbe30176d79c251733aa5e7ec5c436c800b99ed4da7adcb0f0" - - type: patch - path: "../../../deps/sdl3-joystick-crash.patch" + url: "https://github.com/libsdl-org/SDL/releases/download/release-3.2.8/SDL3-3.2.8.tar.gz" + sha256: "13388fabb361de768ecdf2b65e52bb27d1054cae6ccb6942ba926e378e00db03" cleanup: - /bin - /include