Re: [PR PATCH] [Updated] New package: gamescope-3.14.0

[dexgs <dexgs@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1371 bytes --]

There is an updated pull request by dexgs against master on the void-packages repository

https://github.com/dexgs/void-packages gamescope
https://github.com/void-linux/void-packages/pull/48354

New package: gamescope-3.14.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
Add Valve's Gamescope as requested in #36869. If this is merged, `steamos-compositor` should probably be removed from the repository at some point.

This PR also adds `libliftoff` as a dependency. Gamescope also vendors some dependencies, but I believe I've handled this correctly.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/48354.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gamescope-48354.patch --]
[-- Type: text/x-diff, Size: 6037 bytes --]

From 82fe4b6e6f05cc735820002ebbbc7ceb0618d7c8 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Wed, 24 Jan 2024 11:37:33 -0500
Subject: [PATCH 1/2] New package: libliftoff-0.4.1

---
 common/shlibs               |  1 +
 srcpkgs/libliftoff-devel    |  1 +
 srcpkgs/libliftoff/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libliftoff-devel
 create mode 100644 srcpkgs/libliftoff/template

diff --git a/common/shlibs b/common/shlibs
index c75bfe2670907..f4888d3585ff5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4272,3 +4272,4 @@ libsqsh.so.1 libsqsh-1.3.0_1
 libunicode.so.0.4 libunicode-0.4.0_1
 libunicode_ucd.so.0.4 libunicode-0.4.0_1
 libunicode_loader.so.0.4 libunicode-0.4.0_1
+libliftoff.so.0 libliftoff-0.4.1_1
diff --git a/srcpkgs/libliftoff-devel b/srcpkgs/libliftoff-devel
new file mode 120000
index 0000000000000..977a28aa78d3c
--- /dev/null
+++ b/srcpkgs/libliftoff-devel
@@ -0,0 +1 @@
+libliftoff
\ No newline at end of file
diff --git a/srcpkgs/libliftoff/template b/srcpkgs/libliftoff/template
new file mode 100644
index 0000000000000..393ed0cd738b7
--- /dev/null
+++ b/srcpkgs/libliftoff/template
@@ -0,0 +1,35 @@
+# Template file for 'libliftoff'
+pkgname=libliftoff
+version=0.4.1
+revision=1
+build_style=meson
+configure_args="-Dc_args=-Wno-error=unused-but-set-variable"
+hostmakedepends="pkg-config"
+makedepends="libdrm-devel"
+short_desc="Lightweight KMS plane library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://gitlab.freedesktop.org/emersion/libliftoff"
+distfiles="https://gitlab.freedesktop.org/emersion/libliftoff/-/archive/v${version}/libliftoff-v${version}.tar.gz"
+checksum=44ec5cfdd0df040d1023d4d6a48b23c31f21ce61ee2347da9e1ca244fe24dd1c
+
+# The provided test suite fails when NDEBUG is defined, but Meson does not
+# provide a simple way to exclude single tests, so this is required.
+do_check() {
+	test_list=$(meson test -C build --list)
+	meson test -C build ${test_list//check_ndebug}
+}
+
+post_install() {
+	vlicense LICENSE
+}
+
+libliftoff-devel_package() {
+	depends="libliftoff>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 363fa56d0afe881be3e94fcb2a067fda5ebb1cc2 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Wed, 24 Jan 2024 11:40:06 -0500
Subject: [PATCH 2/2] New package: gamescope-3.14.0

---
 .../0002-use-system-SPIRV-Headers.patch       | 25 +++++++++++
 srcpkgs/gamescope/template                    | 43 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 srcpkgs/gamescope/patches/0002-use-system-SPIRV-Headers.patch
 create mode 100644 srcpkgs/gamescope/template

diff --git a/srcpkgs/gamescope/patches/0002-use-system-SPIRV-Headers.patch b/srcpkgs/gamescope/patches/0002-use-system-SPIRV-Headers.patch
new file mode 100644
index 0000000000000..63063955d86e8
--- /dev/null
+++ b/srcpkgs/gamescope/patches/0002-use-system-SPIRV-Headers.patch
@@ -0,0 +1,25 @@
+From 1dd1cc1fd6ee0feb7f1caf34873e67ed8568c650 Mon Sep 17 00:00:00 2001
+From: Dexter Gaon-Shatford <dexter@gaonshatford.ca>
+Date: Sun, 12 Nov 2023 10:24:22 -0500
+Subject: [PATCH] use system SPIRV-Headers
+
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 60d6b5a..db54651 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -94,7 +94,7 @@ reshade_src = [
+ reshade_include = include_directories([
+   'reshade/source',
+   'reshade/include',
+-  '../thirdparty/SPIRV-Headers/include/spirv/unified1'
++  '/usr/include/spirv/unified1'
+ ])
+ 
+ src = [
+-- 
+2.42.0
+
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 0000000000000..b74f32df5fec6
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,43 @@
+# Template file for 'gamescope'
+pkgname=gamescope
+version=3.14.0
+revision=1
+_stb_hash=5736b15f7ea0ffb08dd38af21067c314d6a3aae9
+_vkroots_hash=d5ef31abc7cb5c69aee4bcb67b10dd543c1ff7ac
+_reshade_hash=9fdbea6892f9959fdc18095d035976c574b268b7
+build_style=meson
+configure_args="-Denable_openvr_support=false --force-fallback-for="
+hostmakedepends="cmake pkg-config glslang wayland-scanner++"
+makedepends="pipewire-devel Vulkan-Headers SPIRV-Headers libX11-devel
+ libXdamage-devel libXcomposite-devel libXrender-devel libXxf86vm-devel
+ libXtst-devel libXres-devel libdrm-devel vulkan-loader wayland-devel
+ wayland-protocols libxkbcommon-devel libcap-devel SDL2-devel hwids
+ wlroots0.17-devel libliftoff-devel glm libXmu-devel libdisplay-info-devel
+ benchmark-devel libavif-devel"
+depends="xorg-server-xwayland"
+short_desc="SteamOS session compositing window manager"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+license="BSD-2-Clause, BSD-3-Clause, MIT"
+homepage="https://github.com/ValveSoftware/gamescope"
+distfiles="https://github.com/ValveSoftware/gamescope/archive/refs/tags/${version}.tar.gz
+ https://github.com/nothings/stb/archive/${_stb_hash}.tar.gz
+ https://github.com/Joshua-Ashton/vkroots/archive/${_vkroots_hash}.tar.gz
+ https://github.com/Joshua-Ashton/reshade/archive/${_reshade_hash}.tar.gz"
+checksum="f7cca4ef1786a34496d436cf233f24d28746da7a0f29d3d3f645ac29f1009381
+ d00921d49b06af62aa6bfb97c1b136bec661dd11dd4eecbcb0da1f6da7cedb4c
+ b4eca5edca75355ea1443ad96fd59b0a407f6a2ce17ef5a8f9849c05fc10155f
+ 165726ad21fbfc221c0363e40b597834068a416a11a1204ae2ac6d13ec161035"
+
+post_extract() {
+	mv gamescope-${version}/* .
+	mv -T stb-${_stb_hash} subprojects/stb
+	mv subprojects/packagefiles/stb/meson.build subprojects/stb
+	mv -T vkroots-${_vkroots_hash} subprojects/vkroots
+	mv -T reshade-${_reshade_hash} src/reshade
+}
+
+post_install() {
+	vlicense LICENSE
+	vlicense subprojects/vkroots/LICENSES/MIT.txt LICENSE.vkroots
+	vlicense src/reshade/LICENSE.md LICENSE.reshade
+}