From 20be2e4f7ddefa678446a6a402dde8f8ae080a43 Mon Sep 17 00:00:00 2001
From: jgmdev <jgmdev@gmail.com>
Date: Tue, 23 Aug 2022 00:14:38 -0400
Subject: [PATCH] updated sdl2 wrap to 2.24

---
 meson.build           | 23 ++++++++++++++++++-----
 subprojects/sdl2.wrap | 16 ++++++++--------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/meson.build b/meson.build
index aa9f0a13..9454fceb 100644
--- a/meson.build
+++ b/meson.build
@@ -113,18 +113,31 @@ if not get_option('source-only')
     # Do not remove before https://github.com/libsdl-org/SDL/issues/5413 is released
     sdl_options += 'use_events=enabled'
 
-    # we leave this up to what the host system has
-    sdl_options += 'use_video_x11=auto'
-    sdl_options += 'use_video_wayland=auto'
+    if host_machine.system() == 'darwin' or host_machine.system() == 'windows'
+        sdl_options += 'use_video_x11=disabled'
+        sdl_options += 'use_video_wayland=disabled'
+    else
+        sdl_options += 'use_render=enabled'
+        sdl_options += 'use_video_x11=auto'
+        sdl_options += 'use_video_wayland=auto'
+    endif
+
+    # we leave this up to what the host system has except on windows
+    if host_machine.system() != 'windows'
+        sdl_options += 'use_video_opengl=auto'
+        sdl_options += 'use_video_openglesv2=auto'
+    else
+        sdl_options += 'use_video_opengl=disabled'
+        sdl_options += 'use_video_openglesv2=disabled'
+    endif
 
     # we don't need these
+    sdl_options += 'test=false'
     sdl_options += 'use_sensor=disabled'
     sdl_options += 'use_haptic=disabled'
     sdl_options += 'use_audio=disabled'
     sdl_options += 'use_cpuinfo=disabled'
     sdl_options += 'use_joystick=disabled'
-    sdl_options += 'use_video_opengl=disabled'
-    sdl_options += 'use_video_openglesv2=disabled'
     sdl_options += 'use_video_vulkan=disabled'
     sdl_options += 'use_video_offscreen=disabled'
     sdl_options += 'use_power=disabled'
diff --git a/subprojects/sdl2.wrap b/subprojects/sdl2.wrap
index b1affeb5..aafa1fcc 100644
--- a/subprojects/sdl2.wrap
+++ b/subprojects/sdl2.wrap
@@ -1,12 +1,12 @@
 [wrap-file]
-directory = SDL2-2.0.20
-source_url = https://libsdl.org/release/SDL2-2.0.20.tar.gz
-source_filename = SDL2-2.0.20.tar.gz
-source_hash = c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06
-patch_filename = sdl2_2.0.20-3_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.0.20-3/get_patch
-patch_hash = ade644ba46cefa4f1f9e57aa23bacc5dabf762d1f90d8416a1e1e4b0b7a188c4
+directory = SDL2-2.24.0
+source_url = https://libsdl.org/release/SDL2-2.24.0.tar.gz
+source_filename = SDL2-2.24.0.tar.gz
+source_hash = 91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97
+patch_filename = sdl2_2.24.0-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/sdl2_2.24.0-2/get_patch
+patch_hash = ec296ed9a577b42131d2fdbfe5ca73a0cf133793c0290e1ccd825675464bfe32
+wrapdb_version = 2.24.0-2
 
 [provide]
 sdl2 = sdl2_dep
-