From 518d4ae61dd92eff332d076fb4d60346ecc91272 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 8 Feb 2025 12:45:00 +0100 Subject: [PATCH 1/2] Upgrade SDL2 to 2.30.12 --- 3rdParty/SDL2/CMakeLists.txt | 6 +++--- Packaging/windows/mingw-prep.sh | 2 +- .../app/src/main/java/org/libsdl/app/SDLActivity.java | 4 ++-- tools/update_sdl_android_project.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt index e7fbfddf964..e3806be99a8 100644 --- a/3rdParty/SDL2/CMakeLists.txt +++ b/3rdParty/SDL2/CMakeLists.txt @@ -14,8 +14,8 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF) include(functions/FetchContent_ExcludeFromAll_backport) include(FetchContent) -FetchContent_Declare_ExcludeFromAll(SDL2 - URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.10/SDL2-2.30.10.tar.gz - URL_HASH SHA256=f59adf36a0fcf4c94198e7d3d776c1b3824211ab7aeebeb31fe19836661196aa +FetchContent_Declare(SDL2 + URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.12/SDL2-2.30.12.tar.gz + URL_HASH SHA256=ac356ea55e8b9dd0b2d1fa27da40ef7e238267ccf9324704850d5d47375b48ea ) FetchContent_MakeAvailable_ExcludeFromAll(SDL2) diff --git a/Packaging/windows/mingw-prep.sh b/Packaging/windows/mingw-prep.sh index 2583c602db2..b9b84b90786 100755 --- a/Packaging/windows/mingw-prep.sh +++ b/Packaging/windows/mingw-prep.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SDLDEV_VERS=2.30.10 +SDLDEV_VERS=2.30.12 SODIUM_VERS=1.0.20 # exit when any command fails diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java index d8e403f5ec0..2d34e54ef9a 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh private static final String TAG = "SDL"; private static final int SDL_MAJOR_VERSION = 2; private static final int SDL_MINOR_VERSION = 30; - private static final int SDL_MICRO_VERSION = 10; + private static final int SDL_MICRO_VERSION = 12; /* // Display InputType.SOURCE/CLASS of events and devices // @@ -311,7 +311,7 @@ public static void initialize() { mNextNativeState = NativeState.INIT; mCurrentNativeState = NativeState.INIT; } - + protected SDLSurface createSDLSurface(Context context) { return new SDLSurface(context); } diff --git a/tools/update_sdl_android_project.sh b/tools/update_sdl_android_project.sh index e031e02232b..472f6ad1cb5 100755 --- a/tools/update_sdl_android_project.sh +++ b/tools/update_sdl_android_project.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -SDL_BASE=https://raw.githubusercontent.com/libsdl-org/SDL/release-2.30.10 +SDL_BASE=https://raw.githubusercontent.com/libsdl-org/SDL/release-2.30.12 FILES=( HIDDevice.java HIDDeviceBLESteamController.java From 865f6b06e39670964e28f63a283ee131d79a55e0 Mon Sep 17 00:00:00 2001 From: Oleksandr Kalko Date: Sat, 8 Feb 2025 14:03:26 +0200 Subject: [PATCH 2/2] Upgrade SDL2 for MSVC --- .github/workflows/Windows_MSVC_x64.yml | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Windows_MSVC_x64.yml b/.github/workflows/Windows_MSVC_x64.yml index cb0263d0bc9..15b2d23505f 100644 --- a/.github/workflows/Windows_MSVC_x64.yml +++ b/.github/workflows/Windows_MSVC_x64.yml @@ -42,7 +42,7 @@ jobs: - name: Restore or setup vcpkg uses: lukka/run-vcpkg@v11.5 with: - vcpkgGitCommitId: '80d54ff62d528339c626a6fbc3489a7f25956ade' + vcpkgGitCommitId: '74ec888e385d189b42d6b398d0bbaa6f1b1d3b0e' - name: Fetch test data run: | diff --git a/vcpkg.json b/vcpkg.json index a0a730cdf3f..0389574eb54 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -6,7 +6,7 @@ "bzip2", "lua" ], - "builtin-baseline": "80d54ff62d528339c626a6fbc3489a7f25956ade", + "builtin-baseline": "74ec888e385d189b42d6b398d0bbaa6f1b1d3b0e", "features": { "sdl1": { "description": "Use SDL1.2 instead of SDL2",