From 4092a1584d3407765daf6137bb1c2964f1eb54df Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Mon, 16 Oct 2023 23:51:00 -0700
Subject: [PATCH] feat: Include vulkan-tools and clinfo in all images fix:
 Install vkcapture, glcapture, vkbsalt, and mangohud with explicit arch

---
 Containerfile | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/Containerfile b/Containerfile
index 7afeeb52..0b4209b4 100644
--- a/Containerfile
+++ b/Containerfile
@@ -82,9 +82,12 @@ RUN rpm-ostree install \
     input-remapper \
     system76-scheduler \
     hl2linux-selinux \
-    libobs_glcapture \
-    libobs_vkcapture \
-    obs-vkcapture \
+    libobs_glcapture.x86_64 \
+    libobs_glcapture.i686 \
+    libobs_vkcapture.x86_64 \
+    libobs_vkcapture.i686 \
+    obs-vkcapture.x86_64 \
+    obs-vkcapture.i686 \
     ladspa-caps-plugins \
     ladspa-noise-suppression-for-voice \
     tailscale \
@@ -100,6 +103,7 @@ RUN rpm-ostree install \
     lzip \
     libxcrypt-compat \
     mesa-libGLU \
+    vulkan-tools \
     twitter-twemoji-fonts \
     lato-fonts \
     fira-code-fonts && \
@@ -199,6 +203,7 @@ RUN if grep -qv "nvidia" <<< "${IMAGE_NAME}"; then \
     rpm-ostree install \
         rocm-hip \
         rocm-opencl \
+        rocm-clinfo \
         waydroid \
         weston && \
     sed -i~ -E 's/=.\$\(command -v (nft|ip6?tables-legacy).*/=/g' /usr/lib/waydroid/data/scripts/waydroid-net.sh \
@@ -231,6 +236,7 @@ RUN if grep -qv "nvidia" <<< "${IMAGE_NAME}"; then \
         libdbusmenu-gtk3.i686 \
         libatomic.i686 \
         pipewire-alsa.i686 && \
+        clinfo \
     sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree-steam.repo && \
     sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree.repo && \
     sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo && \
@@ -249,9 +255,10 @@ RUN if grep -qv "nvidia" <<< "${IMAGE_NAME}"; then \
         winetricks \
         protontricks \
         latencyflex-vulkan-layer \
-        vkBasalt \
-        mangohud \
-        vulkan-tools \
+        vkBasalt.x86_64 \
+        vkBasalt.i686 \
+        mangohud.x86_64 \
+        mangohud.i686 \
 ; fi
 
 # Cleanup & Finalize
@@ -386,7 +393,6 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
 # Dock updater - done manually due to proprietary parts preventing it from being on Copr
 # Neptune firmware - done manually due to "TBD" license on needed audio firmware
 RUN rpm-ostree install \
-    vulkan-tools \
     jupiter-fan-control \
     jupiter-hw-support-btrfs \
     powerbuttond \
@@ -396,8 +402,10 @@ RUN rpm-ostree install \
     steam_notif_daemon \
     ryzenadj \
     latencyflex-vulkan-layer \
-    vkBasalt \
-    mangohud \
+    vkBasalt.x86_64 \
+    vkBasalt.i686 \
+    mangohud.x86_64 \
+    mangohud.i686 \
     sdgyrodsu \
     sddm-sugar-steamOS \
     ibus-pinyin \