Merge branch 'main' into testing

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 name: Build Bazzite
 on:
   schedule:
-    - cron: '40 16 * * 2,5' # 16:40 utc tues thurs
+    - cron: '40 4 * * 2,5' # 4:40 utc tues thurs
   pull_request:
     branches:
       - testing

Containerfile

@@ -433,8 +433,8 @@ RUN rpm-ostree install \
         libobs_glcapture.i686 \
         mangohud.x86_64 \
         mangohud.i686 && \
-    ln -s wine64 /usr/bin/wine && \
+    ln -s wine32 /usr/bin/wine && \
-    ln -s wine64-preloader /usr/bin/wine-preloader && \
+    ln -s wine32-preloader /usr/bin/wine-preloader && \
     ln -s wineserver64 /usr/bin/wineserver && \
     if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         rpm-ostree override remove \
@@ -463,7 +463,8 @@ RUN rpm-ostree install \
 # Configure KDE & GNOME
 RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
         rpm-ostree install \
-            qt && \
+            qt \
+            krdp && \
         rpm-ostree override remove \
             plasma-welcome && \
         rpm-ostree override replace \

spec_files/mesa/mesa.spec

@@ -62,7 +62,7 @@
 
 Name:           mesa
 Summary:        Mesa graphics libraries
-%global ver 24.1.1
+%global ver 24.1.2
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
 Release:        100.bazzite.{{{ git_dir_version }}}
 License:        MIT AND BSD-3-Clause AND SGI-B-2.0

spec_files/xorg-x11-server-Xwayland/0001-xwayland-Send-ei_device_frame-on-device_scroll_discr.patch

@@ -1,28 +0,0 @@
-From 317712eb5a1aa4a1c3d737a8fcaee57add9981c9 Mon Sep 17 00:00:00 2001
-From: Joshua Ashton <joshua@froggi.es>
-Date: Sat, 11 May 2024 07:25:48 +0100
-Subject: [PATCH] xwayland: Send ei_device_frame on device_scroll_discrete
-
-This fixes the scroll action in Steam Input in SteamOS/Gamescope when using the new libeis backend.
-
-Fixes: a13333427072dfb27792c5c9ff22ed145ede0f0a ("xwayland: Add XTEST support using EIS")
-Signed-off-by: Joshua Ashton <joshua@froggi.es>
----
- hw/xwayland/xwayland-xtest.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
-index 756a6d8f7..4976a3d7e 100644
---- a/hw/xwayland/xwayland-xtest.c
-+++ b/hw/xwayland/xwayland-xtest.c
-@@ -584,6 +584,7 @@ xwl_send_event_to_ei(struct xwl_ei_client *xwl_ei_client,
-                 } else if (detail == 7) {
-                     ei_device_scroll_discrete(ei_device, SCROLL_STEP, 0);
-                 }
-+                ei_device_frame(ei_device, ei_now(ei));
-             }
-             break;
-         case KeyPress:
--- 
-2.44.0
-

spec_files/xorg-x11-server-Xwayland/xorg-x11-server-Xwayland.spec

@@ -8,7 +8,7 @@
 
 Summary:   Xwayland
 Name:      xorg-x11-server-Xwayland
-%global    xwayland_version 23.2.6
+%global    xwayland_version 24.1.0
 Version:   %{xwayland_version}.bazzite.{{{ git_dir_version }}}
 Release:   1%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
 
@@ -20,7 +20,6 @@ Source0:   https://www.x.org/pub/individual/xserver/%{pkgname}-%{xwayland_versio
 %endif
 
 Patch0:    xwayland-pointer-warp-fix.patch
-Patch1:    0001-xwayland-Send-ei_device_frame-on-device_scroll_discr.patch
 
 License:   MIT
 
@@ -37,7 +36,7 @@ BuildRequires: wayland-devel
 BuildRequires: desktop-file-utils
 
 BuildRequires: pkgconfig(wayland-client) >= 1.21.0
-BuildRequires: pkgconfig(wayland-protocols) >= 1.30
+BuildRequires: pkgconfig(wayland-protocols) >= 1.34
 BuildRequires: pkgconfig(wayland-eglstream-protocols)
 
 BuildRequires: pkgconfig(epoxy) >= 1.5.5
@@ -68,7 +67,7 @@ BuildRequires: pkgconfig(libxcvt)
 BuildRequires: pkgconfig(libdecor-0) >= 0.1.1
 BuildRequires: pkgconfig(liboeffis-1.0) >= 1.0.0
 BuildRequires: pkgconfig(libei-1.0) >= 1.0.0
-BuildRequires: xorg-x11-proto-devel >= 2023.2-1
+BuildRequires: xorg-x11-proto-devel >= 2024.1-1
 
 BuildRequires: mesa-libGL-devel >= 9.2
 BuildRequires: mesa-libEGL-devel
@@ -108,7 +107,6 @@ necessary for developing Wayland compositors using Xwayland.
 %build
 %meson \
 	%{?gitdate:-Dxwayland=true -D{xorg,xnest,xvfb,udev}=false} \
-        -Dxwayland_eglstream=true \
         -Ddefault_font_path=%{default_font_path} \
         -Dbuilder_string="Build ID: %{name} %{version}-%{release}" \
         -Dxkb_output_dir=%{_localstatedir}/lib/xkb \
@@ -141,6 +139,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_libdir}/pkgconfig/xwayland.pc
 
 %changelog
+* Wed May 15 2024 Olivier Fourdan <ofourdan@redhat.com> - 24.1.0-1
+- xwayland 24.1.0
+
+* Thu May 02 2024 Olivier Fourdan <ofourdan@redhat.com> - 24.0.99.902-1
+- xwayland 24.0.99.902 (xwayland 24.1.0 rc2) 
+
+* Wed Apr 17 2024 Olivier Fourdan <ofourdan@redhat.com> - 24.0.99.901-1
+- xwayland 24.0.99.901 (xwayland 24.1.0 rc1) - (#2275466)
+
 * Tue Apr 09 2024 Olivier Fourdan <ofourdan@redhat.com> - 23.2.6-1
 - xwayland 23.2.6 - (#2273002)
 

system_files/deck/kinoite/usr/bin/bazzite-plasma-bootstrap

@@ -5,7 +5,7 @@
 
 set -eo pipefail
 
-SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+SYS_ID="$(/usr/libexec/hwsupport/sysid)"
 
 if [[ "${XDG_SESSION_TYPE}" = "wayland" ]]; then
   if /usr/libexec/hwsupport/needs-left-rotation || /usr/libexec/hwsupport/needs-right-rotation; then

system_files/deck/kinoite/usr/libexec/hardware/needs-left-rotation

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+SYS_ID="$(/usr/libexec/hwsupport/sysid)"
 
 # Legion Go
 # Loki Max
@@ -9,4 +9,4 @@ if [[ ":83E1:Loki Max:AIR Plus:" =~ ":$SYS_ID:" ]]; then
 	exit 0
 fi
 
-exit 1
+exit 1

system_files/deck/shared/usr/etc/X11/Xsession.d/50rotate-screen

@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 
 set -e
-SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+SYS_ID="$(/usr/libexec/hwsupport/sysid)"
 
 if [[ ":Jupiter:" =~ ":$SYS_ID:" || ":Galileo:" =~ ":$SYS_ID:" ]]; then
   # Rotate the builtin screen every time so it's the right way around.

system_files/deck/shared/usr/etc/system76-scheduler/config.kdl

@@ -27,10 +27,17 @@ process-scheduler enable=true {
         sound-server nice=-19 sched=(fifo)89 io=(realtime)0 {
             "/usr/bin/pipewire"
             "/usr/bin/pipewire-pulse"
+            "/usr/bin/pipewire-avb"
+            "/usr/bin/pipewire-aes67"
+            "/usr/bin/pipewire-vulkan"
             "/usr/bin/jackd"
+            "/usr/bin/pw-jack"
             "/usr/bin/wireplumber"
         }
 
+        // Applications that directly interface with pipewire to affect the output
+        sound-processing nice=-19 sched=(fifo)89 io=(realtime)0
+
         // Applications with realtime audio processing needs
         recording nice=-9 io=(best-effort)0
 

system_files/deck/shared/usr/share/ublue-os/just/85-bazzite-image.just

@@ -61,7 +61,7 @@ switch-to-ext4:
 # Install Deck HD BIOS
 install-deckhd-bios:
     #!/usr/bin/bash
-    SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+    SYS_ID="$(/usr/libexec/hwsupport/sysid)"
     if [[ ":Jupiter:" =~ ":$SYS_ID:" ]]; then
       RESOLUTION=$(sudo lshw -json -c display | jq -r .[]."configuration"."resolution")
       if [[ "${RESOLUTION}" = "1200,1920" ]]; then
@@ -92,7 +92,7 @@ enable-swipe-gestures:
 # Enable BIOS & Firmware update services for the Steam Deck
 enable-deck-bios-firmware-updates:
     #!/usr/bin/bash
-    SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+    SYS_ID="$(/usr/libexec/hwsupport/sysid)"
     if [[ ":Jupiter:" =~ ":$SYS_ID:" || ":Galileo:" =~ ":$SYS_ID:" ]]; then
       RESOLUTION=$(sudo lshw -json -c display | jq -r .[]."configuration"."resolution")
       if [[ "${RESOLUTION}" = "1200,1920" ]]; then

system_files/desktop/shared/usr/etc/system76-scheduler/config.kdl

@@ -27,10 +27,17 @@ process-scheduler enable=true {
         sound-server nice=-19 sched=(fifo)89 io=(realtime)0 {
             "/usr/bin/pipewire"
             "/usr/bin/pipewire-pulse"
+            "/usr/bin/pipewire-avb"
+            "/usr/bin/pipewire-aes67"
+            "/usr/bin/pipewire-vulkan"
             "/usr/bin/jackd"
+            "/usr/bin/pw-jack"
             "/usr/bin/wireplumber"
         }
 
+        // Applications that directly interface with pipewire to affect the output
+        sound-processing nice=-19 sched=(fifo)89 io=(realtime)0
+
         // Applications with realtime audio processing needs
         recording nice=-9 io=(best-effort)0
 

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

@@ -22,7 +22,7 @@ KNOWN_FEDORA_VERSION_FILE="/etc/bazzite/fedora_version"
 KNOWN_FEDORA_VERSION=$(cat $KNOWN_FEDORA_VERSION_FILE)
 
 # GLOBAL
-SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+SYS_ID="$(/usr/libexec/hwsupport/sysid)"
 VEN_ID="$(cat /sys/devices/virtual/dmi/id/chassis_vendor)"
 CPU_VENDOR=$(grep "vendor_id" "/proc/cpuinfo" | uniq | awk -F": " '{ print $2 }')
 CPU_MODEL=$(grep "model name" "/proc/cpuinfo" | uniq | awk -F": " '{ print $2 }')
@@ -85,7 +85,7 @@ if [[ ":83E1:" =~ ":$SYS_ID:" ]]; then
     echo "Adding SG Display for Lenovo Legion Go"
     NEEDED_KARGS+=("--append-if-missing=amdgpu.sg_display=0")
   fi
-elif [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L_Action:ROG Ally RC71L:" =~ ":$SYS_ID:" ]]; then
+elif [[ ":ROG Ally RC71L:" =~ ":$SYS_ID:" ]]; then
   if [[ ! $KARGS =~ "amdgpu.gttsize" ]]; then
     echo "Adding GTTSize for ASUS Ally"
     NEEDED_KARGS+=("--append-if-missing=amdgpu.gttsize=8128")

system_files/desktop/shared/usr/libexec/bazzite-powersave

@@ -2,8 +2,8 @@
 # This script sends the Power Profile Daemon dbus call to set tuneD to power-saver mode
 # This is useful only for battery powered devices where you want to start in power-saver mode by default
 POWERSAVE=1
-if [ -z "$1" ]; then
+if [ -n "$1" ]; then
-    if [ "$1" == 0 ]; then
+    if [ "$1" == "0" ]; then
         POWERSAVE=0
     fi
 fi
@@ -11,14 +11,14 @@ fi
 # Check what DE we are on
 if command -v /usr/bin/mutter > /dev/null; then
     # If we are on Gnome send the dbus signal with gdbus
-    if [ $POWERSAVE == 0 ]; then
+    if [ "$POWERSAVE" == "0" ]; then
         gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles --method org.freedesktop.DBus.Properties.Set 'net.hadess.PowerProfiles' 'ActiveProfile' "<'balanced'>"
     else
         gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles --method org.freedesktop.DBus.Properties.Set 'net.hadess.PowerProfiles' 'ActiveProfile' "<'power-saver'>"
     fi
 else
     # Assume we are on KDE and send the dbus signal with qdbus
-    if [ $POWERSAVE == 0 ]; then
+    if [ "$POWERSAVE" == "0" ]; then
         qdbus org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/PowerProfile setProfile balanced
     else
         qdbus org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/PowerProfile setProfile power-saver

system_files/desktop/shared/usr/libexec/hwsupport/hhd-supported-hardware

@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 # Returns true for hardware that is supported by HHD
-SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+SYS_ID="$(/usr/libexec/hwsupport/sysid)"
-if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L_Action:ROG Ally RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:AIR 1S:AIR 1S Limited:AIR:AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:AOKZOE A1 Pro:G1619-04:Win600:Loki Max:Loki Zero:Loki MiniPro:" =~ ":$SYS_ID:" ]]; then
+if [[ ":ROG Ally RC71L:83E1:G1618-04:G1617-01:G1619-05:AIR Plus:AIR 1S:AIR 1S Limited:AIR:AYANEO GEEK:AYANEO 2:AYANEO 2S:AOKZOE A1 AR07:AOKZOE A1 Pro:G1619-04:Win600:Loki Max:Loki Zero:Loki MiniPro:" =~ ":$SYS_ID:" ]]; then
 	exit 0
 fi
 

system_files/desktop/shared/usr/libexec/hwsupport/simpledeckytdp-supported-hardware

@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 # Returns true for hardware that is supported by SimpleDeckyTDP
-SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+SYS_ID="$(/usr/libexec/hwsupport/sysid)"
-if [[ ":ROG Ally RC71L_RC71L:ROG Ally RC71L:83E1:G1618-04:G1619-04:G1617-01:G1619-05:AIR Plus:AIR 1S:AIR 1S Limited:AIR:SLIDE:V3:AOKZOE A1 AR07:AOKZOE A1 Pro:ONEXPLAYER 2 ARP23:ONEXPLAYER 2 PRO ARP23H:ONEXPLAYER 2 PRO ARP23P:ONEXPLAYER 2 PRO ARP23P EVA-01:" =~ ":$SYS_ID:" ]]; then
+if [[ ":ROG Ally RC71L:83E1:G1618-04:G1619-04:G1617-01:G1619-05:AIR Plus:AIR 1S:AIR 1S Limited:AIR:SLIDE:V3:AOKZOE A1 AR07:AOKZOE A1 Pro:ONEXPLAYER 2 ARP23:ONEXPLAYER 2 PRO ARP23H:ONEXPLAYER 2 PRO ARP23P:ONEXPLAYER 2 PRO ARP23P EVA-01:" =~ ":$SYS_ID:" ]]; then
 	exit 0
 fi
 

system_files/desktop/shared/usr/libexec/hwsupport/sysid

@@ -0,0 +1,12 @@
+#!/bin/bash
+# Get the SYS_ID
+SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
+
+# Check SYS_IDs that have multiple revisions with insignificant hardware changes
+if [[ "$SYS_ID" =~ ROG[[:space:]]Ally[[:space:]]RC71L.+ ]]; then
+    # Trunctate ROG Ally SYS_ID
+    echo "ROG Ally RC71L"
+else
+    # Probably a sensible SYS_ID so we echo it
+    echo "$SYS_ID"
+fi