Merge pull request 'Update to 3.6.11' (#11) from ateixeira/gamescope:factory into factory

- Update to version 3.16.11:
- stb and glm are now meson subprojects
  * Pull the upstream pinned revisions with tar_scm service
  * Unpack the sources manually
  * Remove BuildRequires for system glm and stb
  * Remove set_version service as it was choosing the stb version string as main package version

_service

@@ -1,9 +1,20 @@
 <?xml version="1.0"?>
 <services>
    <service name="tar_scm" mode="disabled">
-    <param name="url">https://github.com/Plagman/gamescope.git</param>
+    <param name="url">https://github.com/nothings/stb.git</param>
+    <param name="revision">5736b15f7ea0ffb08dd38af21067c314d6a3aae9</param>
+    <param name="scm">git</param>
+  </service>
+  <service name="tar_scm" mode="disabled">
+    <param name="url">https://github.com/g-truc/glm.git</param>
+    <param name="revision">0af55ccecd98d4e5a8d1fad7de25ba429d60e863</param>
+    <param name="scm">git</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+  </service>
+  <service name="tar_scm" mode="disabled">
+    <param name="url">https://github.com/Plagman/gamescope.git</param>
+    <param name="revision">refs/tags/3.16.11</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">refs/tags/3.15.11</param>
     <param name="scm">git</param>
     <param name="versionrewrite-pattern">([\.\d]+)</param>
     <param name="versionrewrite-replacement">\1</param>
@@ -13,5 +24,4 @@
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
-  <service mode="disabled" name="set_version"/>
 </services>

gamescope.changes

@@ -1,7 +1,149 @@
 -------------------------------------------------------------------
-Fri Sep 27 13:41:20 UTC 2024 - yunus.acar@suse.com
+Thu May 29 12:58:19 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
 
-- Update to version 3.15.11:
+- Update to version 3.16.11:
+  * steamcompmgr: workaround bug with mangohud repaints when VRR is active
+  * DRMBackend: Fix IsPaused
+  * submodules: bump misyl-wlroots to 54e8447
+  * WaylandBackend: Fix IsPaused return value
+  * steamcompmgr: Fix IsPaused check
+  * OpenVRBackend: initialize visibility state when creating the overlay.
+  * backend: Split IsVisible out into IsPaused
+  * vram cgroup: don't crash on startup if not present
+  * steamcompmgr: Use cgroup VRAM protection for focused windows
+  * steamcompmgr: Only do SteamControlled behaviour for true steam controlled, not just SteamMode
+  * steamcompmgr: Fix SteamControlled strategy for context focus behaviour
+  * steamcompmgr: Fix lifetime for previous virtual connector global focus
+  * steamcompmgr: Fix removing single connector virtual connector outputs
+  * wlserver: hack-y fix for tab character sometimes not working in global bindings
+  * wlserver: fix hotkey processing being broken in gamemode
+  * OpenVRBackend: Workaround for VREvent_ScrollSmooth events being dropped.
+  * OpenVRBackend: Add comment wrt. thread constructor ordering
+  * OpenVRBackend: Fix initialization order for atomics/threads
+- stb and glm are now meson subprojects
+  * Pull the upstream pinned revisions with tar_scm service
+  * Unpack the sources manually
+  * Remove BuildRequires for system glm and stb
+  * Remove set_version service as it was choosing the stb version string as main package version
+
+-------------------------------------------------------------------
+Wed May 14 20:02:04 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to version 3.16.7:
+  * build: ensure the same glm dependency is used for gamescope and layer
+  * build: Pull in glm in the same way we pull in stb
+  * steamcompmgr: Don't force vulkan_wait for the current seq no after pre-emption
+  * steamcompmgr: Fix corruption when getting out of pre-emptive upscaling
+  * steamcompmgr: Fix pre-emptive upscaling with scRGB
+  * Add support for broadcast RGB mode setting + DPMS
+  * build: Ship color-management-v1 ourselves
+  * WaylandBackend: fix scaling for TargetPrimaries
+  * WaylandBackend: Add wayland_hdr10_saturation_scale to play with
+  * WaylandBackend: Forward HDR Metadata to compositor
+  * WaylandBackend: Fix cursor grabbing
+  * WaylandBackend: Fix keyboard shortcuts
+  * WaylandBackend: Finish hooking up release WP Color Mgmt
+  * wlserver: Re-hook pausing on session pause
+  * protocol: Add gamescope-action-binding protocol
+  * main: Give error message on invalid integer or float argument
+  * WaylandBackend: Don't assert on non-xkb-v1 keymaps
+  * wlserver: Create a keyboard group to keep all externally connected keyboards in sync
+  * WaylandBackend: Support wp-color-management-v1
+  * script: add additional BOE panel
+  * script: Lenovo Legion Go S LCD display configuration
+  * Force wrap file usage for stb and glm dependencies
+  * steamcompmgr: Set receivedDoneCommit even if the commit is not for current surface in update_wayland_res().
+  * scripts: Search GAMESCOPE_SCRIPT_PATH for scripts
+  * script: fixup Ally config to support BOE panels
+  * WaylandBackend: prevent crash after closing window
+  * rendervulkan: Append VK_STRUCTURE_TYPE_WSI_MEMORY_ALLOCATE_INFO_MESA when creating scanout VkImages
+  * WaylandBackend: Set empty functions for unused data source events
+  * WaylandBackend: Fix initial scale for Wayland surfaces
+  * build: add workaround to build with CMake 4.0
+  * steamcompmgr: avoid a crash with pipewire+magnification
+  * steamcompmgr: check for connector before presenting
+  * DRMBackend: Expose data string from EDID to matches function
+  * wlserver: wlserver_run(): ensure waylock is released when wl_event_loop_dispatch returns ret<0
+  * DRMBackend: Read the EDID's modes for dynamic refresh rate modes by default
+  * script: GPD Win 4 display configuration
+  * script: Lenovo Legion Go LCD display configuration
+  * scripts: Derive script path from meson prefix
+  * steamcompmgr: VRR frame limiting
+  * steamcompmgr: Fix pipewire stream being incorrect size on external displays when scaled up
+  * DRMBackend: Fix crash when there are no connectors
+  * rendervulkan: Fix scaled YUV coming out weird
+  * steamcompmgr: Fix Steam sidebars with recent icon fix
+  * steamcompmgr: Fix some crashes with global focus
+  * wlserver: Fix synthetic cursor warps not triggering mouse visibility
+  * steamcompmgr: Fix icon/title being spam set
+  * steamcompmgr: Fix HDR/output caps enablement post-virtual connector refactor
+  * steamcompmgr: Accept any requested iconic state change.
+  * steamcompmgr: Set WM_STATE property on map and unmap notify events.
+  * main: cleanup args
+  * layer: Fix 32-bit layer crash
+  * backend: Fix assigning connector IDs
+  * WaylandBackend: copying to primary selection
+  * WaylandBackend: copying to clipboard
+  * nested: fix forwarding selections to the host
+  * WaylandBackend: Fix grabbing cursor since virtual connector refactor
+  * OpenVRBackend: Add command-line support for overlay click stabilization
+  * OpenVRBackend: disable special steamui controlbar. This functionality did not ship in steamvr.
+  * steamcompmgr: Fix warning
+  * Revert "OpenVRBackend: Disable explicit sync for now"
+  * OpenVRBackend: Handle quit more robustly
+  * mangoapp: plumb engineName
+  * OpenVRBackend: Add mutex around fb id tracking
+  * backend: Hack
+  * Revert "steamcompmgr: Fix crash when using magnifier and game recording"
+  * OpenVRBackend: Disable explicit sync for now
+  * GAMESCOPE_MANGOAPP_SOCKET_DISABLE added
+  * OpenVRBackend: Fix FPS limit not updating
+  * OpenVRBackend: Fix for dual/double frame jitter
+  * messagey: Add GAMESCOPE_ZENITY_DISABLE
+  * OpenVRBackend: Fix OverlayClosed when not in steam mode
+  * OpenVRBackend: Only override cursor if not in relative mode.
+  * OpenVRBackend: Support for physical mouse input controlling cursor
+  * LibInputHandler: Add support for scroll wheel
+  * LibInputHandler: add, hook up to vr-session-manager
+  * steamcompmgr: Fix Steam intergration with multiple virtual connectors
+  * SDLBackend: Fix with virtual connector backend
+  * OpenVRBackend: Fix crash with SteamVR input thread
+  * OpenVRBackend: Add logging for creating a new dashboard overlay
+  * steamcompmgr: Clean up g_VirtualConnectorFocuses before closing backend off
+  * OpenVRBackend: Add vr-app-overlay-key
+  * OpenVRBackend: Consider visible when an appid's scene app is visible
+  * OpenVRBackend: Add logging for overlay visible count
+  * OpeNVRBackend: Add vr_nudge_to_visible_per_connector
+  * main: Add --virtual-connector-strategy
+  * all: Support for multiple virtual connectors
+  * reshade: Add gamescope_always_paint flag
+  * reshade: Add gamescope_refresh_mhz
+  * rendervulkan: Fix initializing drm formats
+  * WaylandBackend: Fix hotkeys failing to bind on Wayland desktops
+
+-------------------------------------------------------------------
+Fri Jan 10 14:32:30 UTC 2025 - me@levitati.ng
+
+- Update to version 3.16.1:
+  * layer: Fix oldSwapchain when going in/out of XWayland bypassing
+  * steamcompmgr: Fix some shutdown hangs
+  * WaylandBackend: Filter more libdecor surfaces
+  * layer: Move strict -> ensure
+  * layer: Force up swapchain minImageCount
+  * WaylandBackend: Ignore events on unknown surfaces
+  * WaylandBackend: Fix scale equation and unscale libdecor frame commit
+  * rendervulkan: Fix a CVulkanCmdBuffer leak that could result in screenshot request failures
+  * DRMBackend: Add libliftoff log handler
+  * Fixed conversion from RGB to full range BT.709 YCbCr
+
+-------------------------------------------------------------------
+Mon Dec 02 18:17:00 UTC 2024 - antonio.teixeira@suse.com
+
+- Update to version 3.15.14:
+  * Fix a CVulkanCmdBuffer leak that could result in screenshot request failures
+  * Fixed conversion from RGB to full range BT.709 YCbCr
+  * Use the correct colorspace for YUV capture
+  * Removed GAMESCOPE_NV12_COLORSPACE default
   * Add clipboard support from SDL backend
   * Fix how reshade effects are cleared
   * WaylandResource: Fix deleting resource
@@ -12,6 +154,15 @@ Fri Sep 27 13:41:20 UTC 2024 - yunus.acar@suse.com
   * steamcompmgr: Disregard XWayland commits if we have an override surface and there was no damage
   * build: fix meson compiler warning
   * steamcompmgr: Add some logic for picking commits if we have an override w/ WSI layer
+  * layer: Send VK_ERROR_OUT_OF_DATE when window size changes on X11
+  * steamcompmgr: Add logging for when pipewire focus appid changes
+  * pipewire: Fix truncation of SPA_FORMAT_VIDEO_gamescope_focus_appid
+  * backend, rendervulkan: Use DRM format for output format on backend
+  * Add gamescope-reshade Wayland interface (#1495)
+  * build: add compiler information to gamescope_version
+  * drm: fix wrong degamma/shaper TFs on NV12
+  * steamcompmgr: Advertise UTF8_STRING in clipboard TARGETS.
+  * pipewire: cmpxchng in_buffer + out_buffer to nullptr if they equal to buffer
 
 -------------------------------------------------------------------
 Fri Sep 13 13:56:01 UTC 2024 - llyyr@yukari.in

gamescope.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gamescope
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,15 @@
 
 %bcond_without  intree_libs
 Name:           gamescope
-Version:        3.15.11
+Version:        3.16.11
 Release:        0
 Summary:        Micro-compositor optimized for running video games on Wayland
 License:        BSD-2-Clause
 Group:          Amusements/Games/Other
 URL:            https://github.com/Plagman/gamescope
 Source:         %{name}-%{version}.tar.xz
+Source1:        stb-1675018027.5736b15.tar.xz
+Source2:        glm-1.0.1.tar.xz
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  glslang-devel
@@ -32,7 +34,6 @@ BuildRequires:  meson
 BuildRequires:  pkgconfig
 # for git describe
 BuildRequires:  git
-BuildRequires:  stb-devel
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xmu)
 # for xxd
@@ -45,7 +46,6 @@ BuildRequires:  pkgconfig(libliftoff)
 BuildRequires:  pkgconfig(openvr)
 %endif
 BuildRequires:  pkgconfig(benchmark)
-BuildRequires:  pkgconfig(glm)
 BuildRequires:  pkgconfig(hwdata)
 BuildRequires:  pkgconfig(libavif)
 BuildRequires:  pkgconfig(libcap)
@@ -82,6 +82,7 @@ BuildRequires:  pkgconfig(libinput) >= 1.14.0
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libseat)
 BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(luajit)
 BuildRequires:  pkgconfig(pixman-1)
 BuildRequires:  pkgconfig(vulkan) >= 1.2.182
 BuildRequires:  pkgconfig(wayland-client)
@@ -108,11 +109,23 @@ BuildRequires:  pkgconfig(xkbcommon)
 %prep
 %autosetup -p1
 
+pushd subprojects || exit 1
+# Unpack stb
+mkdir stb
+tar -xf %{SOURCE1} -C stb --strip-components=1
+
+# Unpack glm
+mkdir glm
+tar -xf %{SOURCE2} -C glm --strip-components=1
+popd || exit 1
+
 %build
 %if 0%{?suse_version} < 1599
 sed -i "s|dependency('stb')|declare_dependency(include_directories: include_directories('/usr/include/stb'))|g" src/meson.build
 %endif
 sed -i "s|#include <libei-1.0/libeis.h>|#include <libeis.h>|g" src/InputEmulation.cpp
+meson subprojects packagefiles --apply
+
 %meson \
   -Dpipewire=enabled \
 %{nil}
@@ -135,5 +148,9 @@ sed -i "s|#include <libei-1.0/libeis.h>|#include <libeis.h>|g" src/InputEmulatio
 %{_libdir}/libVkLayer_FROG_gamescope_wsi_%{_arch}.so
 %dir %{_datadir}/vulkan/implicit_layer.d/
 %{_datadir}/vulkan/implicit_layer.d/VkLayer_FROG_gamescope_wsi.%{_arch}.json
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/scripts/
+%{_datadir}/%{name}/scripts/00-gamescope
+%doc %{_datadir}/%{name}/scripts/README.md
 
 %changelog