gamescope and lib32-gamescope package versions are mismatched

[matte-schwartz]

Your system information

• Steam client version: N/A
• SteamOS version: SteamOS 3.7
• Opted into Steam client beta?: Yes
• Opted into SteamOS beta?: Yes
• Have you checked for updates in Settings > System?: Yes

Please describe your issue in as much detail as possible:

When debugging gamescope issues, I've been told that the Gamescope WSI layer must be kept in sync with the Gamescope binary that it accompanies, and that this applies to both the 64-bit layer and the 32-bit layer (packaged as lib32-gamescope). However, on SteamOS the two packages are frequently mismatched. For example, on SteamOS Main right now:

(deck@rog-ally-x ~)$ sudo pacman -Qv gamescope
[sudo] password for deck: 
Root      : /
Conf File : /etc/pacman.conf
DB Path   : /usr/lib/holo/pacmandb/
Cache Dirs: /var/cache/pacman/pkg/  
Hook Dirs : /usr/share/libalpm/hooks/  /etc/pacman.d/hooks/  
Lock File : /usr/lib/holo/pacmandb/db.lck
Log File  : /var/log/pacman.log
GPG Dir   : /etc/pacman.d/gnupg/
Targets   : gamescope
gamescope 3.16.1-2

(deck@rog-ally-x ~)$ sudo pacman -Qv lib32-gamescope
Root      : /
Conf File : /etc/pacman.conf
DB Path   : /usr/lib/holo/pacmandb/
Cache Dirs: /var/cache/pacman/pkg/  
Hook Dirs : /usr/share/libalpm/hooks/  /etc/pacman.d/hooks/  
Lock File : /usr/lib/holo/pacmandb/db.lck
Log File  : /var/log/pacman.log
GPG Dir   : /etc/pacman.d/gnupg/
Targets   : lib32-gamescope
lib32-gamescope 3.14.11-1.1

there are multiple layer changes within those two versions that are shipped on the base image. This leads to scenarios where upstream behavior that should be reproducible on SteamOS is not reproducible, at least not without spinning up a new lib32-gamescope build yourself (one such case was while debugging ValveSoftware/gamescope#1718).

In the future, can we bump these packages together? Or at least as often as changes to layer/ get made in Gamescope.

The lib32-gamescope PKGBUILD only needed one tweak to build on the latest tag, otherwise it tries to install an empty script directory which conflicts with the PKGBUILD for gamescope:

From 9c6b03726797734137998162517a90025a560b89 Mon Sep 17 00:00:00 2001
From: Matthew Schwartz <[email protected]>
Date: Sat, 25 Jan 2025 15:37:45 -0800
Subject: [PATCH] fix build on latest tag

---
 lib32-gamescope/PKGBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib32-gamescope/PKGBUILD b/lib32-gamescope/PKGBUILD
index e3069a1..3e7876b 100644
--- a/lib32-gamescope/PKGBUILD
+++ b/lib32-gamescope/PKGBUILD
@@ -3,7 +3,7 @@
 # This is just for the Gamescope WSI layer.
 
 pkgname=lib32-gamescope
-_srctag=3.14.11
+_srctag=3.16.1
 pkgver=${_srctag//-/.}
 pkgrel=1
 pkgdesc="gaming shell based on Xwayland, powered by Vulkan and DRM (32-bit)"
@@ -38,6 +38,7 @@ package() {
 
 	DESTDIR="$pkgdir" meson install --skip-subprojects
 
+	rm -rf "$pkgdir"/usr/share/gamescope
 	rm -rf "$pkgdir"/usr/include
 	rm -rf "$pkgdir"/usr/lib/libwlroots*
 	rm -rf "$pkgdir"/usr/lib32/libwlroots*
-- 
2.48.1