Merge pull request #36 from GPUCode/master

linux: Provide glslang from PPA

linux-fresh/Dockerfile

@@ -8,6 +8,7 @@ RUN apt-get update && apt-get -y full-upgrade
 RUN apt-get install -y \
     p7zip-full \
     build-essential \
+    software-properties-common \
     libsdl2-dev \
     qtbase5-dev \
     qtbase5-private-dev \
@@ -24,5 +25,10 @@ RUN apt-get install -y \
     ccache \
     cmake \
     ninja-build \
+    && \
+# Install updated version of glslang
+    add-apt-repository -y ppa:savoury1/ffmpeg4 && \
+    apt-get update -y && \
+    apt-get install --no-install-recommends -y \
     glslang-dev \
     glslang-tools

linux-frozen/Dockerfile

@@ -3,7 +3,23 @@ LABEL maintainer="citraemu"
 ENV DEBIAN_FRONTEND=noninteractive
 RUN mkdir -p /tmp/pkgs
 COPY install_package.py /tmp/pkgs
-RUN apt-get update && apt-get install -y p7zip-full build-essential wget git python3-launchpadlib glslang-dev glslang-tools ccache ninja-build
+RUN apt-get update && apt-get install -y \
+    p7zip-full \
+    build-essential \
+    software-properties-common \
+    wget \
+    git \
+    python3-launchpadlib \
+    ccache \
+    ninja-build \
+    && \
+# Install updated version of glslang
+    add-apt-repository -y ppa:savoury1/ffmpeg4 && \
+    apt-get update -y && \
+    apt-get install --no-install-recommends -y \
+    glslang-dev \
+    glslang-tools
+
 RUN cd /tmp/pkgs && python3 install_package.py \
     libsdl2-dev 2.0.20+dfsg-2build1 jammy      \
     qtbase5-dev 5.15.3+dfsg-2 jammy            \