Merge branch 'main' into testing

spec_files/gamescope/gamescope.spec

@@ -127,6 +127,7 @@ cd gamescope
 %caps(cap_sys_nice=eip) %{_bindir}/gamescope
 %{_bindir}/gamescopectl
 %{_bindir}/gamescopestream
+%{_bindir}/gamescopereaper
 
 %files libs
 %{_libdir}/libVkLayer_FROG_gamescope_wsi_*.so

spec_files/jupiter-hw-support/priv-write.patch

@@ -2,17 +2,16 @@ diff --git a/usr/bin/steamos-polkit-helpers/steamos-priv-write b/usr/bin/steamos
 index 8fcd1d4..4b47d21 100755
 --- a/usr/bin/steamos-polkit-helpers/steamos-priv-write
 +++ b/usr/bin/steamos-polkit-helpers/steamos-priv-write
-@@ -3,6 +3,9 @@
+@@ -3,6 +3,8 @@
  set -euo pipefail
  shopt -s nullglob
  
 +source /etc/default/steam-hardware-control
-+SYS_ID="$(cat /sys/devices/virtual/dmi/id/product_name)"
 +
  if [[ $EUID -ne 0 ]];
  then
      exec pkexec --disable-internal-agent "$0" "$@"
-@@ -37,13 +40,14 @@ function MatchFilenamePattern()
+@@ -37,13 +39,14 @@
  
  function CommitWrite()
  {
@@ -29,41 +28,41 @@ index 8fcd1d4..4b47d21 100755
      exit 0
  }
  
-@@ -65,15 +69,35 @@ if MatchFilenamePattern "$WRITE_PATH" "/dev/drm_dp_aux0"; then
+@@ -65,15 +68,35 @@
  fi
  
  if MatchFilenamePattern "$WRITE_PATH" "/sys/class/drm/card*/device/power_dpm_force_performance_level"; then
 -    CommitWrite
-+   if /usr/libexec/hwsupport/valve-hardware || [[ "$ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE" = 1 ]]; then
++    if systemctl list-units | grep hhd@; then
++        echo "commit: Skipped $WRITE_VALUE -> $WRITE_PATH - controlled by HHD" | systemd-cat -t p-steamos-priv-write -p warning
++    elif /usr/libexec/hwsupport/valve-hardware; then
 +        for i in $(ls /sys/class/drm/card*/device/power_dpm_force_performance_level)
 +        do
 +            WRITE_PATH="$i"
 +            CommitWrite
 +        done
-+   else
-+      echo "commit: Skipped $WRITE_VALUE -> $WRITE_PATH - see /etc/default/steam-hardware-control" | systemd-cat -t p-steamos-priv-write -p warning
 +    fi
  fi
  
  if MatchFilenamePattern "$WRITE_PATH" "/sys/class/drm/card*/device/pp_od_clk_voltage"; then
 -    CommitWrite
-+   if /usr/libexec/hwsupport/valve-hardware || [[ "$ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE" = 1 ]]; then
++    if systemctl list-units | grep hhd@; then
++        echo "commit: Skipped $WRITE_VALUE -> $WRITE_PATH - controlled by HHD" | systemd-cat -t p-steamos-priv-write -p warning
++    elif /usr/libexec/hwsupport/valve-hardware; then
 +        for i in $(ls /sys/class/drm/card*/device/pp_od_clk_voltage)
 +        do
 +            WRITE_PATH="$i"
 +            CommitWrite
 +        done
-+   else
-+      echo "commit: Skipped $WRITE_VALUE -> $WRITE_PATH - see /etc/default/steam-hardware-control" | systemd-cat -t p-steamos-priv-write -p warning
 +    fi
  fi
  
  if MatchFilenamePattern "$WRITE_PATH" "/sys/class/hwmon/hwmon*/power*_cap"; then
 -    CommitWrite
-+   if /usr/libexec/hwsupport/valve-hardware || [[ "$ENABLE_HARDWARE_CONTROL_ON_NON_DECK_HARDWARE" = 1 ]]; then
++    if systemctl list-units | grep hhd@; then
++        echo "commit: Skipped $WRITE_VALUE -> $WRITE_PATH - controlled by HHD" | systemd-cat -t p-steamos-priv-write -p warning
++    elif /usr/libexec/hwsupport/valve-hardware; then
 +        CommitWrite
-+   else
-+      echo "commit: Skipped $WRITE_VALUE -> $WRITE_PATH - see /etc/default/steam-hardware-control" | systemd-cat -t p-steamos-priv-write -p warning
 +    fi
  fi
  

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

@@ -18,7 +18,7 @@ BAZZITE_CONFIG_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/bazzite"
 mkdir -p "$BAZZITE_CONFIG_DIR"
 
 # SCRIPT VERSION
-USER_SETUP_VER=38
+USER_SETUP_VER=39
 USER_SETUP_VER_FILE="$BAZZITE_CONFIG_DIR/version"
 USER_SETUP_FEDORA_VER_FILE="$BAZZITE_CONFIG_DIR/fedora_version"
 USER_SETUP_IMAGE_VER_FILE=$BAZZITE_CONFIG_DIR/image_name""
@@ -96,7 +96,28 @@ if [[ $BASE_IMAGE_NAME =~ "kinoite" ]]; then
 else
   echo 'Running setup for Silverblue'
 
-  if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then
+  if /usr/libexec/hwsupport/valve-hardware; then
+    if [[ ! -f "$BAZZITE_CONFIG_DIR/deck-initialized" ]]; then
+      echo 'Setting Deck logo menu'
+      dconf write /org/gnome/shell/extensions/Logo-menu/symbolic-icon true
+      dconf write /org/gnome/shell/extensions/Logo-menu/menu-button-icon-image 2
+      touch "$BAZZITE_CONFIG_DIR/deck-initialized"
+    fi
+  elif [[ ":83E1:" =~ ":$SYS_ID:" ]]; then
+    if [[ ! -f "$BAZZITE_CONFIG_DIR/legion-initialized" ]]; then
+      echo 'Setting Legion logo menu'
+      dconf write /org/gnome/shell/extensions/Logo-menu/symbolic-icon true
+      dconf write /org/gnome/shell/extensions/Logo-menu/menu-button-icon-image 5
+      touch "$BAZZITE_CONFIG_DIR/legion-initialized"
+    fi
+  elif [[ ":ROG Ally RC71L:" =~ ":$SYS_ID:" ]]; then
+    if [[ ! -f "$BAZZITE_CONFIG_DIR/ally-initialized" ]]; then
+      echo 'Setting Ally logo menu'
+      dconf write /org/gnome/shell/extensions/Logo-menu/symbolic-icon true
+      dconf write /org/gnome/shell/extensions/Logo-menu/menu-button-icon-image 6
+      touch "$BAZZITE_CONFIG_DIR/ally-initialized"
+    fi
+  elif [[ ":Framework:" =~ ":$VEN_ID:" ]]; then
     if [[ ! -f "$BAZZITE_CONFIG_DIR/framework-initialized" ]]; then
       echo 'Setting Framework logo menu'
       dconf write /org/gnome/shell/extensions/Logo-menu/symbolic-icon true
@@ -111,18 +132,6 @@ else
     fi
   fi
 
-  if [[ ":83E1:" =~ ":$SYS_ID:" ]]; then
-      echo 'Setting Legion logo menu'
-      dconf write /org/gnome/shell/extensions/Logo-menu/symbolic-icon true
-      dconf write /org/gnome/shell/extensions/Logo-menu/menu-button-icon-image 5
-  fi
-
-  if [[ ":ROG Ally RC71L:" =~ ":$SYS_ID:" ]]; then
-      echo 'Setting Ally logo menu'
-      dconf write /org/gnome/shell/extensions/Logo-menu/symbolic-icon true
-      dconf write /org/gnome/shell/extensions/Logo-menu/menu-button-icon-image 6
-  fi
-
   echo 'Setting up templates'
   TEMPLATES_DIR=$(/usr/bin/xdg-user-dir TEMPLATES || true)
   if [[ -z "$TEMPLATES_DIR" || "$TEMPLATES_DIR" == "$HOME" ]]; then