From 16099aef586d6f783e0a60d6a4505a991251dbaf Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sat, 18 Feb 2023 22:46:23 +0100
Subject: [PATCH] Updated SDL from 2.26.1 to 2.26.3

---
 CMakeLists.txt                            |  2 +-
 tools/Windows_dependencies_setup_MSVC.bat | 18 +++++++++---------
 tools/Windows_dependencies_setup_MinGW.sh | 12 ++++++------
 tools/create_AppImage.sh                  |  4 ++--
 tools/create_AppImage_SteamDeck.sh        |  4 ++--
 tools/macOS_dependencies_setup.sh         |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dadd4d9d2..19997d26a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -438,7 +438,7 @@ elseif(WIN32)
                             ${CMAKE_CURRENT_SOURCE_DIR}/external/FreeImage/Dist/x64
                             ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include
                             ${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src
-                            ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.26.1)
+                            ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.26.3)
 elseif(EMSCRIPTEN)
     set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS}
                             ${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include
diff --git a/tools/Windows_dependencies_setup_MSVC.bat b/tools/Windows_dependencies_setup_MSVC.bat
index 3b7ce6342..e9300f826 100644
--- a/tools/Windows_dependencies_setup_MSVC.bat
+++ b/tools/Windows_dependencies_setup_MSVC.bat
@@ -140,26 +140,26 @@ cd ..
 echo:
 echo Setting up SDL
 
-if exist SDL2-2.26.1\ (
-  rmdir /S /Q SDL2-2.26.1
+if exist SDL2-2.26.3\ (
+  rmdir /S /Q SDL2-2.26.3
 )
 
-curl -LO https://libsdl.org/release/SDL2-devel-2.26.1-VC.zip
+curl -LO https://libsdl.org/release/SDL2-devel-2.26.3-VC.zip
 
-7z x SDL2-devel-2.26.1-VC.zip
+7z x SDL2-devel-2.26.3-VC.zip
 
-if not exist SDL2-2.26.1\ (
+if not exist SDL2-2.26.3\ (
   echo SDL directory is missing, aborting.
   cd ..
   goto end
 )
 
-cd SDL2-2.26.1
+cd SDL2-2.26.3
 rename include SDL2
 cd ..
-copy /Y SDL2-2.26.1\lib\x64\SDL2.dll ..
-copy /Y SDL2-2.26.1\lib\x64\SDL2.lib ..
-copy /Y SDL2-2.26.1\lib\x64\SDL2main.lib ..
+copy /Y SDL2-2.26.3\lib\x64\SDL2.dll ..
+copy /Y SDL2-2.26.3\lib\x64\SDL2.lib ..
+copy /Y SDL2-2.26.3\lib\x64\SDL2main.lib ..
 
 echo:
 echo Setting up FFmpeg
diff --git a/tools/Windows_dependencies_setup_MinGW.sh b/tools/Windows_dependencies_setup_MinGW.sh
index 412fb2134..daca7f189 100644
--- a/tools/Windows_dependencies_setup_MinGW.sh
+++ b/tools/Windows_dependencies_setup_MinGW.sh
@@ -88,20 +88,20 @@ cd ..
 echo -e "\nSetting up SDL"
 rm -rf SDL2-*
 
-curl -O https://libsdl.org/release/SDL2-devel-2.26.1-mingw.tar.gz
+curl -O https://libsdl.org/release/SDL2-devel-2.26.3-mingw.tar.gz
 
-tar xvzf SDL2-devel-2.26.1-mingw.tar.gz
+tar xvzf SDL2-devel-2.26.3-mingw.tar.gz
 # Needed due to some kind of file system race condition that sometimes occurs on Windows.
 sleep 1
 
-if [ ! -d SDL2-2.26.1 ]; then
+if [ ! -d SDL2-2.26.3 ]; then
   echo "SDL directory is missing, aborting."
   exit
 fi
 
-mv SDL2-2.26.1/x86_64-w64-mingw32/include/SDL2 SDL2-2.26.1/
-cp -p SDL2-2.26.1/x86_64-w64-mingw32/lib/libSDL2main.a ..
-cp -p SDL2-2.26.1/x86_64-w64-mingw32/bin/SDL2.dll ..
+mv SDL2-2.26.3/x86_64-w64-mingw32/include/SDL2 SDL2-2.26.3/
+cp -p SDL2-2.26.3/x86_64-w64-mingw32/lib/libSDL2main.a ..
+cp -p SDL2-2.26.3/x86_64-w64-mingw32/bin/SDL2.dll ..
 
 echo -e "\nSetting up FFmpeg"
 rm -rf ffmpeg-*
diff --git a/tools/create_AppImage.sh b/tools/create_AppImage.sh
index 980d8942c..d30fad9fb 100755
--- a/tools/create_AppImage.sh
+++ b/tools/create_AppImage.sh
@@ -17,8 +17,8 @@
 # How many CPU threads to use for the compilation.
 JOBS=4
 
-SDL_RELEASE_TAG=release-2.26.1
-SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2600.1
+SDL_RELEASE_TAG=release-2.26.3
+SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2600.3
 
 echo "Building AppImage..."
 
diff --git a/tools/create_AppImage_SteamDeck.sh b/tools/create_AppImage_SteamDeck.sh
index 2a84e182d..6ad049f9d 100755
--- a/tools/create_AppImage_SteamDeck.sh
+++ b/tools/create_AppImage_SteamDeck.sh
@@ -13,8 +13,8 @@
 # How many CPU threads to use for the compilation.
 JOBS=4
 
-SDL_RELEASE_TAG=release-2.26.1
-SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2600.1
+SDL_RELEASE_TAG=release-2.26.3
+SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2600.3
 
 echo "Building Steam Deck AppImage..."
 
diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh
index c1c432484..ab342772f 100755
--- a/tools/macOS_dependencies_setup.sh
+++ b/tools/macOS_dependencies_setup.sh
@@ -187,7 +187,7 @@ if [ ! -d SDL ]; then
 fi
 
 cd SDL
-git checkout release-2.26.1
+git checkout release-2.26.3
 ln -s include SDL2
 mkdir build
 cd ..