From 3d7a8e8f4831c3f464f72a23b785446cb9c32d90 Mon Sep 17 00:00:00 2001 From: Oleksandr Kalko Date: Thu, 3 Apr 2025 12:40:40 +0300 Subject: [PATCH] Upgrade SDL2 to 2.23.4 Upgrade includes build-from source, Android and VCPKG --- .github/workflows/Windows_MSVC_x64.yml | 2 +- 3rdParty/SDL2/CMakeLists.txt | 4 ++-- .../app/src/main/java/org/libsdl/app/SDLActivity.java | 2 +- vcpkg.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Windows_MSVC_x64.yml b/.github/workflows/Windows_MSVC_x64.yml index 394036648..58ca3db01 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: 'acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4' + vcpkgGitCommitId: '533a5fda5c0646d1771345fb572e759283444d5f' - name: Fetch test data run: | diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt index 952cb11c4..62068fc2b 100644 --- a/3rdParty/SDL2/CMakeLists.txt +++ b/3rdParty/SDL2/CMakeLists.txt @@ -15,7 +15,7 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF) include(functions/FetchContent_ExcludeFromAll_backport) include(FetchContent) FetchContent_Declare(SDL2 - URL https://github.com/libsdl-org/SDL/releases/download/release-2.32.2/SDL2-2.32.2.tar.gz - URL_HASH SHA256=c5f30c427fd8107ee4a400c84d4447dd211352512eaf0b6e89cc6a50a2821922 + URL https://github.com/libsdl-org/SDL/releases/download/release-2.32.4/SDL2-2.32.4.tar.gz + URL_HASH SHA256=f15b478253e1ff6dac62257ded225ff4e7d0c5230204ac3450f1144ee806f934 ) FetchContent_MakeAvailable_ExcludeFromAll(SDL2) 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 c1c4c661f..4bd92e274 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 = 32; - private static final int SDL_MICRO_VERSION = 2; + private static final int SDL_MICRO_VERSION = 4; /* // Display InputType.SOURCE/CLASS of events and devices // diff --git a/vcpkg.json b/vcpkg.json index 5011621d4..88ad76031 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -6,7 +6,7 @@ "bzip2", "lua" ], - "builtin-baseline": "acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4", + "builtin-baseline": "533a5fda5c0646d1771345fb572e759283444d5f", "features": { "sdl1": { "description": "Use SDL1.2 instead of SDL2",