From bb2016889a9b0b1f6a41ff188f7627d57170c848 Mon Sep 17 00:00:00 2001
From: TellowKrinkle <tellowkrinkle@gmail.com>
Date: Fri, 25 Nov 2022 20:50:56 -0600
Subject: [PATCH] 3rdparty: Update SDL to 2.26.0

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

diff --git a/.github/workflows/linux_build_wx.yml b/.github/workflows/linux_build_wx.yml
index f0a7243668..7f4e08ce8e 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.24.0
+      SDL: SDL2-2.26.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 6b7f3e1667..2b5b12743a 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.24.0
+SDL=SDL2-2.26.0
 QT=6.3.1
 
 mkdir -p deps-build
 cd deps-build
 
 cat > SHASUMS <<EOF
-91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97  $SDL.tar.gz
+8000d7169febce93c84b6bdf376631f8179132fd69f7015d4dadb8b9c2bdb295  $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 3e60ef492c..d37d6e005a 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.24.0
+SDL=SDL2-2.26.0
 PNG=1.6.37
 JPG=9e
 SOUNDTOUCH=soundtouch-2.3.1
@@ -25,7 +25,7 @@ export CFLAGS="-I$INSTALLDIR/include -Os $CFLAGS"
 export CXXFLAGS="-I$INSTALLDIR/include -Os $CXXFLAGS"
 
 cat > SHASUMS <<EOF
-91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97  $SDL.tar.gz
+8000d7169febce93c84b6bdf376631f8179132fd69f7015d4dadb8b9c2bdb295  $SDL.tar.gz
 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca  libpng-$PNG.tar.xz
 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d  jpegsrc.v$JPG.tar.gz
 6900996607258496ce126924a19fe9d598af9d892cf3f33d1e4daaa9b42ae0b1  $SOUNDTOUCH.tar.gz
diff --git a/3rdparty/sdl2/SDL b/3rdparty/sdl2/SDL
index 8c9beb0c87..0bfeed061b 160000
--- a/3rdparty/sdl2/SDL
+++ b/3rdparty/sdl2/SDL
@@ -1 +1 @@
-Subproject commit 8c9beb0c873f6ca5efbd88f1ad2648bfc793b2ac
+Subproject commit 0bfeed061b10ea7dd37c88d9bae1824bad760f3a
diff --git a/3rdparty/sdl2/SDL.vcxproj b/3rdparty/sdl2/SDL.vcxproj
index e37de0a44c..164212ff95 100644
--- a/3rdparty/sdl2/SDL.vcxproj
+++ b/3rdparty/sdl2/SDL.vcxproj
@@ -158,6 +158,7 @@
     <ClInclude Include="SDL\src\hidapi\SDL_hidapi_c.h" />
     <ClInclude Include="SDL\src\joystick\controller_type.h" />
     <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
+    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_nintendo.h" />
     <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.h" />
     <ClInclude Include="SDL\src\joystick\SDL_gamecontrollerdb.h" />
     <ClInclude Include="SDL\src\joystick\SDL_joystick_c.h" />
@@ -289,12 +290,15 @@
     <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_ps3.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_steam.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
diff --git a/3rdparty/sdl2/SDL.vcxproj.filters b/3rdparty/sdl2/SDL.vcxproj.filters
index eec12ec2ca..1bc7b8cbea 100644
--- a/3rdparty/sdl2/SDL.vcxproj.filters
+++ b/3rdparty/sdl2/SDL.vcxproj.filters
@@ -542,6 +542,9 @@
     <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h">
       <Filter>joystick\hidapi</Filter>
     </ClInclude>
+    <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_nintendo.h">
+      <Filter>joystick\hidapi</Filter>
+    </ClInclude>
     <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.h">
       <Filter>joystick\hidapi</Filter>
     </ClInclude>
@@ -966,6 +969,9 @@
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_luna.c">
       <Filter>joystick\hidapi</Filter>
     </ClCompile>
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c">
+      <Filter>joystick\hidapi</Filter>
+    </ClCompile>
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps4.c">
       <Filter>joystick\hidapi</Filter>
     </ClCompile>
@@ -978,9 +984,15 @@
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_stadia.c">
       <Filter>joystick\hidapi</Filter>
     </ClCompile>
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c">
+      <Filter>joystick\hidapi</Filter>
+    </ClCompile>
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch.c">
       <Filter>joystick\hidapi</Filter>
     </ClCompile>
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c">
+      <Filter>joystick\hidapi</Filter>
+    </ClCompile>
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c">
       <Filter>joystick\hidapi</Filter>
     </ClCompile>