From bc8a48947364620ebf43f401fc4d263d4d326617 Mon Sep 17 00:00:00 2001 From: lat9nq Date: Wed, 18 May 2022 20:40:11 -0400 Subject: [PATCH] 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. --- linux-fresh/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/linux-fresh/Dockerfile b/linux-fresh/Dockerfile index bbffba6..2a7a748 100644 --- a/linux-fresh/Dockerfile +++ b/linux-fresh/Dockerfile @@ -40,8 +40,9 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \ pip3 install conan && \ # 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:savoury1/ffmpeg4 && \ + add-apt-repository -y ppa:savoury1/graphics && \ 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:git-core/ppa && \ apt-get update -y && \ @@ -49,11 +50,8 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \ g++-${GCC_VER} \ gcc-${GCC_VER} \ git \ - libavcodec-dev \ - libavutil-dev \ - libswscale-dev \ - glslang-tools \ glslang-dev \ + glslang-tools \ libhidapi-dev \ qt${QT_PKG_VER}base \ qt${QT_PKG_VER}tools \