fresh: Remove savoury1/ffmpeg libraries

We currently don't use these, and they take up quite a bit of space. In
testing, the AppImage wouldn't run with these in use.

Remove them from the installation.

Also fix glslang package name, which was changed.
This commit is contained in:
lat9nq 2022-05-18 20:40:11 -04:00
parent 039cb48fa0
commit bc8a489473

View file

@ -40,8 +40,9 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
pip3 install conan && \ pip3 install conan && \
# Install updated versions of FFmpeg, GCC, Qt, and SDL2 from launchpad repositories # Install updated versions of FFmpeg, GCC, Qt, and SDL2 from launchpad repositories
add-apt-repository -y ppa:beineri/opt-qt-${QT_VER}-${UBUNTU_VER} && \ add-apt-repository -y ppa:beineri/opt-qt-${QT_VER}-${UBUNTU_VER} && \
add-apt-repository -y ppa:savoury1/ffmpeg4 && \ add-apt-repository -y ppa:savoury1/graphics && \
add-apt-repository -y ppa:savoury1/multimedia && \ add-apt-repository -y ppa:savoury1/multimedia && \
add-apt-repository -y ppa:savoury1/ffmpeg4 && \
add-apt-repository -y ppa:ubuntu-toolchain-r/test && \ add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
add-apt-repository -y ppa:git-core/ppa && \ add-apt-repository -y ppa:git-core/ppa && \
apt-get update -y && \ apt-get update -y && \
@ -49,11 +50,8 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
g++-${GCC_VER} \ g++-${GCC_VER} \
gcc-${GCC_VER} \ gcc-${GCC_VER} \
git \ git \
libavcodec-dev \
libavutil-dev \
libswscale-dev \
glslang-tools \
glslang-dev \ glslang-dev \
glslang-tools \
libhidapi-dev \ libhidapi-dev \
qt${QT_PKG_VER}base \ qt${QT_PKG_VER}base \
qt${QT_PKG_VER}tools \ qt${QT_PKG_VER}tools \