appimage: Update glslang (#47)

This commit is contained in:
GPUCode 2023-05-08 22:12:22 +03:00 committed by GitHub
parent a8238c2b9b
commit 8594403ed1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions

View File

@ -1,5 +1,6 @@
FROM debian:bullseye-backports FROM debian:bullseye-backports
LABEL maintainer="citraemu" LABEL maintainer="citraemu"
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
# Create a user account citra (UID 1027) that the container will run as # 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 \ cmake \
p7zip-full \ p7zip-full \
wget \ wget \
unzip \
git \ git \
ccache \ ccache \
ninja-build \ ninja-build \
@ -51,6 +53,13 @@ RUN apt-get install -y -t bullseye-backports \
glslang-tools \ glslang-tools \
file 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 # 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/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 RUN wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage

View File

@ -2,6 +2,6 @@ FROM ubuntu:22.04
LABEL maintainer="citraemu" LABEL maintainer="citraemu"
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y full-upgrade 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 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 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

View File

@ -43,6 +43,7 @@ RUN useradd -m -u 1027 -s /bin/bash citra && mkdir -p /tmp/pkgs && \
mingw-w64-winpthreads \ mingw-w64-winpthreads \
mingw-w64-zlib \ mingw-w64-zlib \
mingw-w64-zstd \ mingw-w64-zstd \
mingw-w64-glslang \
&& \ && \
pacman -Scc --noconfirm && \ pacman -Scc --noconfirm && \
rm -rf /usr/share/man/ /tmp/* /var/tmp/ /usr/{i686-w64-mingw32,lib32} /usr/lib/gcc/i686-w64-mingw32 && \ rm -rf /usr/share/man/ /tmp/* /var/tmp/ /usr/{i686-w64-mingw32,lib32} /usr/lib/gcc/i686-w64-mingw32 && \