From 637ebb89f9d972b404315ef32852da2e6d5db393 Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Tue, 16 Jan 2024 18:11:56 +0100 Subject: [PATCH] move libheif-freeworld to base image to avoid potential package conflicts in the weekly image. --- Dockerfile | 4 ++-- base.Dockerfile | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 687fa23..cdc6c2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,8 +57,8 @@ RUN wget https://download.live.ledger.com/latest/linux -O /usr/bin/ledgerlive && # Install AppImageLauncher RUN rpm-ostree install https://github.com/TheAssassin/AppImageLauncher/releases/download/continuous/appimagelauncher-2.2.0-gha111.d9d4c73.x86_64.rpm -# Install Gwenview and kimageformats for full support for image formats such as HEIC -RUN rpm-ostree install gwenview libheif-freeworld +# Install Gwenview on host for full support for image formats such as HEIC +RUN rpm-ostree install gwenview # Copy config files COPY etc /etc diff --git a/base.Dockerfile b/base.Dockerfile index eda4c1c..39dc2aa 100644 --- a/base.Dockerfile +++ b/base.Dockerfile @@ -19,9 +19,13 @@ RUN rpm-ostree install https://download1.rpmfusion.org/free/fedora/rpmfusion-fre # 32-bit dependencies for the Nvidia driver. RUN rpm-ostree install glibc.i686 + # install nonfree codecs RUN rpm-ostree override remove libavcodec-free libavfilter-free libavformat-free libavutil-free libpostproc-free libswresample-free libswscale-free --install libavcodec-freeworld +# Install HEIC support for Gwenview and Dolphin (and potentially other applications) +RUN rpm-ostree install libheif-freeworld + # Mesa clang RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:trixieua:mesa-clang mesa-filesystem mesa-libglapi mesa-dri-drivers mesa-libgbm mesa-libEGL mesa-libGL mesa-vulkan-drivers mesa-libxatracker mesa-vdpau-drivers mesa-libOSMesa mesa-libOpenCL mesa-va-drivers