From 16ad8c531e161cb3fc07369d824cfa75f051ae71 Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Sun, 21 Aug 2022 16:07:51 -0700
Subject: [PATCH] Update to SDL 2.24.0

This updates all references to SDL 2.0.22 to SDL 2.24.0, including the
Docker container that I maintain for Linux CI.

Be warned, this release of SDL updates the versioning scheme to be less
dumb. The previous version is 2.0.22, this release is 2.24.0 (so the
last number can be properly used for patch-level version releases).
---
 .github/workflows/ci.yml   |  2 +-
 desktop_version/Dockerfile | 10 +++++-----
 desktop_version/README.md  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6383e10b..4743067f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
     name: Build (CentOS 7)
 
     runs-on: ubuntu-latest
-    container: ghcr.io/infoteddy/vvvvvv-build@sha256:2965b59331026ce108836e5226cfda5e08a8c8440156b58944dff0fe5cf93f94
+    container: ghcr.io/infoteddy/vvvvvv-build@sha256:50a2f769db3ca180286e9a76c1bf06b7016544a78e1fc7a9a0cc1144c675ced1
 
     env:
       CXXFLAGS: -I/usr/local/include/SDL2
diff --git a/desktop_version/Dockerfile b/desktop_version/Dockerfile
index 788ddae5..1c408f78 100644
--- a/desktop_version/Dockerfile
+++ b/desktop_version/Dockerfile
@@ -2,9 +2,9 @@ FROM centos:7
 
 # run first to improve caching (other things update more often than SDL2)
 WORKDIR /tmp
-RUN curl -LJO https://github.com/libsdl-org/SDL/releases/download/release-2.0.22/SDL2-2.0.22.tar.gz
-RUN tar -xf SDL2-2.0.22.tar.gz
-RUN mkdir SDL2-2.0.22/build
+RUN curl -LJO https://github.com/libsdl-org/SDL/releases/download/release-2.24.0/SDL2-2.24.0.tar.gz
+RUN tar -xf SDL2-2.24.0.tar.gz
+RUN mkdir SDL2-2.24.0/build
 
 # add EPEL (for SDL2)
 RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
@@ -20,12 +20,12 @@ RUN yum-builddep -y SDL2
 
 RUN yum clean all
 
-WORKDIR /tmp/SDL2-2.0.22/build
+WORKDIR /tmp/SDL2-2.24.0/build
 RUN ../configure
 RUN make -j $(nproc)
 RUN make install
 
 WORKDIR /tmp
-RUN rm -rf SDL2-2.0.22.tar.gz SDL2-2.0.22/
+RUN rm -rf SDL2-2.24.0.tar.gz SDL2-2.24.0/
 
 WORKDIR /
diff --git a/desktop_version/README.md b/desktop_version/README.md
index a8f79e68..799d02f7 100644
--- a/desktop_version/README.md
+++ b/desktop_version/README.md
@@ -6,7 +6,7 @@ VVVVVV's official desktop versions are built with the following environments:
 - macOS: Xcode CLT, currently targeting 10.9 SDK
 - GNU/Linux: CentOS 7
 
-The engine depends solely on [SDL2](https://libsdl.org/) 2.0.22+. All other dependencies
+The engine depends solely on [SDL2](https://libsdl.org/) 2.24.0+. All other dependencies
 are statically linked into the engine. The development libraries for Windows can
 be downloaded from SDL's website, Linux developers can find the dev libraries from their
 respective repositories, and macOS developers should compile and install from source.
@@ -23,7 +23,7 @@ To generate the projects on Windows:
 # Put your SDL2 folders somewhere nice!
 mkdir flibitBuild
 cd flibitBuild
-cmake -A Win32 -G "Visual Studio 10 2010" .. -DSDL2_INCLUDE_DIRS="C:\SDL2-2.0.22\include" -DSDL2_LIBRARIES="C:\SDL2-2.0.22\lib\x86\SDL2;C:\SDL2-2.0.22\lib\x86\SDL2main"
+cmake -A Win32 -G "Visual Studio 10 2010" .. -DSDL2_INCLUDE_DIRS="C:\SDL2-2.24.0\include" -DSDL2_LIBRARIES="C:\SDL2-2.24.0\lib\x86\SDL2;C:\SDL2-2.24.0\lib\x86\SDL2main"
 ```
 
 Note that on some systems, the `SDL2_LIBRARIES` list on Windows may need