chore: Rebase on pr-44 and remove now unneeded H/W accelerated video decoding install step.

This commit is contained in:
Kyle Gospodnetich 2023-02-16 22:54:57 -08:00
parent 9ec1dd2368
commit 3b617b54ca
2 changed files with 2 additions and 41 deletions

View File

@ -1,4 +1,4 @@
FROM ghcr.io/ublue-os/kinoite-nvidia:latest
FROM ghcr.io/ublue-os/kinoite-nvidia:pr-44
COPY etc /etc
COPY usr /usr
@ -45,26 +45,6 @@ RUN git clone https://github.com/KyleGospo/jupiter-dock-updater-bin.git && \
# Remove unneeded packages
RUN rpm-ostree override remove toolbox
# Install mesa freeworld components and ffmpeg for hardware accelerated video decode
RUN rpm-ostree override remove \
mesa-va-drivers \
libavutil-free \
libswscale-free \
libswresample-free \
libavformat-free \
libavcodec-free \
libavfilter-free \
libavdevice-free \
libpostproc-free \
--install=mesa-va-drivers-freeworld.x86_64 \
--install=mesa-va-drivers-freeworld.i686 \
--install=mesa-vdpau-drivers-freeworld \
--install=libva-intel-driver \
--install=nvidia-vaapi-driver \
--install=ffmpeg-libs \
--install=ffmpeg \
--install=libavcodec-freeworld
# Cleanup & Finalize
RUN sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree{,-updates}.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-free{,-updates}.repo && \

View File

@ -1,4 +1,4 @@
FROM ghcr.io/ublue-os/kinoite-nvidia:pr-43
FROM ghcr.io/ublue-os/kinoite-nvidia:pr-44
COPY etc-desktop /etc
COPY usr-desktop /usr
@ -28,25 +28,6 @@ RUN rpm-ostree install \
# Remove unneeded packages
RUN rpm-ostree override remove toolbox
# Install mesa freeworld components and ffmpeg for hardware accelerated video decode
RUN rpm-ostree override remove \
mesa-va-drivers \
libavutil-free \
libswscale-free \
libswresample-free \
libavformat-free \
libavcodec-free \
libavfilter-free \
libavdevice-free \
libpostproc-free \
--install=mesa-va-drivers-freeworld.x86_64 \
--install=mesa-va-drivers-freeworld.i686 \
--install=mesa-vdpau-drivers-freeworld \
--install=libva-intel-driver \
--install=ffmpeg-libs \
--install=ffmpeg \
--install=libavcodec-freeworld
# Cleanup & Finalize
RUN sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree{,-updates}.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-free{,-updates}.repo && \