Upgrade SDL2 to 2.30.10

diasurgical · Dec 28, 2024 · 5234881 · 5234881
1 parent fc0f58c
commit 5234881
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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_ExcludeFromAll(SDL2
-    URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.9/SDL2-2.30.9.tar.gz
-    URL_HASH SHA256=24b574f71c87a763f50704bbb630cbe38298d544a1f890f099a4696b1d6beba4
+    URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.10/SDL2-2.30.10.tar.gz
+    URL_HASH SHA256=f59adf36a0fcf4c94198e7d3d776c1b3824211ab7aeebeb31fe19836661196aa
 )
 FetchContent_MakeAvailable_ExcludeFromAll(SDL2)
diff --git a/Packaging/windows/mingw-prep.sh b/Packaging/windows/mingw-prep.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-SDLDEV_VERS=2.30.5
+SDLDEV_VERS=2.30.10
 SODIUM_VERS=1.0.20
 
 # exit when any command fails
@@ -37,7 +37,7 @@ cd "tmp-mingw-${MINGW_ARCH}-prep"
 
 wget -q https://www.libsdl.org/release/SDL2-devel-${SDLDEV_VERS}-mingw.tar.gz -OSDL2-devel-${SDLDEV_VERS}-mingw.tar.gz
 tar -xzf SDL2-devel-${SDLDEV_VERS}-mingw.tar.gz
-$SUDO cp -r SDL2*/${MINGW_ARCH}/* ${MINGW_PREFIX}
+CROSS_PATH=/usr ARCHITECTURES=${MINGW_ARCH} $SUDO make -eC SDL2*/ cross
 
 wget -q https://github.com/jedisct1/libsodium/releases/download/${SODIUM_VERS}-RELEASE/libsodium-${SODIUM_VERS}-mingw.tar.gz -Olibsodium-${SODIUM_VERS}-mingw.tar.gz
 tar -xzf libsodium-${SODIUM_VERS}-mingw.tar.gz --no-same-owner

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
@@ -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 = 9;
+    private static final int SDL_MICRO_VERSION = 10;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //

diff --git 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.5
+SDL_BASE=https://raw.githubusercontent.com/libsdl-org/SDL/release-2.30.10
 FILES=(
 	HIDDevice.java
 	HIDDeviceBLESteamController.java