From 8594403ed1d0a83b59cbe445ebd5ec71fad642b8 Mon Sep 17 00:00:00 2001 From: GPUCode <47210458+GPUCode@users.noreply.github.com> Date: Mon, 8 May 2023 22:12:22 +0300 Subject: [PATCH] appimage: Update glslang (#47) --- linux-appimage/Dockerfile | 9 +++++++++ linux-flatpak/Dockerfile | 2 +- linux-mingw/Dockerfile | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/linux-appimage/Dockerfile b/linux-appimage/Dockerfile index cd9ea7a..0370e1c 100644 --- a/linux-appimage/Dockerfile +++ b/linux-appimage/Dockerfile @@ -1,5 +1,6 @@ FROM debian:bullseye-backports LABEL maintainer="citraemu" + ENV DEBIAN_FRONTEND=noninteractive # Create a user account citra (UID 1027) that the container will run as @@ -44,6 +45,7 @@ RUN apt-get install -y -t bullseye-backports \ cmake \ p7zip-full \ wget \ + unzip \ git \ ccache \ ninja-build \ @@ -51,6 +53,13 @@ RUN apt-get install -y -t bullseye-backports \ glslang-tools \ file +# Install glslang +RUN cd /tmp +RUN wget https://github.com/KhronosGroup/glslang/releases/download/main-tot/glslang-main-linux-Release.zip +RUN unzip glslang-main-linux-Release.zip -d glslang +RUN cp -rv glslang/* /usr +run rm -rf glslang-* + # Download tools for building AppImages RUN wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage RUN wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage diff --git a/linux-flatpak/Dockerfile b/linux-flatpak/Dockerfile index 2e09d5e..775f285 100644 --- a/linux-flatpak/Dockerfile +++ b/linux-flatpak/Dockerfile @@ -2,6 +2,6 @@ FROM ubuntu:22.04 LABEL maintainer="citraemu" ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get -y full-upgrade -RUN apt-get install -y p7zip-full wget git flatpak flatpak-builder ca-certificates sshfs curl dnsutils gnupg2 sudo +RUN apt-get install -y p7zip-full wget git flatpak flatpak-builder glslang-dev glslang-tools ca-certificates sshfs curl dnsutils gnupg2 sudo RUN flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo RUN flatpak install -y flathub org.kde.Platform//5.15-22.08 org.kde.Sdk//5.15-22.08 org.kde.Platform//6.4 org.kde.Sdk//6.4 diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index 2898d06..05ff1d7 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -43,6 +43,7 @@ RUN useradd -m -u 1027 -s /bin/bash citra && mkdir -p /tmp/pkgs && \ mingw-w64-winpthreads \ mingw-w64-zlib \ mingw-w64-zstd \ + mingw-w64-glslang \ && \ pacman -Scc --noconfirm && \ rm -rf /usr/share/man/ /tmp/* /var/tmp/ /usr/{i686-w64-mingw32,lib32} /usr/lib/gcc/i686-w64-mingw32 && \