From f45053ad25f2fb13d15e11022378cb2d95e763b1 Mon Sep 17 00:00:00 2001
From: Andy Lanzone <andy@enoznal.com>
Date: Thu, 17 Jul 2025 07:20:13 -0700
Subject: [PATCH] Bump libsdl to 2.0.20

---
 CMakeLists.txt                            | 2 +-
 apps/openmw/mwinput/controllermanager.cpp | 4 ----
 components/sdlutil/events.hpp             | 2 --
 components/sdlutil/sdlinputwrapper.cpp    | 2 --
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a00dafc7ef..902f89ec27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -466,7 +466,7 @@ find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONA
 if(OPENMW_USE_SYSTEM_MYGUI)
     find_package(MyGUI 3.4.3 REQUIRED)
 endif()
-find_package(SDL2 2.0.10 REQUIRED)
+find_package(SDL2 2.0.20 REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ZLIB REQUIRED)
 
diff --git a/apps/openmw/mwinput/controllermanager.cpp b/apps/openmw/mwinput/controllermanager.cpp
index 1a8490d8b7..0bba8bfa32 100644
--- a/apps/openmw/mwinput/controllermanager.cpp
+++ b/apps/openmw/mwinput/controllermanager.cpp
@@ -349,7 +349,6 @@ namespace MWInput
     void ControllerManager::enableGyroSensor()
     {
         mGyroAvailable = false;
-#if SDL_VERSION_ATLEAST(2, 0, 14)
         SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
         if (!cntrl)
             return;
@@ -361,7 +360,6 @@ namespace MWInput
             return;
         }
         mGyroAvailable = true;
-#endif
     }
 
     bool ControllerManager::isGyroAvailable() const
@@ -372,7 +370,6 @@ namespace MWInput
     std::array<float, 3> ControllerManager::getGyroValues() const
     {
         float gyro[3] = { 0.f };
-#if SDL_VERSION_ATLEAST(2, 0, 14)
         SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
         if (cntrl && mGyroAvailable)
         {
@@ -380,7 +377,6 @@ namespace MWInput
             if (result < 0)
                 Log(Debug::Error) << "Failed to get game controller sensor data: " << SDL_GetError();
         }
-#endif
         return std::array<float, 3>({ gyro[0], gyro[1], gyro[2] });
     }
 
diff --git a/components/sdlutil/events.hpp b/components/sdlutil/events.hpp
index 3ae15e448c..410ee68440 100644
--- a/components/sdlutil/events.hpp
+++ b/components/sdlutil/events.hpp
@@ -28,7 +28,6 @@ namespace SDLUtil
         float mY;
         float mPressure;
 
-#if SDL_VERSION_ATLEAST(2, 0, 14)
         explicit TouchEvent(const SDL_ControllerTouchpadEvent& arg)
             : mDevice(arg.touchpad)
             , mFinger(arg.finger)
@@ -37,7 +36,6 @@ namespace SDLUtil
             , mPressure(arg.pressure)
         {
         }
-#endif
     };
 
     ///////////////
diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp
index 41a4f13818..104f83fc6d 100644
--- a/components/sdlutil/sdlinputwrapper.cpp
+++ b/components/sdlutil/sdlinputwrapper.cpp
@@ -173,7 +173,6 @@ namespace SDLUtil
                     if (mConListener)
                         mConListener->axisMoved(1, evt.caxis);
                     break;
-#if SDL_VERSION_ATLEAST(2, 0, 14)
                 case SDL_CONTROLLERSENSORUPDATE:
                     // controller sensor data is received on demand
                     break;
@@ -186,7 +185,6 @@ namespace SDLUtil
                 case SDL_CONTROLLERTOUCHPADUP:
                     mConListener->touchpadReleased(1, TouchEvent(evt.ctouchpad));
                     break;
-#endif
                 case SDL_WINDOWEVENT:
                     handleWindowEvent(evt);
                     break;