From b4cfa920584900e2315656449dddff9a576ad5f6 Mon Sep 17 00:00:00 2001
From: vsonnier <vsonnier@users.noreply.github.com>
Date: Thu, 27 Jun 2024 22:09:45 +0200
Subject: [PATCH] Fix #699 : Updated Clang Format to 17, update SDL Dovcker
 image to 2.30.4, Vulkan to 1.3.275

---
 Packaging/AppImage/docker/Dockerfile | 12 ++++++------
 format.sh                            |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Packaging/AppImage/docker/Dockerfile b/Packaging/AppImage/docker/Dockerfile
index 96c3774aa..3800f11e8 100644
--- a/Packaging/AppImage/docker/Dockerfile
+++ b/Packaging/AppImage/docker/Dockerfile
@@ -1,10 +1,10 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
  && apt-get install -y apt-transport-https ca-certificates wget gnupg apt-utils \
  && wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key add - \
- && wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.268-focal.list https://packages.lunarg.com/vulkan/1.3.268/lunarg-vulkan-1.3.268-focal.list \
+ && wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.275-focal.list https://packages.lunarg.com/vulkan/1.3.275/lunarg-vulkan-1.3.275-focal.list \
  && apt-get update \
  && apt-get install -y \
 	build-essential \
@@ -39,10 +39,10 @@ RUN apt-get update \
  && rm -rf /var/lib/apt/lists/*
 
 RUN cd /tmp \
- && wget https://www.libsdl.org/release/SDL2-2.28.5.tar.gz \
- && tar -xzf SDL2-2.28.5.tar.gz \
- && rm SDL2-2.28.5.tar.gz \
- && cd /tmp/SDL2-2.28.5 \
+ && wget https://www.libsdl.org/release/SDL2-2.30.4.tar.gz \
+ && tar -xzf SDL2-2.30.4.tar.gz \
+ && rm SDL2-2.30.4.tar.gz \
+ && cd /tmp/SDL2-2.30.4 \
  && ./configure \
  && make -j \
  && make install
diff --git a/format.sh b/format.sh
index a2cdb12f7..58ffc3f43 100755
--- a/format.sh
+++ b/format.sh
@@ -1,2 +1,2 @@
 #/bin/sh
-docker run --user $(id -u):$(id -g) -v `pwd`:`pwd` -w `pwd` -i --rm ghcr.io/jidicula/clang-format:15 -i Quake/*.c Quake/*.h Shaders/*.frag Shaders/*.vert Shaders/*.comp Shaders/*.inc Shaders/*.c Shaders/*.h
+docker run --user $(id -u):$(id -g) -v `pwd`:`pwd` -w `pwd` -i --rm ghcr.io/jidicula/clang-format:17 -i Quake/*.c Quake/*.h Shaders/*.frag Shaders/*.vert Shaders/*.comp Shaders/*.inc Shaders/*.c Shaders/*.h