From 48ca9cdfdc455017d31ea81eb1f5c90043db8427 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Tue, 21 Jun 2022 16:39:01 +0200
Subject: [PATCH] project: bump minimum required SDL version to 2.0.4
---
.github/fetch_sdl_vc.ps1 | 2 +-
CMakeLists.txt | 2 +-
configure | 2 +-
configure.ac | 2 +-
test-versioning.sh | 2 ++
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.github/fetch_sdl_vc.ps1 b/.github/fetch_sdl_vc.ps1
index 05b3d92..6a4e5d5 100644
--- a/.github/fetch_sdl_vc.ps1
+++ b/.github/fetch_sdl_vc.ps1
@@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop"
$project_root = "$psScriptRoot\.."
Write-Output "project_root: $project_root"
-$sdl2_version = "2.0.0"
+$sdl2_version = "2.0.4"
$sdl2_zip = "SDL2-devel-$($sdl2_version)-VC.zip"
$sdl2_url = "https://www.libsdl.org/release/$($sdl2_zip)"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19890b7..8a7ec88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
set(MAJOR_VERSION 2)
set(MINOR_VERSION 1)
set(MICRO_VERSION 0)
-set(SDL_REQUIRED_VERSION 2.0.0)
+set(SDL_REQUIRED_VERSION 2.0.4)
set(DYLIB_COMPATIBILITY_VERSION "1")
diff --git a/configure b/configure
index b594754..17e484c 100755
--- a/configure
+++ b/configure
@@ -12805,7 +12805,7 @@ else
fi
-SDL_VERSION=2.0.0
+SDL_VERSION=2.0.4
diff --git a/configure.ac b/configure.ac
index 62ff48d..a63cd6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,7 @@ AC_ARG_ENABLE([examples],
AM_CONDITIONAL(ENABLE_EXAMPLES, [test x$enable_examples = xyes])
dnl Check for SDL
-SDL_VERSION=2.0.0
+SDL_VERSION=2.0.4
AC_SUBST(SDL_VERSION)
AM_PATH_SDL2($SDL_VERSION,
:,
diff --git a/test-versioning.sh b/test-versioning.sh
index a6b99e9..55c6c78 100755
--- a/test-versioning.sh
+++ b/test-versioning.sh
@@ -164,6 +164,8 @@ else
not_ok "CMakeLists.txt DYLIB_COMPATIBILITY_VERSION is inconsistent"
fi
+sdl_req=$(sed -ne 's/\$sdl2_version = "\([0-9.]*\)"$/\1/p' .github/fetch_sdl_vc.ps1)
+
if [ "$ref_sdl_req" = "$sdl_req" ]; then
ok ".github/fetch_sdl_vc.ps1 $sdl_req"
else