Update build container and scripts

Author: giomba

Dockerfile

@@ -1,12 +1,33 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update && apt upgrade -y
-RUN apt install -y git cmake gcc g++ clang-tidy clang-format libsdl2-dev libsdl2-mixer-dev
-RUN apt install -y meson ninja-build libffi-dev libgit2-dev
+RUN apt install -y build-essential git cmake clang-tidy clang-format wget
 RUN apt install -y doxygen sphinx python3-breathe
+RUN apt install -y libcriterion-dev
 
-RUN git clone https://github.com/Snaipe/Criterion.git && cd Criterion && git checkout master && meson build && meson install -C build
+RUN mkdir -p /build
+
+RUN apt install -y pkg-config ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
+    libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
+    libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
+    libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
+    libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev
+RUN cd /build && \
+    wget https://github.com/libsdl-org/SDL/releases/download/release-3.4.2/SDL3-3.4.2.tar.gz -O SDL.tar.gz && \
+    tar xf SDL.tar.gz && \
+    cd SDL3-3.4.2 && \
+    cmake -B build -DSDL_X11_XTEST=OFF && \
+    make -C build -j && \
+    make -C build install
+
+RUN cd /build && \
+    wget https://github.com/libsdl-org/SDL_mixer/archive/refs/tags/release-3.2.0.tar.gz && \
+    tar xf release-3.2.0.tar.gz && \
+    cd SDL_mixer-release-3.2.0 && \
+    cmake -B build && \
+    make -C build -j && \
+    make -C build install
 
 RUN useradd -s /bin/bash --create-home builder
 USER builder

script/docker

@@ -8,9 +8,9 @@ set -euo pipefail
 
 cd "$(dirname "$0")/.."
 
-docker run --rm -ti -u builder \
-    -v "$(pwd)":/home/builder/workspace \
+docker run --rm -ti -u ubuntu \
+    -v "$(pwd)":/home/ubuntu/workspace \
     -v /tmp:/tmp \
-    -w /home/builder/workspace \
-    giomba/ceda-cemu-builder:2 \
+    -w /home/ubuntu/workspace \
+    giomba/ceda-cemu-builder:3 \
     "$@"