From 09009c2aa71e1f748abd32b74c0f2014ad606f4e Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Tue, 20 Jun 2023 21:45:14 +0200 Subject: [PATCH] Upgrade SDL (2.28.0) for Windows Include the latest version of SDL in Windows releases. Fixes #3825 Refs libsdl/#7478 --- app/prebuilt-deps/prepare-sdl.sh | 6 +++--- cross_win32.txt | 2 +- cross_win64.txt | 2 +- release.mk | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/prebuilt-deps/prepare-sdl.sh b/app/prebuilt-deps/prepare-sdl.sh index 60bffae9..b691aac5 100755 --- a/app/prebuilt-deps/prepare-sdl.sh +++ b/app/prebuilt-deps/prepare-sdl.sh @@ -6,10 +6,10 @@ cd "$DIR" mkdir -p "$PREBUILT_DATA_DIR" cd "$PREBUILT_DATA_DIR" -DEP_DIR=SDL2-2.26.4 +DEP_DIR=SDL2-2.28.0 -FILENAME=SDL2-devel-2.26.4-mingw.tar.gz -SHA256SUM=fe899c8642caac2f180b1ee6f786857ddcaa0adc1fa82474312b09dd47d74712 +FILENAME=SDL2-devel-2.28.0-mingw.tar.gz +SHA256SUM=b91ce59eeacd4a9db403f976fd2337d9360b21ada374124417d716065c380e20 if [[ -d "$DEP_DIR" ]] then diff --git a/cross_win32.txt b/cross_win32.txt index f3fded40..c3f72540 100644 --- a/cross_win32.txt +++ b/cross_win32.txt @@ -17,5 +17,5 @@ endian = 'little' [properties] prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-4/win32' -prebuilt_sdl2 = 'SDL2-2.26.4/i686-w64-mingw32' +prebuilt_sdl2 = 'SDL2-2.28.0/i686-w64-mingw32' prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-Win32' diff --git a/cross_win64.txt b/cross_win64.txt index 1b02b93f..66cddf83 100644 --- a/cross_win64.txt +++ b/cross_win64.txt @@ -17,5 +17,5 @@ endian = 'little' [properties] prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-4/win64' -prebuilt_sdl2 = 'SDL2-2.26.4/x86_64-w64-mingw32' +prebuilt_sdl2 = 'SDL2-2.28.0/x86_64-w64-mingw32' prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-x64' diff --git a/release.mk b/release.mk index e41a45ad..a467352c 100644 --- a/release.mk +++ b/release.mk @@ -101,7 +101,7 @@ dist-win32: build-server build-win32 cp app/prebuilt-deps/data/platform-tools-34.0.1/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/" cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/" cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/" - cp app/prebuilt-deps/data/SDL2-2.26.4/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/" + cp app/prebuilt-deps/data/SDL2-2.28.0/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/" cp app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-Win32/bin/msys-usb-1.0.dll "$(DIST)/$(WIN32_TARGET_DIR)/" dist-win64: build-server build-win64 @@ -119,7 +119,7 @@ dist-win64: build-server build-win64 cp app/prebuilt-deps/data/platform-tools-34.0.1/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/" cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/" cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/" - cp app/prebuilt-deps/data/SDL2-2.26.4/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/" + cp app/prebuilt-deps/data/SDL2-2.28.0/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/" cp app/prebuilt-deps/data/libusb-1.0.26/libusb-MinGW-x64/bin/msys-usb-1.0.dll "$(DIST)/$(WIN64_TARGET_DIR)/" zip-win32: dist-win32