From f1595808afbb5bb4a592188d188143df56d9942e Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 1 Oct 2024 15:20:06 -0700 Subject: [PATCH 01/28] Revert "chore: Add Hori environment variable for HHD" This reverts commit a559aeec48c64102215a000c5a1a85f453846532. --- .../shared/usr/lib/systemd/system/hhd@.service.d/override.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/system_files/deck/shared/usr/lib/systemd/system/hhd@.service.d/override.conf b/system_files/deck/shared/usr/lib/systemd/system/hhd@.service.d/override.conf index 0f761302..53133c05 100644 --- a/system_files/deck/shared/usr/lib/systemd/system/hhd@.service.d/override.conf +++ b/system_files/deck/shared/usr/lib/systemd/system/hhd@.service.d/override.conf @@ -1,4 +1,3 @@ [Service] Environment="HHD_PPD_MASK=1" Environment="HHD_ALLY_POWERSAVE=1" -Environment="HHD_HORI_STEAM=1" From 31aab7618c22fa3250ed5fcfa1c506f009a21f92 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 1 Oct 2024 15:22:26 -0700 Subject: [PATCH 02/28] Revert "chore: Update to kernel 6.9.12-208" This reverts commit 6ee8d9808789412318055c8d528f6a6b4515e9b4. --- .github/workflows/build.yml | 2 +- Containerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5cdcbd55..18d682db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: is_latest_version: true is_stable_version: true kernel_flavor: fsync-ba # must match a kernel_flavor from akmods repo - kernel_version: 6.9.12-208.fsync.fc40.x86_64 # must match a cached version of the above flavor + kernel_version: 6.9.12-207.fsync.fc40.x86_64 # must match a cached version of the above flavor exclude: - base_name: bazzite target_nvidia_flavor: nvidia diff --git a/Containerfile b/Containerfile index 75c781da..37e65d20 100644 --- a/Containerfile +++ b/Containerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE_FLAVOR="${BASE_IMAGE_FLAVOR:-main}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG NVIDIA_FLAVOR=${NVIDIA_FLAVOR:-nvidia}"" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}" -ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-8.fsync.fc40.x86_64}" +ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-207.fsync.fc40.x86_64}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$BASE_IMAGE_FLAVOR}" ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}" @@ -24,7 +24,7 @@ ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG NVIDIA_FLAVOR=${NVIDIA_FLAVOR:-nvidia}"" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}" -ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-208.fsync.fc40.x86_64}" +ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-207.fsync.fc40.x86_64}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}" @@ -938,7 +938,7 @@ ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}" ARG NVIDIA_FLAVOR=${NVIDIA_FLAVOR:-nvidia}"" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}" -ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-208.fsync.fc40.x86_64}" +ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-207.fsync.fc40.x86_64}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}" From fdde27f58e6f4988625cc26606fbcf7c3aac03fa Mon Sep 17 00:00:00 2001 From: Aarron Lee Date: Thu, 3 Oct 2024 10:28:47 -0400 Subject: [PATCH 03/28] chore: add warning text for invalid args to bazzite-rollback-helper (#1705) Co-authored-by: Aarron Lee --- system_files/desktop/shared/usr/bin/bazzite-rollback-helper | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system_files/desktop/shared/usr/bin/bazzite-rollback-helper b/system_files/desktop/shared/usr/bin/bazzite-rollback-helper index 493f962e..e07ccfa1 100755 --- a/system_files/desktop/shared/usr/bin/bazzite-rollback-helper +++ b/system_files/desktop/shared/usr/bin/bazzite-rollback-helper @@ -86,4 +86,7 @@ EOF # display the helptext elif [[ "$1" == "-h" || "$1" == "--h" || "$1" == "-help" || "$1" == "--help" || "$1" == "help" || -z "$1" ]]; then echo "$helptext" +else + echo "Unsupported Option: $1" + echo "run 'bazzite-rollback-helper help' for more details" fi From 3874ec20bf4378793c92ccc4f76b54c22c018664 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Thu, 3 Oct 2024 07:30:37 -0700 Subject: [PATCH 04/28] feat(bazzite-cli): add trash-cli (#1713) Adds https://github.com/andreafrancia/trash-cli Recommended for new CLI users so they don't accidentally shoot themselves in the foot. Don't alias this. --- .../overrides/usr/share/ublue-os/homebrew/bazzite-cli.Brewfile | 1 + 1 file changed, 1 insertion(+) diff --git a/system_files/overrides/usr/share/ublue-os/homebrew/bazzite-cli.Brewfile b/system_files/overrides/usr/share/ublue-os/homebrew/bazzite-cli.Brewfile index 8cad6f00..efef9f39 100644 --- a/system_files/overrides/usr/share/ublue-os/homebrew/bazzite-cli.Brewfile +++ b/system_files/overrides/usr/share/ublue-os/homebrew/bazzite-cli.Brewfile @@ -7,6 +7,7 @@ brew "gh" brew "glab" brew "rg" brew "tealdeer" +brew "trash-cli" brew "ugrep" brew "yq" brew "zoxide" From 6aa08938db78f1c7e19b50c40e4a8517c38effae Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 09:19:01 -0700 Subject: [PATCH 05/28] Reapply "chore: Add Hori environment variable for HHD" This reverts commit f1595808afbb5bb4a592188d188143df56d9942e. --- .github/workflows/build.yml | 2 +- Containerfile | 6 +++--- .../usr/lib/systemd/system/hhd@.service.d/override.conf | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18d682db..5cdcbd55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: is_latest_version: true is_stable_version: true kernel_flavor: fsync-ba # must match a kernel_flavor from akmods repo - kernel_version: 6.9.12-207.fsync.fc40.x86_64 # must match a cached version of the above flavor + kernel_version: 6.9.12-208.fsync.fc40.x86_64 # must match a cached version of the above flavor exclude: - base_name: bazzite target_nvidia_flavor: nvidia diff --git a/Containerfile b/Containerfile index 37e65d20..75c781da 100644 --- a/Containerfile +++ b/Containerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE_FLAVOR="${BASE_IMAGE_FLAVOR:-main}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG NVIDIA_FLAVOR=${NVIDIA_FLAVOR:-nvidia}"" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}" -ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-207.fsync.fc40.x86_64}" +ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-8.fsync.fc40.x86_64}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$BASE_IMAGE_FLAVOR}" ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}" @@ -24,7 +24,7 @@ ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG NVIDIA_FLAVOR=${NVIDIA_FLAVOR:-nvidia}"" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}" -ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-207.fsync.fc40.x86_64}" +ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-208.fsync.fc40.x86_64}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}" @@ -938,7 +938,7 @@ ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}" ARG NVIDIA_FLAVOR=${NVIDIA_FLAVOR:-nvidia}"" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}" -ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-207.fsync.fc40.x86_64}" +ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-208.fsync.fc40.x86_64}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}" diff --git a/system_files/deck/shared/usr/lib/systemd/system/hhd@.service.d/override.conf b/system_files/deck/shared/usr/lib/systemd/system/hhd@.service.d/override.conf index 53133c05..0f761302 100644 --- a/system_files/deck/shared/usr/lib/systemd/system/hhd@.service.d/override.conf +++ b/system_files/deck/shared/usr/lib/systemd/system/hhd@.service.d/override.conf @@ -1,3 +1,4 @@ [Service] Environment="HHD_PPD_MASK=1" Environment="HHD_ALLY_POWERSAVE=1" +Environment="HHD_HORI_STEAM=1" From dc5e6d79643902e7f786ef5dfae3b2ad25cad980 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 09:55:21 -0700 Subject: [PATCH 06/28] chore: Restore rpmfusion after upstream changes --- Containerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 75c781da..6a61e45c 100644 --- a/Containerfile +++ b/Containerfile @@ -215,6 +215,10 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ curl -Lo /etc/yum.repos.d/_copr_rodoma92-kde-cdemu-manager.repo https://copr.fedorainfracloud.org/coprs/rodoma92/kde-cdemu-manager/repo/fedora-"${FEDORA_MAJOR_VERSION}"/rodoma92-kde-cdemu-manager-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ curl -Lo /etc/yum.repos.d/_copr_rodoma92-rmlint.repo https://copr.fedorainfracloud.org/coprs/rodoma92/rmlint/repo/fedora-"${FEDORA_MAJOR_VERSION}"/rodoma92-rmlint-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ curl -Lo /etc/yum.repos.d/tailscale.repo https://pkgs.tailscale.com/stable/fedora/tailscale.repo && \ + curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo && \ + rpm-ostree install \ + https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ + https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \ sed -i 's@gpgcheck=1@gpgcheck=0@g' /etc/yum.repos.d/tailscale.repo && \ /usr/libexec/containerbuild/cleanup.sh && \ ostree container commit @@ -305,7 +309,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ --mount=type=bind,from=akmods,src=/rpms,dst=/tmp/akmods-rpms \ --mount=type=bind,from=akmods-extra,src=/rpms,dst=/tmp/akmods-extra-rpms \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ - curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo && \ rpm-ostree install \ /tmp/akmods-rpms/kmods/*kvmfr*.rpm \ /tmp/akmods-rpms/kmods/*xone*.rpm \ @@ -501,8 +504,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ libatomic.i686 \ pipewire-alsa.i686 \ gobject-introspection \ - clinfo \ - https://kojipkgs.fedoraproject.org//packages/SDL2/2.30.3/1.fc40/i686/SDL2-2.30.3-1.fc40.i686.rpm && \ + clinfo && \ sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/fedora-updates.repo && \ rpm-ostree install \ mesa-vulkan-drivers.i686 \ From 01ffba041da4c69e482ff2e4570f3ff589b409c1 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 10:04:31 -0700 Subject: [PATCH 07/28] chore: Drop freeworld workaround --- Containerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Containerfile b/Containerfile index 6a61e45c..c1290179 100644 --- a/Containerfile +++ b/Containerfile @@ -338,8 +338,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ # Install Valve's patched Mesa, Pipewire, Bluez, and Xwayland # Install patched switcheroo control with proper discrete GPU support RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ - rpm-ostree override remove \ - mesa-va-drivers-freeworld && \ rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \ @@ -366,8 +364,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ bluez-libs \ xorg-x11-server-Xwayland && \ rpm-ostree install \ - mesa-va-drivers-freeworld \ - mesa-vdpau-drivers-freeworld.x86_64 \ libaacs \ libbdplus \ libbluray && \ From 526a4a2380669075294bd07f22a01898c24f7c46 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 10:42:58 -0700 Subject: [PATCH 08/28] chore: Update pipewire to 1.0.8 --- spec_files/pipewire/pipewire.spec | 51 +++++++++++++++++-------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/spec_files/pipewire/pipewire.spec b/spec_files/pipewire/pipewire.spec index 7541461b..58ec5c68 100644 --- a/spec_files/pipewire/pipewire.spec +++ b/spec_files/pipewire/pipewire.spec @@ -1,6 +1,6 @@ %global majorversion 1 %global minorversion 0 -%global microversion 7 +%global microversion 8 %global apiversion 0.3 %global spaversion 0.2 @@ -9,7 +9,7 @@ %global ms_version 0.4.2 # For rpmdev-bumpspec and releng automation -%global baserelease 2 +%global baserelease 1 #global snapdate 20210107 #global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb @@ -44,8 +44,7 @@ %bcond_without jackserver_plugin %bcond_without libmysofa %bcond_without lv2 -#bcond_without roc -%bcond_with roc +%bcond_without roc %endif %if 0%{?rhel} || ("%{_arch}" == "s390x") @@ -424,26 +423,26 @@ cp %{SOURCE1} subprojects/packagefiles/ %build %meson \ - -D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled \ - -D sdl2=disabled \ - -D audiotestsrc=disabled -D videotestsrc=disabled \ - -D volume=disabled -D bluez5-codec-aptx=disabled \ - -D bluez5-codec-lc3plus=disabled -D bluez5-codec-lc3=enabled \ + -D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled \ + -D sdl2=disabled \ + -D audiotestsrc=disabled -D videotestsrc=disabled \ + -D volume=disabled -D bluez5-codec-aptx=disabled \ + -D bluez5-codec-lc3plus=disabled -D bluez5-codec-lc3=enabled \ %ifarch s390x - -D bluez5-codec-ldac=disabled \ + -D bluez5-codec-ldac=disabled \ %endif - -D session-managers=[] \ - -D rtprio-server=60 -D rtprio-client=55 -D rlimits-rtprio=70 \ - %{!?with_jack:-D pipewire-jack=disabled} \ - %{!?with_jackserver_plugin:-D jack=disabled} \ - %{!?with_libcamera_plugin:-D libcamera=disabled} \ - %{?with_jack:-D jack-devel=true} \ - %{!?with_alsa:-D pipewire-alsa=disabled} \ - %{?with_vulkan:-D vulkan=enabled} \ - %{!?with_libmysofa:-D libmysofa=disabled} \ - %{!?with_lv2:-D lv2=disabled} \ - %{!?with_roc:-D roc=disabled} \ - %{!?with_ffado:-D libffado=disabled} \ + -D session-managers=[] \ + -D rtprio-server=60 -D rtprio-client=55 -D rlimits-rtprio=70 \ + %{!?with_jack:-D pipewire-jack=disabled} \ + %{!?with_jackserver_plugin:-D jack=disabled} \ + %{!?with_libcamera_plugin:-D libcamera=disabled} \ + %{?with_jack:-D jack-devel=true} \ + %{!?with_alsa:-D pipewire-alsa=disabled} \ + %{?with_vulkan:-D vulkan=enabled} \ + %{!?with_libmysofa:-D libmysofa=disabled} \ + %{!?with_lv2:-D lv2=disabled} \ + %{!?with_roc:-D roc=disabled} \ + %{!?with_ffado:-D libffado=disabled} \ %{nil} %meson_build @@ -834,15 +833,21 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Thu Sep 19 2024 Wim Taymans - 1.0.8-1 +- Update version to 1.0.8 + * Tue Jun 18 2024 Peter Robinson - 1.0.7-2 - Rebuild for libcamera 0.3 * Fri May 24 2024 Wim Taymans - 1.0.7-1 - Update version to 1.0.7 - + * Thu May 09 2024 Wim Taymans - 1.0.6-1 - Update version to 1.0.6 +* Tue Apr 23 2024 Wim Taymans - 1.0.5-2 +- Enable ROC again + * Mon Apr 15 2024 Wim Taymans - 1.0.5-1 - Update version to 1.0.5 From 5faaebb13cb07e74b075f726353293b924bfa614 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 12:16:24 -0700 Subject: [PATCH 09/28] chore: Add epoch to match Negativo17 chore: Update umu launcher --- Containerfile | 3 +++ spec_files/mesa/mesa.spec | 3 ++- spec_files/umu-launcher/umu-launcher.spec | 10 ++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Containerfile b/Containerfile index c1290179..12b232c8 100644 --- a/Containerfile +++ b/Containerfile @@ -338,6 +338,8 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ # Install Valve's patched Mesa, Pipewire, Bluez, and Xwayland # Install patched switcheroo control with proper discrete GPU support RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ + rpm-ostree override remove \ + mesa-va-drivers && \ rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \ @@ -364,6 +366,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ bluez-libs \ xorg-x11-server-Xwayland && \ rpm-ostree install \ + mesa-va-drivers \ libaacs \ libbdplus \ libbluray && \ diff --git a/spec_files/mesa/mesa.spec b/spec_files/mesa/mesa.spec index a5236e1a..0652ba11 100644 --- a/spec_files/mesa/mesa.spec +++ b/spec_files/mesa/mesa.spec @@ -68,7 +68,8 @@ Name: mesa Summary: Mesa graphics libraries %global ver 24.1.7 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 100.bazzite.{{{ git_dir_version }}} +Epoch: 1 +Release: 1 License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org diff --git a/spec_files/umu-launcher/umu-launcher.spec b/spec_files/umu-launcher/umu-launcher.spec index ff4370aa..eb303bc0 100644 --- a/spec_files/umu-launcher/umu-launcher.spec +++ b/spec_files/umu-launcher/umu-launcher.spec @@ -1,12 +1,13 @@ -%define commit 9b12f90b4e113275b5e8ea33a88674275bf3a1c8 +%define commit 12ebba1bea5006aaa0493d4d9e5d1ba1fe434ac1 +%define tag 1.1.1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global build_timestamp %(date +"%Y%m%d") -%global rel_build 1.%{build_timestamp}.%{shortcommit}%{?dist} +%global rel_build 2.%{build_timestamp}.%{shortcommit}%{?dist} Name: umu-launcher -Version: 1.0 +Version: 1.1.1 Release: %{rel_build} Summary: A tool for launching non-steam games with proton @@ -31,6 +32,7 @@ BuildRequires: python3 Requires: python Requires: python3 Requires: python3-xlib +Requires: python3-filelock %description @@ -39,7 +41,7 @@ Requires: python3-xlib %prep git clone --single-branch --branch main https://github.com/Open-Wine-Components/umu-launcher.git cd umu-launcher -git checkout %{commit} +git checkout %{tag} git submodule update --init --recursive %build From 68dad717651204f0965d3a83d935bc08604a1f6c Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 15:28:33 -0700 Subject: [PATCH 10/28] chore: Disable rpmfusion after installing kmods --- Containerfile | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/Containerfile b/Containerfile index 12b232c8..f34e023b 100644 --- a/Containerfile +++ b/Containerfile @@ -304,7 +304,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ /usr/libexec/containerbuild/cleanup.sh && \ ostree container commit -# Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion +# Add ublue packages RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ --mount=type=bind,from=akmods,src=/rpms,dst=/tmp/akmods-rpms \ --mount=type=bind,from=akmods-extra,src=/rpms,dst=/tmp/akmods-extra-rpms \ @@ -332,6 +332,9 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ fwupd-plugin-flashrom \ fwupd-plugin-modem-manager \ fwupd-plugin-uefi-capsule-data && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree.repo && \ + 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-nonfree-updates-testing.repo && \ /usr/libexec/containerbuild/cleanup.sh && \ ostree container commit @@ -365,11 +368,13 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ bluez-cups \ bluez-libs \ xorg-x11-server-Xwayland && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ rpm-ostree install \ mesa-va-drivers \ libaacs \ libbdplus \ libbluray && \ + sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:sentry:switcheroo-control_discrete \ @@ -503,23 +508,8 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ libatomic.i686 \ pipewire-alsa.i686 \ gobject-introspection \ - clinfo && \ - sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/fedora-updates.repo && \ - rpm-ostree install \ - mesa-vulkan-drivers.i686 \ - mesa-va-drivers-freeworld.i686 \ - mesa-vdpau-drivers-freeworld.i686 && \ - 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 && \ - sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo && \ - rpm-ostree install \ + clinfo \ steam && \ - sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/rpmfusion-nonfree-steam.repo && \ - sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree.repo && \ - sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo && \ - sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo && \ - sed -i '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/fedora-updates.repo && \ rpm-ostree install \ lutris \ umu-launcher \ @@ -532,6 +522,8 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ winetricks \ protontricks \ latencyflex-vulkan-layer \ + mesa-vulkan-drivers.i686 \ + mesa-va-drivers.i686 \ vkBasalt.x86_64 \ vkBasalt.i686 \ obs-vkcapture.x86_64 \ @@ -741,9 +733,6 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_hikariknight-looking-glass-kvmfr.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/tailscale.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/charm.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree.repo && \ - 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-nonfree-updates-testing.repo && \ mkdir -p /etc/flatpak/remotes.d && \ curl -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo && \ systemctl enable tuned.service && \ From 69665fb1124e8fb25db7e990983c3f58eaab1e08 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 15:38:58 -0700 Subject: [PATCH 11/28] chore: Remove mesa-va-drivers workaround --- Containerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Containerfile b/Containerfile index f34e023b..b0e7f606 100644 --- a/Containerfile +++ b/Containerfile @@ -341,8 +341,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ # Install Valve's patched Mesa, Pipewire, Bluez, and Xwayland # Install patched switcheroo control with proper discrete GPU support RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ - rpm-ostree override remove \ - mesa-va-drivers && \ rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \ @@ -370,7 +368,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ xorg-x11-server-Xwayland && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ rpm-ostree install \ - mesa-va-drivers \ libaacs \ libbdplus \ libbluray && \ From cb4cddb168aefbacc05e616df3a05f310e4fe705 Mon Sep 17 00:00:00 2001 From: Renn <8340896+AkazaRenn@users.noreply.github.com> Date: Mon, 7 Oct 2024 19:10:47 -0400 Subject: [PATCH 12/28] fix(deck): Use super + 1/2 for Overlay/QAM (#1724) * fix(deck): Use super 1/2 for overlay/qam * fix(deck): fix filename in spec files * fix(deck): fix filename in spec files * fix(deck): keep ctrl modifier as an option, default on --- spec_files/gamescope/gamescope-legacy.spec | 2 +- spec_files/gamescope/gamescope.spec | 2 +- ...-ctrl-1-2-to-steam-s-wayland-session.patch | 40 ----------------- .../v2-0001-steam-overlay-hotkeys.patch | 44 +++++++++++++++++++ system_files/deck/shared/etc/environment | 3 ++ 5 files changed, 49 insertions(+), 42 deletions(-) delete mode 100644 spec_files/gamescope/v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch create mode 100644 spec_files/gamescope/v2-0001-steam-overlay-hotkeys.patch diff --git a/spec_files/gamescope/gamescope-legacy.spec b/spec_files/gamescope/gamescope-legacy.spec index 5feb5170..805bc3e0 100644 --- a/spec_files/gamescope/gamescope-legacy.spec +++ b/spec_files/gamescope/gamescope-legacy.spec @@ -18,7 +18,7 @@ Source2: https://github.com/Joshua-Ashton/reshade/archive/%{reshade_commi Patch0: 0001-cstdint.patch # https://hhd.dev/ -Patch1: v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch +Patch1: v2-0001-steam-overlay-hotkeys.patch # ChimeraOS Patch2: legacy-720p.patch diff --git a/spec_files/gamescope/gamescope.spec b/spec_files/gamescope/gamescope.spec index 52f377b4..b9d9e4e2 100644 --- a/spec_files/gamescope/gamescope.spec +++ b/spec_files/gamescope/gamescope.spec @@ -22,7 +22,7 @@ Patch1: chimeraos.patch # https://hhd.dev/ Patch2: disable-steam-touch-click-atom.patch -Patch3: v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch +Patch3: v2-0001-steam-overlay-hotkeys.patch # https://github.com/ValveSoftware/gamescope/issues/1369 Patch4: revert-299bc34.patch diff --git a/spec_files/gamescope/v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch b/spec_files/gamescope/v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch deleted file mode 100644 index b583936d..00000000 --- a/spec_files/gamescope/v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 35e001dc59a44227d670c667a85a6ef5472eee58 Mon Sep 17 00:00:00 2001 -From: antheas -Date: Sat, 20 Jul 2024 01:23:19 +0300 -Subject: [PATCH v2] always send ctrl+1/2 to steam's wayland session - ---- - src/wlserver.cpp | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/wlserver.cpp b/src/wlserver.cpp -index 1852be9..7de737d 100644 ---- a/src/wlserver.cpp -+++ b/src/wlserver.cpp -@@ -369,7 +369,12 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data) - keysym == XKB_KEY_XF86AudioLowerVolume || - keysym == XKB_KEY_XF86AudioRaiseVolume || - keysym == XKB_KEY_XF86PowerOff; -- if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && forbidden_key ) -+ -+ // Check for steam keys (ctrl + 1/2) -+ bool is_steamshortcut = (keyboard->wlr->modifiers.depressed & WLR_MODIFIER_CTRL) && (keysym == XKB_KEY_1 || -+ keysym == XKB_KEY_2); -+ -+ if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && (forbidden_key || is_steamshortcut) ) - { - // Always send volume+/- to root server only, to avoid it reaching the game. - struct wlr_surface *old_kb_surf = wlserver.kb_focus_surface; -@@ -378,6 +383,9 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data) - { - wlserver_keyboardfocus( new_kb_surf, false ); - wlr_seat_set_keyboard( wlserver.wlr.seat, keyboard->wlr ); -+ // Send modifiers to steam for it to work -+ if (is_steamshortcut) -+ wlr_seat_keyboard_notify_modifiers(wlserver.wlr.seat, &keyboard->wlr->modifiers); - wlr_seat_keyboard_notify_key( wlserver.wlr.seat, event->time_msec, event->keycode, event->state ); - wlserver_keyboardfocus( old_kb_surf, false ); - return; --- -2.45.2 - diff --git a/spec_files/gamescope/v2-0001-steam-overlay-hotkeys.patch b/spec_files/gamescope/v2-0001-steam-overlay-hotkeys.patch new file mode 100644 index 00000000..c22ea43b --- /dev/null +++ b/spec_files/gamescope/v2-0001-steam-overlay-hotkeys.patch @@ -0,0 +1,44 @@ +diff --git a/src/wlserver.cpp b/src/wlserver.cpp +index 3535c9b..d29a3d5 100644 +--- a/src/wlserver.cpp ++++ b/src/wlserver.cpp +@@ -290,6 +290,9 @@ static void wlserver_handle_modifiers(struct wl_listener *listener, void *data) + bump_input_counter(); + } + ++// false if GS_ENABLE_CTRL_12 exists and is 0, true otherwise ++bool env_gs_enable_ctrl_12 = getenv("GS_ENABLE_CTRL_12") ? (getenv("GS_ENABLE_CTRL_12")[0] != '0') : true; ++ + static void wlserver_handle_key(struct wl_listener *listener, void *data) + { + struct wlserver_keyboard *keyboard = wl_container_of( listener, keyboard, key ); +@@ -310,7 +313,14 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data) + keysym == XKB_KEY_XF86AudioLowerVolume || + keysym == XKB_KEY_XF86AudioRaiseVolume || + keysym == XKB_KEY_XF86PowerOff; +- if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && forbidden_key ) ++ ++ // Check for steam overlay key (ctrl/super + 1/2) ++ bool is_steamshortcut = ++ ((env_gs_enable_ctrl_12 && (keyboard->wlr->modifiers.depressed & WLR_MODIFIER_CTRL)) || ++ (keyboard->wlr->modifiers.depressed & WLR_MODIFIER_LOGO)) && ++ (keysym == XKB_KEY_1 || keysym == XKB_KEY_2); ++ ++ if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && (forbidden_key || is_steamshortcut) ) + { + // Always send volume+/- to root server only, to avoid it reaching the game. + struct wlr_surface *old_kb_surf = wlserver.kb_focus_surface; +@@ -319,6 +329,13 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data) + { + wlserver_keyboardfocus( new_kb_surf, false ); + wlr_seat_set_keyboard( wlserver.wlr.seat, keyboard->wlr ); ++ if (is_steamshortcut) ++ { ++ // send ctrl down modifier to trigger the overlay ++ wlr_keyboard_modifiers ctrl_down_modifier; ++ ctrl_down_modifier.depressed = WLR_MODIFIER_CTRL; ++ wlr_seat_keyboard_notify_modifiers(wlserver.wlr.seat, &ctrl_down_modifier); ++ } + wlr_seat_keyboard_notify_key( wlserver.wlr.seat, event->time_msec, event->keycode, event->state ); + wlserver_keyboardfocus( old_kb_surf, false ); + return; diff --git a/system_files/deck/shared/etc/environment b/system_files/deck/shared/etc/environment index d28b52a0..cb049800 100644 --- a/system_files/deck/shared/etc/environment +++ b/system_files/deck/shared/etc/environment @@ -3,3 +3,6 @@ EDITOR=/usr/bin/vim # Disable Brew auto-update HOMEBREW_NO_AUTO_UPDATE=1 + +# Passthrough ctrl + 1/2 ingame +#GS_ENABLE_CTRL_12=0 \ No newline at end of file From dfa3ad8c1cc78a4f710cc4bfdf5acd3a891cca4f Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 16:02:06 -0700 Subject: [PATCH 13/28] chore: Allow mesa-filesystem to remain unchanged --- spec_files/mesa/mesa.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spec_files/mesa/mesa.spec b/spec_files/mesa/mesa.spec index 0652ba11..b6bf71cb 100644 --- a/spec_files/mesa/mesa.spec +++ b/spec_files/mesa/mesa.spec @@ -69,7 +69,8 @@ Summary: Mesa graphics libraries %global ver 24.1.7 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Epoch: 1 -Release: 1 +%global orig_release 1%{?dist} +Release: 100.bazzite.%{orig_release} License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -233,7 +234,7 @@ Provides: libEGL-devel%{?_isa} %package dri-drivers Summary: Mesa-based DRI drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{orig_release} Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_va} Recommends: %{name}-va-drivers%{?_isa} @@ -245,7 +246,7 @@ Recommends: %{name}-va-drivers%{?_isa} %if 0%{?with_omx} %package omx-drivers Summary: Mesa-based OMX drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{orig_release} %description omx-drivers %{summary}. @@ -254,7 +255,7 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel %if 0%{?with_va} %package va-drivers Summary: Mesa-based VA-API video acceleration drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{orig_release} Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 %description va-drivers @@ -264,7 +265,7 @@ Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 %if 0%{?with_vdpau} %package vdpau-drivers Summary: Mesa-based VDPAU drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{orig_release} %description vdpau-drivers %{summary}. From 7c111c08eed3742481e7b75cb61cc28ddc77953e Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 16:05:41 -0700 Subject: [PATCH 14/28] chore: Keep original mesa-filesystem --- Containerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Containerfile b/Containerfile index b0e7f606..477e3e68 100644 --- a/Containerfile +++ b/Containerfile @@ -344,7 +344,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \ - mesa-filesystem \ mesa-libxatracker \ mesa-libglapi \ mesa-dri-drivers \ From 795f74f3832455695a3552e2113b98fe23da9f84 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 18:30:33 -0700 Subject: [PATCH 15/28] chore: re-enable and then disable negativo17 multimedia repo for Steam chore: Disable all rpmfusion repos chore: Add Negativo17 steam repo --- Containerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Containerfile b/Containerfile index 477e3e68..ba028050 100644 --- a/Containerfile +++ b/Containerfile @@ -215,11 +215,12 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ curl -Lo /etc/yum.repos.d/_copr_rodoma92-kde-cdemu-manager.repo https://copr.fedorainfracloud.org/coprs/rodoma92/kde-cdemu-manager/repo/fedora-"${FEDORA_MAJOR_VERSION}"/rodoma92-kde-cdemu-manager-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ curl -Lo /etc/yum.repos.d/_copr_rodoma92-rmlint.repo https://copr.fedorainfracloud.org/coprs/rodoma92/rmlint/repo/fedora-"${FEDORA_MAJOR_VERSION}"/rodoma92-rmlint-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ curl -Lo /etc/yum.repos.d/tailscale.repo https://pkgs.tailscale.com/stable/fedora/tailscale.repo && \ - curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo && \ rpm-ostree install \ https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \ sed -i 's@gpgcheck=1@gpgcheck=0@g' /etc/yum.repos.d/tailscale.repo && \ + sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ + curl -Lo /etc/yum.repos.d/negativo17-fedora-steam.repo https://negativo17.org/repos/fedora-steam.repo && \ /usr/libexec/containerbuild/cleanup.sh && \ ostree container commit @@ -324,7 +325,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ /tmp/akmods-extra-rpms/kmods/*bmi260*.rpm \ /tmp/akmods-extra-rpms/kmods/*ryzen-smu*.rpm \ /tmp/akmods-extra-rpms/kmods/*evdi*.rpm && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ @@ -332,9 +332,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ fwupd-plugin-flashrom \ fwupd-plugin-modem-manager \ fwupd-plugin-uefi-capsule-data && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree.repo && \ - 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-nonfree-updates-testing.repo && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-*.repo && \ /usr/libexec/containerbuild/cleanup.sh && \ ostree container commit @@ -365,12 +363,12 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ bluez-cups \ bluez-libs \ xorg-x11-server-Xwayland && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ + sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/rpmfusion-*.repo && \ rpm-ostree install \ libaacs \ libbdplus \ libbluray && \ - sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-*.repo && \ rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:sentry:switcheroo-control_discrete \ @@ -522,14 +520,14 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ mesa-va-drivers.i686 \ vkBasalt.x86_64 \ vkBasalt.i686 \ + mangohud.x86_64 \ + mangohud.i686 \ obs-vkcapture.x86_64 \ libobs_vkcapture.x86_64 \ libobs_glcapture.x86_64 \ obs-vkcapture.i686 \ libobs_vkcapture.i686 \ - libobs_glcapture.i686 \ - mangohud.x86_64 \ - mangohud.i686 && \ + libobs_glcapture.i686 && \ ln -s wine32 /usr/bin/wine && \ ln -s wine32-preloader /usr/bin/wine-preloader && \ ln -s wineserver64 /usr/bin/wineserver && \ @@ -729,6 +727,8 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_hikariknight-looking-glass-kvmfr.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/tailscale.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/charm.repo && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-steam.repo && \ mkdir -p /etc/flatpak/remotes.d && \ curl -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo && \ systemctl enable tuned.service && \ From eda26cba113f9fa53f98d304a92eac47941f076d Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 21:03:58 -0700 Subject: [PATCH 16/28] chore: Re-enable negativo17-multimedia for Nvidia builds --- Containerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Containerfile b/Containerfile index ba028050..15daa1f9 100644 --- a/Containerfile +++ b/Containerfile @@ -951,6 +951,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ # Install NVIDIA driver RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ --mount=type=bind,from=nvidia-akmods,src=/rpms,dst=/tmp/akmods-rpms \ + sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ curl -Lo /tmp/nvidia-install.sh https://raw.githubusercontent.com/ublue-os/hwe/main/nvidia-install.sh && \ chmod +x /tmp/nvidia-install.sh && \ IMAGE_NAME="${BASE_IMAGE_NAME}" /tmp/nvidia-install.sh && \ @@ -961,6 +962,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ # Cleanup & Finalize RUN echo "import \"/usr/share/ublue-os/just/95-bazzite-nvidia.just\"" >> /usr/share/ublue-os/justfile && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ mkdir -p /var/tmp && chmod 1777 /var/tmp && \ /usr/libexec/containerbuild/image-info && \ /usr/libexec/containerbuild/build-initramfs && \ From 316888f341e99eb92a657ee0fdafbc53ef6f8fad Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 21:57:51 -0700 Subject: [PATCH 17/28] feat: Switch to Protontricks Flatpak --- Containerfile | 1 - installer/gnome_flatpaks/flatpaks | 1 + installer/kde_flatpaks/flatpaks | 1 + system_files/desktop/shared/usr/bin/protontricks | 2 ++ .../shared/usr/libexec/bazzite-flatpak-manager | 16 ++++++++++++++++ 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100755 system_files/desktop/shared/usr/bin/protontricks diff --git a/Containerfile b/Containerfile index 15daa1f9..5e38dcc7 100644 --- a/Containerfile +++ b/Containerfile @@ -514,7 +514,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ libFAudio.x86_64 \ libFAudio.i686 \ winetricks \ - protontricks \ latencyflex-vulkan-layer \ mesa-vulkan-drivers.i686 \ mesa-va-drivers.i686 \ diff --git a/installer/gnome_flatpaks/flatpaks b/installer/gnome_flatpaks/flatpaks index 4d0a300b..41cc5b33 100644 --- a/installer/gnome_flatpaks/flatpaks +++ b/installer/gnome_flatpaks/flatpaks @@ -1,5 +1,6 @@ app/org.mozilla.firefox/x86_64/stable app/com.mattjakeman.ExtensionManager/x86_64/stable +app/com.github.Matoking.protontricks/stable app/io.github.fastrizwaan.WineZGUI/x86_64/stable app/io.github.dvlv.boxbuddyrs/x86_64/stable app/it.mijorus.gearlever/x86_64/stable diff --git a/installer/kde_flatpaks/flatpaks b/installer/kde_flatpaks/flatpaks index af78d440..abb01541 100644 --- a/installer/kde_flatpaks/flatpaks +++ b/installer/kde_flatpaks/flatpaks @@ -8,6 +8,7 @@ app/io.github.fastrizwaan.WineZGUI/x86_64/stable app/io.github.dvlv.boxbuddyrs/x86_64/stable app/it.mijorus.gearlever/x86_64/stable app/com.github.tchx84.Flatseal/x86_64/stable +app/com.github.Matoking.protontricks/stable app/io.github.flattool.Warehouse/x86_64/stable app/net.davidotek.pupgui2/x86_64/stable runtime/org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/23.08 diff --git a/system_files/desktop/shared/usr/bin/protontricks b/system_files/desktop/shared/usr/bin/protontricks new file mode 100755 index 00000000..3b7375e1 --- /dev/null +++ b/system_files/desktop/shared/usr/bin/protontricks @@ -0,0 +1,2 @@ +#!/usr/bin/bash +/usr/bin/flatpak run com.github.Matoking.protontricks "$@" diff --git a/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager b/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager index ff84bd4a..484efbc4 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager +++ b/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager @@ -26,6 +26,16 @@ fi flatpak remote-add --if-not-exists --system flathub /etc/flatpak/remotes.d/flathub.flatpakrepo flatpak remote-modify --system --enable flathub +PROTONTRICKS_SETUP_FILE="/etc/bazzite/protontricks_installed" +if [[ ! -f "$PROTONTRICKS_SETUP_FILE" ]]; then + if ! grep -q "com.github.Matoking.protontricks" <<< $(/usr/bin/flatpak list --app --columns=application); then + flatpak install --system --assumeyes com.github.Matoking.protontricks + touch "$PROTONTRICKS_SETUP_FILE" + else + touch "$PROTONTRICKS_SETUP_FILE" + fi +fi + # Flatpak theming support flatpak override \ --filesystem=xdg-config/gtk-4.0:ro \ @@ -55,6 +65,12 @@ flatpak override \ --device=dri \ dev.goats.xivlauncher +# Fix permissions for Protontricks +flatpak override \ + --filesystem=/var/mnt \ + --filesystem=/run/media \ + com.github.Matoking.protontricks + # Params needed for HW accelerated video on Nvidia (Ignoring hybrid systems) if [[ $IMAGE_FLAVOR =~ "nvidia" ]] && [ $(grep -o "\-display" <<< $(lshw -C display) | wc -l) -le 1 ] && grep -q "vendor: NVIDIA Corporation" <<< $(lshw -C display); then flatpak override \ From c8886e23813551eea540fa73c2040f9416601304 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 21:59:26 -0700 Subject: [PATCH 18/28] chore: Temporarily drop 32-bit vkcapture --- Containerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Containerfile b/Containerfile index 5e38dcc7..05c8f220 100644 --- a/Containerfile +++ b/Containerfile @@ -523,10 +523,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ mangohud.i686 \ obs-vkcapture.x86_64 \ libobs_vkcapture.x86_64 \ - libobs_glcapture.x86_64 \ - obs-vkcapture.i686 \ - libobs_vkcapture.i686 \ - libobs_glcapture.i686 && \ + libobs_glcapture.x86_64 && \ ln -s wine32 /usr/bin/wine && \ ln -s wine32-preloader /usr/bin/wine-preloader && \ ln -s wineserver64 /usr/bin/wineserver && \ From 8d1186590d4ba8e040e58222362772fbefbebfdd Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 22:37:30 -0700 Subject: [PATCH 19/28] chore(gnome): Update Protontricks desktop icon name --- .../desktop/silverblue/etc/dconf/db/local.d/04-bazzite-folders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_files/desktop/silverblue/etc/dconf/db/local.d/04-bazzite-folders b/system_files/desktop/silverblue/etc/dconf/db/local.d/04-bazzite-folders index 810a80d2..790712e0 100644 --- a/system_files/desktop/silverblue/etc/dconf/db/local.d/04-bazzite-folders +++ b/system_files/desktop/silverblue/etc/dconf/db/local.d/04-bazzite-folders @@ -2,7 +2,7 @@ folder-children=['Games', 'GamingUtilities', 'Utilities', 'Containers', 'Waydroid', 'Wine', 'YaST', 'Pardus'] [org/gnome/desktop/app-folders/folders/GamingUtilities] -apps=['protontricks.desktop', 'discover_overlay_configure.desktop', 'com.vysp3r.ProtonPlus.desktop', 'io.github.benjamimgois.goverlay.desktop', 'com.gerbilsoft.rom-properties.rp-config.desktop', 'input-remapper-gtk.desktop', 'steamos-nested-desktop.desktop', 'hhd-ui.desktop'] +apps=['com.github.Matoking.protontricks.desktop', 'discover_overlay_configure.desktop', 'com.vysp3r.ProtonPlus.desktop', 'io.github.benjamimgois.goverlay.desktop', 'com.gerbilsoft.rom-properties.rp-config.desktop', 'input-remapper-gtk.desktop', 'steamos-nested-desktop.desktop', 'hhd-ui.desktop'] name='Gaming Utilities' translate=false From b072d6672f53b95420e95d112ea7817a5c2458e4 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 22:42:19 -0700 Subject: [PATCH 20/28] chore: Add local steam folder perms to flatpak protontricks --- .../desktop/shared/usr/libexec/bazzite-flatpak-manager | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager b/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager index 484efbc4..3e5d6a5e 100755 --- a/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager +++ b/system_files/desktop/shared/usr/libexec/bazzite-flatpak-manager @@ -1,7 +1,7 @@ #!/usr/bin/bash # SCRIPT VERSION -VER=23 +VER=24 VER_FILE="/etc/bazzite/flatpak_manager_version" VER_RAN=$(cat $VER_FILE) IMAGE_INFO="/usr/share/ublue-os/image-info.json" @@ -67,6 +67,7 @@ flatpak override \ # Fix permissions for Protontricks flatpak override \ + --filesystem=~/.local/share/Steam \ --filesystem=/var/mnt \ --filesystem=/run/media \ com.github.Matoking.protontricks From f5553ab7f206a508c160f795602a466a96d7140b Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 23:27:26 -0700 Subject: [PATCH 21/28] feat(nvidia): Add vdpau packages for Mesa from negativo17 --- Containerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Containerfile b/Containerfile index 05c8f220..2edbd6b7 100644 --- a/Containerfile +++ b/Containerfile @@ -948,6 +948,9 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ --mount=type=bind,from=nvidia-akmods,src=/rpms,dst=/tmp/akmods-rpms \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ + rpm-ostree install \ + mesa-vdpau-drivers.x86_64 \ + mesa-vdpau-drivers.i686 && \ curl -Lo /tmp/nvidia-install.sh https://raw.githubusercontent.com/ublue-os/hwe/main/nvidia-install.sh && \ chmod +x /tmp/nvidia-install.sh && \ IMAGE_NAME="${BASE_IMAGE_NAME}" /tmp/nvidia-install.sh && \ From 410f13ba876404e5f5e40a2dabcb7c78055a90ff Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 23:37:35 -0700 Subject: [PATCH 22/28] fix: Disable displaylink by default, now can be enabled with `ujust enable-displaylink`. --- Containerfile | 2 +- .../desktop/shared/usr/share/ublue-os/just/80-bazzite.just | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 2edbd6b7..82dc0778 100644 --- a/Containerfile +++ b/Containerfile @@ -733,7 +733,7 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ systemctl disable brew-upgrade.timer && \ systemctl disable brew-update.timer && \ systemctl enable btrfs-dedup@var-home.timer && \ - systemctl enable displaylink.service && \ + systemctl disable displaylink.service && \ systemctl enable input-remapper.service && \ systemctl unmask bazzite-flatpak-manager.service && \ systemctl enable bazzite-flatpak-manager.service && \ diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just index 5fc0e2bf..f0994296 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just +++ b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just @@ -71,6 +71,10 @@ add-user-to-input-group: fi sudo usermod -a -G input $USER +# Enable support for DisplayLink +enable-displaylink: + systemctl enable --now displaylink.service + # Configure watchdog (default: enabled, recovers the system in the event of a malfunction) configure-watchdog ACTION="": #!/usr/bin/bash From 97fc18dc93844844eb46fe815f1b44990d304ce3 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 23:38:49 -0700 Subject: [PATCH 23/28] fix: Disable tailscale by default, now can be enabled with `ujust enable-tailscale` --- Containerfile | 2 +- .../desktop/shared/usr/share/ublue-os/just/80-bazzite.just | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 82dc0778..b0610227 100644 --- a/Containerfile +++ b/Containerfile @@ -741,7 +741,7 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ systemctl enable ublue-update.timer && \ systemctl enable incus-workaround.service && \ systemctl enable bazzite-hardware-setup.service && \ - systemctl enable tailscaled.service && \ + systemctl disable tailscaled.service && \ systemctl enable dev-hugepages1G.mount && \ systemctl --global enable bazzite-user-setup.service && \ systemctl --global enable podman.socket && \ diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just index f0994296..be6dfe74 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just +++ b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just @@ -75,6 +75,10 @@ add-user-to-input-group: enable-displaylink: systemctl enable --now displaylink.service +# Enable support for Tailscale +enable-tailscale: + systemctl enable --now tailscaled.service + # Configure watchdog (default: enabled, recovers the system in the event of a malfunction) configure-watchdog ACTION="": #!/usr/bin/bash From 85c73d132f4ab021e52ef8fe9cac377a3a5e04e3 Mon Sep 17 00:00:00 2001 From: Pat Connors <121328689+nicknamenamenick@users.noreply.github.com> Date: Tue, 8 Oct 2024 03:07:59 -0400 Subject: [PATCH 24/28] chore(readme): Use the "resources" doc over the Discourse link (#1723) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 02d25f98..47c1ee1b 100644 --- a/README.md +++ b/README.md @@ -374,4 +374,4 @@ We also ship a config for the popular [pull app](https://github.com/apps/pull) i - Follow Universal Blue on [Mastodon](https://fosstodon.org/@UniversalBlue). -[**View the full list of Bazzite resources and social presence**](https://universal-blue.discourse.group/docs?topic=8). +[**View the full list of Bazzite resources and social presence**](https://docs.bazzite.gg/Resources/). From 7dbdbe6c5893a40e43eda3bab7fb281b2e7dd0d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 00:08:10 -0700 Subject: [PATCH 25/28] chore(deps): bump DecimalTurn/Comment-Filter from 0.1.3 to 0.1.4 (#1728) Bumps [DecimalTurn/Comment-Filter](https://github.com/decimalturn/comment-filter) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/decimalturn/comment-filter/releases) - [Commits](https://github.com/decimalturn/comment-filter/compare/558e9a0b05c9a211a581ee365c90a0a3e3ff9476...9683f002007cc8739893f27123f6d3d857ea7808) --- updated-dependencies: - dependency-name: DecimalTurn/Comment-Filter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/comment-filter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/comment-filter.yml b/.github/workflows/comment-filter.yml index 62e04c8f..b349b62c 100644 --- a/.github/workflows/comment-filter.yml +++ b/.github/workflows/comment-filter.yml @@ -12,4 +12,4 @@ jobs: runs-on: ubuntu-latest steps: - name: Comment filter - uses: DecimalTurn/Comment-Filter@558e9a0b05c9a211a581ee365c90a0a3e3ff9476 #v0.1.3 + uses: DecimalTurn/Comment-Filter@9683f002007cc8739893f27123f6d3d857ea7808 #v0.1.4 From ff61b44285c0abfe782bd9bc439d7bf7bf65a29a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 00:08:19 -0700 Subject: [PATCH 26/28] chore(deps): bump sigstore/cosign-installer from 3.6.0 to 3.7.0 (#1729) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](https://github.com/sigstore/cosign-installer/compare/4959ce089c160fddf62f7b42464195ba1a56d382...dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/sign_image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sign_image.yml b/.github/workflows/sign_image.yml index 34a58212..2ff91de0 100644 --- a/.github/workflows/sign_image.yml +++ b/.github/workflows/sign_image.yml @@ -37,7 +37,7 @@ jobs: echo "NAME=$name" >> $GITHUB_OUTPUT - name: Setup Cosign - uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0 + uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0 - name: Sign Image env: From 2041ab4de8d30b6e4cc207a815615e8cd2421d58 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 8 Oct 2024 00:10:49 -0700 Subject: [PATCH 27/28] chore: Increase gamescope release --- spec_files/gamescope/gamescope-legacy.spec | 2 +- spec_files/gamescope/gamescope.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec_files/gamescope/gamescope-legacy.spec b/spec_files/gamescope/gamescope-legacy.spec index 805bc3e0..5bf68f37 100644 --- a/spec_files/gamescope/gamescope-legacy.spec +++ b/spec_files/gamescope/gamescope-legacy.spec @@ -5,7 +5,7 @@ Name: gamescope-legacy Version: 3.14.2 -Release: 3.bazzite +Release: 4.bazzite Summary: Legacy builds of gamescope, a micro-compositor for video games on Wayland License: BSD diff --git a/spec_files/gamescope/gamescope.spec b/spec_files/gamescope/gamescope.spec index b9d9e4e2..e523b35c 100644 --- a/spec_files/gamescope/gamescope.spec +++ b/spec_files/gamescope/gamescope.spec @@ -6,7 +6,7 @@ Name: gamescope Version: 100.%{gamescope_tag} -Release: 2.bazzite +Release: 3.bazzite Summary: Micro-compositor for video games on Wayland License: BSD From 3e4e1629563f35283d911eb15062fe03b064f0e4 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 8 Oct 2024 01:06:15 -0700 Subject: [PATCH 28/28] feat: Add rar archive support --- Containerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index b0610227..be771dfb 100644 --- a/Containerfile +++ b/Containerfile @@ -221,6 +221,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ sed -i 's@gpgcheck=1@gpgcheck=0@g' /etc/yum.repos.d/tailscale.repo && \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ curl -Lo /etc/yum.repos.d/negativo17-fedora-steam.repo https://negativo17.org/repos/fedora-steam.repo && \ + curl -Lo /etc/yum.repos.d/negativo17-fedora-rar.repo https://negativo17.org/repos/fedora-rar.repo && \ /usr/libexec/containerbuild/cleanup.sh && \ ostree container commit @@ -429,8 +430,8 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ yad \ f3 \ pulseaudio-utils \ - unrar \ lzip \ + rar \ libxcrypt-compat \ mesa-libGLU \ vulkan-tools \ @@ -725,6 +726,7 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/charm.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-steam.repo && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-rar.repo && \ mkdir -p /etc/flatpak/remotes.d && \ curl -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo && \ systemctl enable tuned.service && \