From bc7037bb52c5c09d6c752a87ec8573f4cbcd7e67 Mon Sep 17 00:00:00 2001
From: TellowKrinkle <tellowkrinkle@gmail.com>
Date: Fri, 19 Aug 2022 16:19:52 -0500
Subject: [PATCH] 3rdparty: Upgrade SDL to 2.24

---
 .github/workflows/linux_build_wx.yml                  |  2 +-
 .../workflows/scripts/linux/build-dependencies-qt.sh  |  4 ++--
 .github/workflows/scripts/macos/build-dependencies.sh |  4 ++--
 3rdparty/sdl2/SDL                                     |  2 +-
 3rdparty/sdl2/SDL.vcxproj                             | 11 +++++++++++
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/linux_build_wx.yml b/.github/workflows/linux_build_wx.yml
index 695b26be29..e4cf9af93b 100644
--- a/.github/workflows/linux_build_wx.yml
+++ b/.github/workflows/linux_build_wx.yml
@@ -45,7 +45,7 @@ jobs:
       CCACHE_COMPRESS: true
       CCACHE_COMPRESSLEVEL: 9
       CCACHE_MAXSIZE: 100M
-      SDL: SDL2-2.0.22
+      SDL: SDL2-2.24.0
       PATCHELF_VERSION: 0.12
 
     steps:
diff --git a/.github/workflows/scripts/linux/build-dependencies-qt.sh b/.github/workflows/scripts/linux/build-dependencies-qt.sh
index 1cdb660b3b..9e05ffe9fc 100755
--- a/.github/workflows/scripts/linux/build-dependencies-qt.sh
+++ b/.github/workflows/scripts/linux/build-dependencies-qt.sh
@@ -4,14 +4,14 @@ set -e
 
 INSTALLDIR="$HOME/deps"
 NPROCS="$(getconf _NPROCESSORS_ONLN)"
-SDL=SDL2-2.0.22
+SDL=SDL2-2.24.0
 QT=6.3.1
 
 mkdir -p deps-build
 cd deps-build
 
 cat > SHASUMS <<EOF
-fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e  $SDL.tar.gz
+91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97  $SDL.tar.gz
 0a64421d9c2469c2c48490a032ab91d547017c9cc171f3f8070bc31888f24e03  qtbase-everywhere-src-$QT.tar.xz
 7b19f418e6f7b8e23344082dd04440aacf5da23c5a73980ba22ae4eba4f87df7  qtsvg-everywhere-src-$QT.tar.xz
 c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1  qttools-everywhere-src-$QT.tar.xz
diff --git a/.github/workflows/scripts/macos/build-dependencies.sh b/.github/workflows/scripts/macos/build-dependencies.sh
index 6312ba8c7f..54fa05d429 100755
--- a/.github/workflows/scripts/macos/build-dependencies.sh
+++ b/.github/workflows/scripts/macos/build-dependencies.sh
@@ -9,7 +9,7 @@ else
 fi
 INSTALLDIR="$HOME/deps"
 NPROCS="$(getconf _NPROCESSORS_ONLN)"
-SDL=SDL2-2.0.22
+SDL=SDL2-2.24.0
 PNG=1.6.37
 JPG=9e
 SAMPLERATE=libsamplerate-0.1.9
@@ -27,7 +27,7 @@ export CFLAGS="-I$INSTALLDIR/include -Os $CFLAGS"
 export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS"
 
 cat > SHASUMS <<EOF
-fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e  $SDL.tar.gz
+91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97  $SDL.tar.gz
 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca  libpng-$PNG.tar.xz
 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d  jpegsrc.v$JPG.tar.gz
 0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1  $SAMPLERATE.tar.gz
diff --git a/3rdparty/sdl2/SDL b/3rdparty/sdl2/SDL
index 53dea98309..8c9beb0c87 160000
--- a/3rdparty/sdl2/SDL
+++ b/3rdparty/sdl2/SDL
@@ -1 +1 @@
-Subproject commit 53dea9830964eee8b5c2a7ee0a65d6e268dc78a1
+Subproject commit 8c9beb0c873f6ca5efbd88f1ad2648bfc793b2ac
diff --git a/3rdparty/sdl2/SDL.vcxproj b/3rdparty/sdl2/SDL.vcxproj
index 04a61660af..e37de0a44c 100644
--- a/3rdparty/sdl2/SDL.vcxproj
+++ b/3rdparty/sdl2/SDL.vcxproj
@@ -60,6 +60,7 @@
     <ClInclude Include="SDL\include\SDL_filesystem.h" />
     <ClInclude Include="SDL\include\SDL_gamecontroller.h" />
     <ClInclude Include="SDL\include\SDL_gesture.h" />
+    <ClInclude Include="SDL\include\SDL_guid.h" />
     <ClInclude Include="SDL\include\SDL_haptic.h" />
     <ClInclude Include="SDL\include\SDL_hidapi.h" />
     <ClInclude Include="SDL\include\SDL_hints.h" />
@@ -173,6 +174,7 @@
     <ClInclude Include="SDL\src\misc\SDL_sysurl.h" />
     <ClInclude Include="SDL\src\power\SDL_syspower.h" />
     <ClInclude Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.h" />
+    <ClInclude Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.h" />
     <ClInclude Include="SDL\src\render\direct3d\SDL_shaders_d3d.h" />
     <ClInclude Include="SDL\src\render\opengles2\SDL_gles2funcs.h" />
     <ClInclude Include="SDL\src\render\opengles2\SDL_shaders_gles2.h" />
@@ -196,6 +198,7 @@
     <ClInclude Include="SDL\src\SDL_hints_c.h" />
     <ClInclude Include="SDL\src\SDL_internal.h" />
     <ClInclude Include="SDL\src\SDL_list.h" />
+    <ClInclude Include="SDL\src\SDL_utils_c.h" />
     <ClInclude Include="SDL\src\sensor\dummy\SDL_dummysensor.h" />
     <ClInclude Include="SDL\src\sensor\SDL_sensor_c.h" />
     <ClInclude Include="SDL\src\sensor\SDL_syssensor.h" />
@@ -280,13 +283,16 @@
     <ClCompile Include="SDL\src\haptic\windows\SDL_windowshaptic.c" />
     <ClCompile Include="SDL\src\haptic\windows\SDL_xinputhaptic.c" />
     <ClCompile Include="SDL\src\hidapi\SDL_hidapi.c" />
+    <ClCompile Include="SDL\src\joystick\controller_type.c" />
     <ClCompile Include="SDL\src\joystick\dummy\SDL_sysjoystick.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapijoystick.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_combined.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_luna.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps4.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps5.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_shield.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_stadia.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
@@ -329,6 +335,8 @@
     <ClCompile Include="SDL\src\power\windows\SDL_syspower.c" />
     <ClCompile Include="SDL\src\render\direct3d11\SDL_render_d3d11.c" />
     <ClCompile Include="SDL\src\render\direct3d11\SDL_shaders_d3d11.c" />
+    <ClCompile Include="SDL\src\render\direct3d12\SDL_render_d3d12.c" />
+    <ClCompile Include="SDL\src\render\direct3d12\SDL_shaders_d3d12.c" />
     <ClCompile Include="SDL\src\render\direct3d\SDL_render_d3d.c" />
     <ClCompile Include="SDL\src\render\direct3d\SDL_shaders_d3d.c" />
     <ClCompile Include="SDL\src\render\opengl\SDL_render_gl.c" />
@@ -350,12 +358,15 @@
     <ClCompile Include="SDL\src\SDL_assert.c" />
     <ClCompile Include="SDL\src\SDL_dataqueue.c" />
     <ClCompile Include="SDL\src\SDL_error.c" />
+    <ClCompile Include="SDL\src\SDL_guid.c" />
     <ClCompile Include="SDL\src\SDL_hints.c" />
     <ClCompile Include="SDL\src\SDL_list.c" />
     <ClCompile Include="SDL\src\SDL_log.c" />
+    <ClCompile Include="SDL\src\SDL_utils.c" />
     <ClCompile Include="SDL\src\sensor\dummy\SDL_dummysensor.c" />
     <ClCompile Include="SDL\src\sensor\SDL_sensor.c" />
     <ClCompile Include="SDL\src\sensor\windows\SDL_windowssensor.c" />
+    <ClCompile Include="SDL\src\stdlib\SDL_crc16.c" />
     <ClCompile Include="SDL\src\stdlib\SDL_crc32.c" />
     <ClCompile Include="SDL\src\stdlib\SDL_getenv.c" />
     <ClCompile Include="SDL\src\stdlib\SDL_iconv.c" />