From 3b617b54ca6733b42228bf8fde09434378c20542 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Thu, 16 Feb 2023 22:54:57 -0800
Subject: [PATCH] chore: Rebase on pr-44 and remove now unneeded H/W
 accelerated video decoding install step.

---
 Containerfile         | 22 +---------------------
 Containerfile-desktop | 21 +--------------------
 2 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/Containerfile b/Containerfile
index 468a8b44..7a4e6344 100644
--- a/Containerfile
+++ b/Containerfile
@@ -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 && \
diff --git a/Containerfile-desktop b/Containerfile-desktop
index eb5c1337..8a63f0e2 100644
--- a/Containerfile-desktop
+++ b/Containerfile-desktop
@@ -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 && \