From 91706ae3d079abafa009c574845ddb12377588aa Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Thu, 28 Apr 2022 19:23:59 +0200
Subject: [PATCH] Upgrade SDL (2.0.22) for Windows

Include the latest version of SDL in Windows releases.
---
 app/prebuilt-deps/prepare-sdl.sh | 6 +++---
 cross_win32.txt                  | 2 +-
 cross_win64.txt                  | 2 +-
 release.mk                       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/prebuilt-deps/prepare-sdl.sh b/app/prebuilt-deps/prepare-sdl.sh
index c414c854..0b41fe5c 100755
--- a/app/prebuilt-deps/prepare-sdl.sh
+++ b/app/prebuilt-deps/prepare-sdl.sh
@@ -6,10 +6,10 @@ cd "$DIR"
 mkdir -p "$PREBUILT_DATA_DIR"
 cd "$PREBUILT_DATA_DIR"
 
-DEP_DIR=SDL2-2.0.20
+DEP_DIR=SDL2-2.0.22
 
-FILENAME=SDL2-devel-2.0.20-mingw.tar.gz
-SHA256SUM=38094d82a857d6c62352e5c5cdec74948c5b4d25c59cbd298d6d233568976bd1
+FILENAME=SDL2-devel-2.0.22-mingw.tar.gz
+SHA256SUM=0e91e35973366aa1e6f81ee368924d9b4f93f9da4d2f2a89ec80b06eadcf23d1
 
 if [[ -d "$DEP_DIR" ]]
 then
diff --git a/cross_win32.txt b/cross_win32.txt
index a2341f21..d1d5d11b 100644
--- a/cross_win32.txt
+++ b/cross_win32.txt
@@ -20,6 +20,6 @@ ffmpeg_avcodec = 'avcodec-58'
 ffmpeg_avformat = 'avformat-58'
 ffmpeg_avutil = 'avutil-56'
 prebuilt_ffmpeg = 'ffmpeg-win32-4.3.1'
-prebuilt_sdl2 = 'SDL2-2.0.20/i686-w64-mingw32'
+prebuilt_sdl2 = 'SDL2-2.0.22/i686-w64-mingw32'
 prebuilt_libusb_root = 'libusb-1.0.26'
 prebuilt_libusb = prebuilt_libusb_root + '/MinGW-Win32'
diff --git a/cross_win64.txt b/cross_win64.txt
index 0404aedc..f673c530 100644
--- a/cross_win64.txt
+++ b/cross_win64.txt
@@ -20,6 +20,6 @@ ffmpeg_avcodec = 'avcodec-59'
 ffmpeg_avformat = 'avformat-59'
 ffmpeg_avutil = 'avutil-57'
 prebuilt_ffmpeg = 'ffmpeg-win64-5.0'
-prebuilt_sdl2 = 'SDL2-2.0.20/x86_64-w64-mingw32'
+prebuilt_sdl2 = 'SDL2-2.0.22/x86_64-w64-mingw32'
 prebuilt_libusb_root = 'libusb-1.0.26'
 prebuilt_libusb = prebuilt_libusb_root + '/MinGW-x64'
diff --git a/release.mk b/release.mk
index 1c550afb..3e3d14db 100644
--- a/release.mk
+++ b/release.mk
@@ -108,7 +108,7 @@ dist-win32: build-server build-win32
 	cp app/prebuilt-deps/data/platform-tools-31.0.3/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-31.0.3/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-31.0.3/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/SDL2-2.0.20/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/SDL2-2.0.22/i686-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/libusb-1.0.26/MinGW-Win32/msys-usb-1.0.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 
 dist-win64: build-server build-win64
@@ -127,7 +127,7 @@ dist-win64: build-server build-win64
 	cp app/prebuilt-deps/data/platform-tools-31.0.3/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-31.0.3/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/platform-tools-31.0.3/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/prebuilt-deps/data/SDL2-2.0.20/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp app/prebuilt-deps/data/SDL2-2.0.22/x86_64-w64-mingw32/bin/SDL2.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp app/prebuilt-deps/data/libusb-1.0.26/MinGW-x64/msys-usb-1.0.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 
 zip-win32: dist-win32