Accepting request 1172995 from games:tools

OBS-URL: https://build.opensuse.org/request/show/1172995
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gamescope?expand=0&rev=13

_service

@@ -3,7 +3,6 @@
   <service name="tar_scm" mode="disabled">
     <param name="url">https://github.com/Plagman/gamescope.git</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">jupiter-3.6</param>
     <param name="scm">git</param>
     <param name="versionrewrite-pattern">([\.\d]+)</param>
     <param name="versionrewrite-replacement">\1</param>

gamescope-3.14.13.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3346ce23560891192bd25a3c77f7c8d722a9d7c0f719fe17ccd895ff1359ac69
+size 102554340

gamescope-3.14.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d6d165348aca63274a0d61e18595f70c1bb2a2c812811390d97d3e11b3132229
-size 102572904

gamescope.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed May 08 13:35:00 UTC 2024 - antonio.teixeira@suse.com
+
+- Update to version 3.14.13:
+  * wlserver: Fix content overrides for reparented windows
+  * drm: Add drm_debug_disable_in_fence_fd convar
+  * wlserver: Cursor constraint improvements
+  * wlserver: Add affirmative log that libei started
+  * layer: Fix double ptr in RemoveFromChain (and add vkroots checks)
+  * rendervulkan, shaders: Fix mura correction with FSR + NIS
+  * InputEmulation: Add missing break to {START,STOP}_EMULATING
+  * layer: Fix crash with frame limiter aware
+  * reshade: added helper lambda: matchesAnnotationName
+  * reshade: prefer ranges + bind_front over custom lambda
+- Add upstream patch libliftoff-fix-gcc14-calloc-transposed-args.patch
+  * Fix libliftoff builds with gcc14
+
 -------------------------------------------------------------------
 Thu Apr 25 14:16:52 UTC 2024 - antonio.teixeira@suse.com
 

gamescope.spec

@@ -18,13 +18,15 @@
 
 %bcond_without  intree_libs
 Name:           gamescope
-Version:        3.14.6
+Version:        3.14.13
 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
+# PATCH-FIX-UPSTREAM libliftoff-fix-gcc14-calloc-transposed-args.patch -- Fixes libliftoff build with gcc14
+Patch1:         libliftoff-fix-gcc14-calloc-transposed-args.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  glslang-devel

libliftoff-fix-gcc14-calloc-transposed-args.patch

@@ -0,0 +1,37 @@
+From 29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Thu, 21 Dec 2023 20:15:29 +0000
+Subject: [PATCH] layer.c: fix build against upcoming `gcc-14`
+ (`-Werror=calloc-transposed-args`)
+
+`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
+detected minor infelicity in `calloc()` API usage in `libliftoff`:
+
+    ../layer.c: In function 'liftoff_layer_create':
+    ../layer.c:20:48: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in t
+    ument [-Werror=calloc-transposed-args]
+       20 |         layer->candidate_planes = calloc(sizeof(layer->candidate_planes[0]),
+          |                                                ^
+    ../layer.c:20:48: note: earlier argument should specify number of elements, later size of each element
+---
+ layer.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/subprojects/libliftoff/layer.c b/subprojects/libliftoff/layer.c
+index 73a8186..6510ea7 100644
+--- a/subprojects/libliftoff/layer.c
++++ b/subprojects/libliftoff/layer.c
+@@ -17,8 +17,8 @@ liftoff_layer_create(struct liftoff_output *output)
+ 		return NULL;
+ 	}
+ 	layer->output = output;
+-	layer->candidate_planes = calloc(sizeof(layer->candidate_planes[0]),
+-					 output->device->planes_cap);
++	layer->candidate_planes = calloc(output->device->planes_cap,
++					 sizeof(layer->candidate_planes[0]));
+ 	if (layer->candidate_planes == NULL) {
+ 		liftoff_log_errno(LIFTOFF_ERROR, "calloc");
+ 		free(layer);
+-- 
+GitLab
+