chore(ci): Various build fixes

chore: Update version of flatpak and hardware setup scripts

Containerfile

@@ -181,25 +181,33 @@ RUN rpm-ostree override replace \
     --from repo=updates \
         libmount \
         || true && \
+    rpm-ostree override replace \
+    --experimental \
+    --from repo=updates \
+        cups-libs \
+        || true && \
     rpm-ostree override remove \
         glibc32 \
         || true
 
 # Install Valve's patched Mesa
 # Install patched switcheroo control with proper discrete GPU support
-RUN rpm-ostree override replace \
+RUN rpm-ostree override remove \
+        mesa-va-drivers-freeworld && \
+    rpm-ostree override replace \
     --experimental \
     --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \
         mesa-filesystem \
-        mesa-dri-drivers \
-        mesa-libEGL \
-        mesa-libgbm \
-        mesa-libGL \
+        mesa-libxatracker \
         mesa-libglapi \
+        mesa-dri-drivers \
+        mesa-libgbm \
+        mesa-libEGL \
         mesa-vulkan-drivers \
-        mesa-libOSMesa \
+        mesa-libGL \
         xorg-x11-server-Xwayland && \
     rpm-ostree install \
+        mesa-va-drivers-freeworld \
         mesa-vdpau-drivers-freeworld.x86_64 && \
     rpm-ostree override replace \
     --experimental \
@@ -367,8 +375,10 @@ RUN rpm-ostree install \
             gamemode \
     ; else \
         rpm-ostree override remove \
-            gamemode \
+            gamemode && \
+        rpm-ostree override remove \
             gnome-shell-extension-gamemode \
+            || true \
     ; fi && \
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/winetricks.desktop && \
     ln -s /usr/bin/wine64 /usr/bin/wine && \

system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager

@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 
 # SCRIPT VERSION
-VER=19
+VER=20
 VER_FILE="/etc/bazzite/flatpak_manager_version"
 VER_RAN=$(cat $VER_FILE)
 IMAGE_INFO="/usr/share/ublue-os/image-info.json"

system_files/desktop/shared/usr/libexec/bazzite-hardware-setup

@@ -7,7 +7,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO)
 FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO)
 
 # SCRIPT VERSION
-HWS_VER=34
+HWS_VER=35
 HWS_VER_FILE="/etc/bazzite/hws_version"
 HWS_VER_RAN=$(cat $HWS_VER_FILE)