* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
@ 2024-01-24 17:34 ` dexgs
2024-01-24 23:09 ` dexgs
` (41 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-24 17:34 UTC (permalink / raw)
To: ml
[-- 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: 6012 bytes --]
From 67f6c69460aff88206f313cae03b907752c8a43c 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..f04fa618e14c9
--- /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 06a05274f4f000db9e00fd1e5e8b62a4e8f523fe 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..d41628bc8f0ca
--- /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="pkg-config glslang"
+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
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
2024-01-24 17:34 ` [PR PATCH] [Updated] " dexgs
@ 2024-01-24 23:09 ` dexgs
2024-01-24 23:13 ` dexgs
` (40 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-24 23:09 UTC (permalink / raw)
To: ml
[-- 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: 6013 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 7cddf4ca57b3173a503abe7b1a09f0cffbacec76 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..d41628bc8f0ca
--- /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="pkg-config glslang"
+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
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
2024-01-24 17:34 ` [PR PATCH] [Updated] " dexgs
2024-01-24 23:09 ` dexgs
@ 2024-01-24 23:13 ` dexgs
2024-01-24 23:32 ` dexgs
` (39 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-24 23:13 UTC (permalink / raw)
To: ml
[-- 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: 6019 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 6fed308d53191fd1fc2948fa7c2408ef7792cfaa 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..d3966728d3cad
--- /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"
+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
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (2 preceding siblings ...)
2024-01-24 23:13 ` dexgs
@ 2024-01-24 23:32 ` dexgs
2024-01-24 23:37 ` dexgs
` (38 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-24 23:32 UTC (permalink / raw)
To: ml
[-- 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
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (3 preceding siblings ...)
2024-01-24 23:32 ` dexgs
@ 2024-01-24 23:37 ` dexgs
2024-01-24 23:51 ` dexgs
` (37 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-24 23:37 UTC (permalink / raw)
To: ml
[-- 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: 6019 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 4e511f10a8f84d133512b71bbc541f5dbf4f6746 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..d3966728d3cad
--- /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"
+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
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (4 preceding siblings ...)
2024-01-24 23:37 ` dexgs
@ 2024-01-24 23:51 ` dexgs
2024-01-31 2:37 ` [PR REVIEW] " classabbyamp
` (36 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-24 23:51 UTC (permalink / raw)
To: ml
[-- 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: 6089 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 345463b7e93a1ef41e00cd0344cd4a1e00ead825 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 | 47 +++++++++++++++++++
2 files changed, 72 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..d2ebed61a4c90
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,47 @@
+# 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 glslang pkg-config SPIRV-Headers"
+makedepends="pipewire-devel Vulkan-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"
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" wayland-devel"
+fi
+
+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
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (5 preceding siblings ...)
2024-01-24 23:51 ` dexgs
@ 2024-01-31 2:37 ` classabbyamp
2024-01-31 2:37 ` classabbyamp
` (35 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-01-31 2:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1472234533
Comment:
this should be relative to XBPS_CROSS_BASE, so maybe a vsed would be better (would probably remove the need for spirv-headers on host)
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (6 preceding siblings ...)
2024-01-31 2:37 ` [PR REVIEW] " classabbyamp
@ 2024-01-31 2:37 ` classabbyamp
2024-01-31 2:37 ` classabbyamp
` (34 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-01-31 2:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1472233713
Comment:
new packages should not be orphaned
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (7 preceding siblings ...)
2024-01-31 2:37 ` classabbyamp
@ 2024-01-31 2:37 ` classabbyamp
2024-01-31 2:37 ` classabbyamp
` (33 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-01-31 2:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1472232611
Comment:
just add this above, it's deduplicated on not-cross
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (8 preceding siblings ...)
2024-01-31 2:37 ` classabbyamp
@ 2024-01-31 2:37 ` classabbyamp
2024-01-31 2:37 ` classabbyamp
` (32 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-01-31 2:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1472233046
Comment:
you should be able to use vsrcextract for this (see manual.md)
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (9 preceding siblings ...)
2024-01-31 2:37 ` classabbyamp
@ 2024-01-31 2:37 ` classabbyamp
2024-01-31 2:37 ` classabbyamp
` (31 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-01-31 2:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1472233979
Comment:
why does it also need cmake?
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (10 preceding siblings ...)
2024-01-31 2:37 ` classabbyamp
@ 2024-01-31 2:37 ` classabbyamp
2024-01-31 14:35 ` [PR PATCH] [Updated] " dexgs
` (30 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-01-31 2:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1472236032
Comment:
could this be set as CFLAGS=... in the template?
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (11 preceding siblings ...)
2024-01-31 2:37 ` classabbyamp
@ 2024-01-31 14:35 ` dexgs
2024-01-31 14:36 ` dexgs
` (29 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-31 14:35 UTC (permalink / raw)
To: ml
[-- 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: 5262 bytes --]
From 9ae375701ea8b67f773973054c00c56065b1ef62 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 | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 38 insertions(+)
create mode 120000 srcpkgs/libliftoff-devel
create mode 100644 srcpkgs/libliftoff/template
diff --git a/common/shlibs b/common/shlibs
index 71f172740e5c6..44aa2bb5cc6d9 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..dfcd80627dcea
--- /dev/null
+++ b/srcpkgs/libliftoff/template
@@ -0,0 +1,36 @@
+# Template file for 'libliftoff'
+pkgname=libliftoff
+version=0.4.1
+revision=1
+build_style=meson
+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
+
+CFLAGS="-Wno-error=unused-but-set-variable"
+
+# 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 9a2353dcd259027ef2f473842d4f78253df53be9 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
---
srcpkgs/gamescope/template | 55 ++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 srcpkgs/gamescope/template
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 0000000000000..1d0febe9f5a59
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,55 @@
+# 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="glslang pkg-config"
+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-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"
+skip_extraction="${_stb_hash}.tar.gz
+ ${_vkroots_hash}.tar.gz
+ ${_reshade_hash}.tar.gz"
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" wayland-devel"
+fi
+
+post_extract() {
+ vsrcextract -C subprojects/stb ${_stb_hash}.tar.gz
+ cp subprojects/packagefiles/stb/meson.build subprojects/stb
+ vsrcextract -C subprojects/vkroots ${_vkroots_hash}.tar.gz
+ vsrcextract -C src/reshade ${_reshade_hash}.tar.gz
+}
+
+post_patch() {
+ vendor_spirv="../thirdparty/SPIRV-Headers/include/spirv/unified1"
+ system_spirv="${XBPS_CROSS_BASE}/usr/include/spirv/unified1"
+ vsed -i src/meson.build -e "s|${vendor_spirv}|${system_spirv}|"
+}
+
+post_install() {
+ vlicense LICENSE
+ vlicense subprojects/vkroots/LICENSES/MIT.txt LICENSE.vkroots
+ vlicense src/reshade/LICENSE.md LICENSE.reshade
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (12 preceding siblings ...)
2024-01-31 14:35 ` [PR PATCH] [Updated] " dexgs
@ 2024-01-31 14:36 ` dexgs
2024-01-31 14:38 ` dexgs
` (28 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-31 14:36 UTC (permalink / raw)
To: ml
[-- 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: 5283 bytes --]
From cbddf34f58b4098f420d4138a1bf6ca6837d7e33 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 | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 38 insertions(+)
create mode 120000 srcpkgs/libliftoff-devel
create mode 100644 srcpkgs/libliftoff/template
diff --git a/common/shlibs b/common/shlibs
index 71f172740e5c6..44aa2bb5cc6d9 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..2d0a183494699
--- /dev/null
+++ b/srcpkgs/libliftoff/template
@@ -0,0 +1,36 @@
+# Template file for 'libliftoff'
+pkgname=libliftoff
+version=0.4.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libdrm-devel"
+short_desc="Lightweight KMS plane library"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+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
+
+CFLAGS="-Wno-error=unused-but-set-variable"
+
+# 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 98343a684a07794ddc2b6a758f1b2b6e55d888b8 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
---
srcpkgs/gamescope/template | 55 ++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 srcpkgs/gamescope/template
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 0000000000000..1d0febe9f5a59
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,55 @@
+# 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="glslang pkg-config"
+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-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"
+skip_extraction="${_stb_hash}.tar.gz
+ ${_vkroots_hash}.tar.gz
+ ${_reshade_hash}.tar.gz"
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" wayland-devel"
+fi
+
+post_extract() {
+ vsrcextract -C subprojects/stb ${_stb_hash}.tar.gz
+ cp subprojects/packagefiles/stb/meson.build subprojects/stb
+ vsrcextract -C subprojects/vkroots ${_vkroots_hash}.tar.gz
+ vsrcextract -C src/reshade ${_reshade_hash}.tar.gz
+}
+
+post_patch() {
+ vendor_spirv="../thirdparty/SPIRV-Headers/include/spirv/unified1"
+ system_spirv="${XBPS_CROSS_BASE}/usr/include/spirv/unified1"
+ vsed -i src/meson.build -e "s|${vendor_spirv}|${system_spirv}|"
+}
+
+post_install() {
+ vlicense LICENSE
+ vlicense subprojects/vkroots/LICENSES/MIT.txt LICENSE.vkroots
+ vlicense src/reshade/LICENSE.md LICENSE.reshade
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (13 preceding siblings ...)
2024-01-31 14:36 ` dexgs
@ 2024-01-31 14:38 ` dexgs
2024-01-31 16:17 ` [PR REVIEW] " classabbyamp
` (27 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-31 14:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1919235010
Comment:
@classabbyamp I've pushed changes with your corrections
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (14 preceding siblings ...)
2024-01-31 14:38 ` dexgs
@ 2024-01-31 16:17 ` classabbyamp
2024-01-31 16:17 ` classabbyamp
` (26 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-01-31 16:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1473092843
Comment:
```suggestion
local _vendor_spirv="../thirdparty/SPIRV-Headers/include/spirv/unified1"
local _system_spirv="${XBPS_CROSS_BASE}/usr/include/spirv/unified1"
vsed -i src/meson.build -e "s|${_vendor_spirv}|${_system_spirv}|"
```
but this could also be done without variables. it's fine if it's a long line in this case
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (15 preceding siblings ...)
2024-01-31 16:17 ` [PR REVIEW] " classabbyamp
@ 2024-01-31 16:17 ` classabbyamp
2024-01-31 16:17 ` classabbyamp
` (25 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-01-31 16:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1473096288
Comment:
could we just rm the files for this check in pre_check()?
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (16 preceding siblings ...)
2024-01-31 16:17 ` classabbyamp
@ 2024-01-31 16:17 ` classabbyamp
2024-01-31 16:17 ` classabbyamp
` (24 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-01-31 16:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1473097041
Comment:
quote the variables here
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (17 preceding siblings ...)
2024-01-31 16:17 ` classabbyamp
@ 2024-01-31 16:17 ` classabbyamp
2024-01-31 16:40 ` [PR PATCH] [Updated] " dexgs
` (23 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-01-31 16:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1473098202
Comment:
this shouldn't need to be in a conditional, put it in hostmakedepends at the top
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (18 preceding siblings ...)
2024-01-31 16:17 ` classabbyamp
@ 2024-01-31 16:40 ` dexgs
2024-01-31 16:42 ` dexgs
` (22 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-31 16:40 UTC (permalink / raw)
To: ml
[-- 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: 5206 bytes --]
From 159a66e1dfc0499e91a8ee81afd0598f35326b0a 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 71f172740e5c6..44aa2bb5cc6d9 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..fb688f527d03d
--- /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
+hostmakedepends="pkg-config"
+makedepends="libdrm-devel"
+short_desc="Lightweight KMS plane library"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+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
+
+CFLAGS="-Wno-error=unused-but-set-variable"
+
+post_extract() {
+ # The test suite checks for NDEBUG and fails if it is defined, even if all
+ # other tests would pass. Therefore, skip the 'check_ndebug' test.
+ vsed -i test/meson.build -e "s/test('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 ac64ed96b30086806747c3290e74994b1b549ddb 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
---
srcpkgs/gamescope/template | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 srcpkgs/gamescope/template
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 0000000000000..e84ac7073dcae
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,50 @@
+# 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="glslang pkg-config wayland-devel"
+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-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"
+skip_extraction="${_stb_hash}.tar.gz
+ ${_vkroots_hash}.tar.gz
+ ${_reshade_hash}.tar.gz"
+
+post_extract() {
+ vsrcextract -C subprojects/stb "${_stb_hash}.tar.gz"
+ cp subprojects/packagefiles/stb/meson.build subprojects/stb
+ vsrcextract -C subprojects/vkroots "${_vkroots_hash}.tar.gz"
+ vsrcextract -C src/reshade "${_reshade_hash}.tar.gz"
+}
+
+post_patch() {
+ # Use system SPIRV headers rather than gamescope's vendored headers
+ vsed -i src/meson.build -e "s|../thirdparty/SPIRV-Headers/include/spirv/unified1|${XBPS_CROSS_BASE}/usr/include/spirv/unified1|"
+}
+
+post_install() {
+ vlicense LICENSE
+ vlicense subprojects/vkroots/LICENSES/MIT.txt LICENSE.vkroots
+ vlicense src/reshade/LICENSE.md LICENSE.reshade
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (19 preceding siblings ...)
2024-01-31 16:40 ` [PR PATCH] [Updated] " dexgs
@ 2024-01-31 16:42 ` dexgs
2024-02-01 0:17 ` classabbyamp
` (21 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-01-31 16:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1919488131
Comment:
@classabbyamp Done. I think deleting the check_ndebug files in libliftoff would break the build, so I removed the test by deleting a line from the meson.build in post_extract().
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (20 preceding siblings ...)
2024-01-31 16:42 ` dexgs
@ 2024-02-01 0:17 ` classabbyamp
2024-02-01 0:19 ` [PR PATCH] [Updated] " dexgs
` (20 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-02-01 0:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1920235803
Comment:
post_patch would be a better place but the solution is fine by me
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (21 preceding siblings ...)
2024-02-01 0:17 ` classabbyamp
@ 2024-02-01 0:19 ` dexgs
2024-02-01 0:19 ` dexgs
` (19 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-01 0:19 UTC (permalink / raw)
To: ml
[-- 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: 5204 bytes --]
From 2e88bd369fe72b4927c94ed30a15f3769153d340 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 71f172740e5c6..44aa2bb5cc6d9 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..843748055fcad
--- /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
+hostmakedepends="pkg-config"
+makedepends="libdrm-devel"
+short_desc="Lightweight KMS plane library"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+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
+
+CFLAGS="-Wno-error=unused-but-set-variable"
+
+post_patch() {
+ # The test suite checks for NDEBUG and fails if it is defined, even if all
+ # other tests would pass. Therefore, skip the 'check_ndebug' test.
+ vsed -i test/meson.build -e "s/test('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 28f4e98f354c2d3c7c207e80c2bd1adf3d802987 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
---
srcpkgs/gamescope/template | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 srcpkgs/gamescope/template
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 0000000000000..e84ac7073dcae
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,50 @@
+# 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="glslang pkg-config wayland-devel"
+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-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"
+skip_extraction="${_stb_hash}.tar.gz
+ ${_vkroots_hash}.tar.gz
+ ${_reshade_hash}.tar.gz"
+
+post_extract() {
+ vsrcextract -C subprojects/stb "${_stb_hash}.tar.gz"
+ cp subprojects/packagefiles/stb/meson.build subprojects/stb
+ vsrcextract -C subprojects/vkroots "${_vkroots_hash}.tar.gz"
+ vsrcextract -C src/reshade "${_reshade_hash}.tar.gz"
+}
+
+post_patch() {
+ # Use system SPIRV headers rather than gamescope's vendored headers
+ vsed -i src/meson.build -e "s|../thirdparty/SPIRV-Headers/include/spirv/unified1|${XBPS_CROSS_BASE}/usr/include/spirv/unified1|"
+}
+
+post_install() {
+ vlicense LICENSE
+ vlicense subprojects/vkroots/LICENSES/MIT.txt LICENSE.vkroots
+ vlicense src/reshade/LICENSE.md LICENSE.reshade
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (22 preceding siblings ...)
2024-02-01 0:19 ` [PR PATCH] [Updated] " dexgs
@ 2024-02-01 0:19 ` dexgs
2024-02-01 0:33 ` classabbyamp
` (18 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-01 0:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 144 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1920237758
Comment:
Done
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (23 preceding siblings ...)
2024-02-01 0:19 ` dexgs
@ 2024-02-01 0:33 ` classabbyamp
2024-02-01 2:08 ` dexgs
` (17 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-02-01 0:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 595 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1920252372
Comment:
```diff
/usr/bin/gamescope
-/usr/include/vkroots.h
/usr/lib/libVkLayer_FROG_gamescope_wsi_x86_64.so
-/usr/lib/pkgconfig/vkroots.pc
/usr/share/licenses/gamescope/LICENSE
-/usr/share/licenses/gamescope/LICENSE.reshade
-/usr/share/licenses/gamescope/LICENSE.vkroots
/usr/share/vulkan/implicit_layer.d/VkLayer_FROG_gamescope_wsi.x86_64.json
```
based on what other distros are doing, I don't think those files are necessary in the package
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (24 preceding siblings ...)
2024-02-01 0:33 ` classabbyamp
@ 2024-02-01 2:08 ` dexgs
2024-02-01 2:09 ` dexgs
` (16 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-01 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1920359246
Comment:
> based on what other distros are doing, I don't think those files are necessary in the package
I understand why not to include the pkgconfig/header files for the vendored vkroots, but why not include the licenses of the vendored dependencies?
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (25 preceding siblings ...)
2024-02-01 2:08 ` dexgs
@ 2024-02-01 2:09 ` dexgs
2024-02-02 14:08 ` [PR PATCH] [Updated] " dexgs
` (15 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-01 2:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1920359246
Comment:
> based on what other distros are doing, I don't think those files are necessary in the package
I understand why not to include the pkgconfig/header files for the vendored vkroots, but why not include the licenses of the vendored dependencies?
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (26 preceding siblings ...)
2024-02-01 2:09 ` dexgs
@ 2024-02-02 14:08 ` dexgs
2024-02-02 14:09 ` dexgs
` (14 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-02 14:08 UTC (permalink / raw)
To: ml
[-- 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: 5173 bytes --]
From 2e88bd369fe72b4927c94ed30a15f3769153d340 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 71f172740e5c6..44aa2bb5cc6d9 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..843748055fcad
--- /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
+hostmakedepends="pkg-config"
+makedepends="libdrm-devel"
+short_desc="Lightweight KMS plane library"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+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
+
+CFLAGS="-Wno-error=unused-but-set-variable"
+
+post_patch() {
+ # The test suite checks for NDEBUG and fails if it is defined, even if all
+ # other tests would pass. Therefore, skip the 'check_ndebug' test.
+ vsed -i test/meson.build -e "s/test('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 0447b8adc2b8a588b7bbaf0458d6b7ed9d3e2caa 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
---
srcpkgs/gamescope/template | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 srcpkgs/gamescope/template
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 0000000000000..b83cebaec9102
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,50 @@
+# 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="glslang pkg-config wayland-devel"
+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-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"
+skip_extraction="${_stb_hash}.tar.gz
+ ${_vkroots_hash}.tar.gz
+ ${_reshade_hash}.tar.gz"
+
+post_extract() {
+ vsrcextract -C subprojects/stb "${_stb_hash}.tar.gz"
+ cp subprojects/packagefiles/stb/meson.build subprojects/stb
+ vsrcextract -C subprojects/vkroots "${_vkroots_hash}.tar.gz"
+ vsrcextract -C src/reshade "${_reshade_hash}.tar.gz"
+}
+
+post_patch() {
+ # Use system SPIRV headers rather than gamescope's vendored headers
+ vsed -i src/meson.build -e "s|../thirdparty/SPIRV-Headers/include/spirv/unified1|${XBPS_CROSS_BASE}/usr/include/spirv/unified1|"
+}
+
+post_install() {
+ vlicense LICENSE
+ rm ${DESTDIR}/usr/lib/pkgconfig/vkroots.pc
+ rm ${DESTDIR}/usr/include/vkroots.h
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (27 preceding siblings ...)
2024-02-02 14:08 ` [PR PATCH] [Updated] " dexgs
@ 2024-02-02 14:09 ` dexgs
2024-02-11 16:26 ` [PR PATCH] [Updated] " dexgs
` (13 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-02 14:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1923936364
Comment:
@classabbyamp done. Not sure if i removed the header/pkgconfig files correctly, i just used `rm` in post_install()
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (28 preceding siblings ...)
2024-02-02 14:09 ` dexgs
@ 2024-02-11 16:26 ` dexgs
2024-02-15 6:15 ` [PR REVIEW] " classabbyamp
` (12 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-11 16:26 UTC (permalink / raw)
To: ml
[-- 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: 5186 bytes --]
From cfc725617af685799d7818a3f53d7930f0d137d7 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 93fb4b2608729..1a14a11fa045f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4273,3 +4273,4 @@ 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
force-stage.so.0.1 void-force-stage-0.1_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..843748055fcad
--- /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
+hostmakedepends="pkg-config"
+makedepends="libdrm-devel"
+short_desc="Lightweight KMS plane library"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+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
+
+CFLAGS="-Wno-error=unused-but-set-variable"
+
+post_patch() {
+ # The test suite checks for NDEBUG and fails if it is defined, even if all
+ # other tests would pass. Therefore, skip the 'check_ndebug' test.
+ vsed -i test/meson.build -e "s/test('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 7e2c5179f6d141dbcca95afceaa86799edff34a6 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
---
srcpkgs/gamescope/template | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 srcpkgs/gamescope/template
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 0000000000000..b83cebaec9102
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,50 @@
+# 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="glslang pkg-config wayland-devel"
+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-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"
+skip_extraction="${_stb_hash}.tar.gz
+ ${_vkroots_hash}.tar.gz
+ ${_reshade_hash}.tar.gz"
+
+post_extract() {
+ vsrcextract -C subprojects/stb "${_stb_hash}.tar.gz"
+ cp subprojects/packagefiles/stb/meson.build subprojects/stb
+ vsrcextract -C subprojects/vkroots "${_vkroots_hash}.tar.gz"
+ vsrcextract -C src/reshade "${_reshade_hash}.tar.gz"
+}
+
+post_patch() {
+ # Use system SPIRV headers rather than gamescope's vendored headers
+ vsed -i src/meson.build -e "s|../thirdparty/SPIRV-Headers/include/spirv/unified1|${XBPS_CROSS_BASE}/usr/include/spirv/unified1|"
+}
+
+post_install() {
+ vlicense LICENSE
+ rm ${DESTDIR}/usr/lib/pkgconfig/vkroots.pc
+ rm ${DESTDIR}/usr/include/vkroots.h
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (29 preceding siblings ...)
2024-02-11 16:26 ` [PR PATCH] [Updated] " dexgs
@ 2024-02-15 6:15 ` classabbyamp
2024-02-15 6:15 ` classabbyamp
` (11 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-02-15 6:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1490464855
Comment:
```suggestion
if [ "$XBPS_CHECK_PKGS" ]; then
# The test suite checks for NDEBUG and fails if it is defined, even if all
# other tests would pass. Therefore, skip the 'check_ndebug' test.
CFLAGS+=" -UNDEBUG"
fi
```
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (30 preceding siblings ...)
2024-02-15 6:15 ` [PR REVIEW] " classabbyamp
@ 2024-02-15 6:15 ` classabbyamp
2024-02-15 6:16 ` classabbyamp
` (10 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-02-15 6:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1490464855
Comment:
```suggestion
if [ "$XBPS_CHECK_PKGS" ]; then
# The test suite checks for NDEBUG and fails if it is defined, even if all other tests would pass
CFLAGS+=" -UNDEBUG"
fi
```
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (31 preceding siblings ...)
2024-02-15 6:15 ` classabbyamp
@ 2024-02-15 6:16 ` classabbyamp
2024-02-16 0:42 ` [PR PATCH] [Updated] " dexgs
` (9 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-02-15 6:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#discussion_r1490465648
Comment:
version 4.4.2 is available
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (32 preceding siblings ...)
2024-02-15 6:16 ` classabbyamp
@ 2024-02-16 0:42 ` dexgs
2024-02-16 0:44 ` dexgs
` (8 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-16 0:42 UTC (permalink / raw)
To: ml
[-- 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: 5129 bytes --]
From 6aee20562625809e5d8dd9e154c782e1460e034a 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 | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/libliftoff-devel
create mode 100644 srcpkgs/libliftoff/template
diff --git a/common/shlibs b/common/shlibs
index 935ace564ff11d..3cf507d8ada879 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4274,3 +4274,4 @@ 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
force-stage.so.0.1 void-force-stage-0.1_1
+libliftoff.so.0 libliftoff-0.4.1_1
diff --git a/srcpkgs/libliftoff-devel b/srcpkgs/libliftoff-devel
new file mode 120000
index 00000000000000..977a28aa78d3cb
--- /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 00000000000000..d5336bcc3b9f33
--- /dev/null
+++ b/srcpkgs/libliftoff/template
@@ -0,0 +1,34 @@
+# Template file for 'libliftoff'
+pkgname=libliftoff
+version=0.4.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libdrm-devel"
+short_desc="Lightweight KMS plane library"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+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
+
+CFLAGS="-Wno-error=unused-but-set-variable"
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ # The test suite checks for NDEBUG and fails if it is defined, even if all other tests would pass
+ CFLAGS+=" -UNDEBUG"
+fi
+
+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 779bf8dc2a008e74ab5bf86d6c021b9fc0a8f1a4 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
---
srcpkgs/gamescope/template | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 srcpkgs/gamescope/template
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 00000000000000..9275ea1c023745
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,50 @@
+# Template file for 'gamescope'
+pkgname=gamescope
+version=3.14.1
+revision=1
+_stb_hash=5736b15f7ea0ffb08dd38af21067c314d6a3aae9
+_vkroots_hash=d5ef31abc7cb5c69aee4bcb67b10dd543c1ff7ac
+_reshade_hash=9fdbea6892f9959fdc18095d035976c574b268b7
+build_style=meson
+configure_args="-Denable_openvr_support=false --force-fallback-for="
+hostmakedepends="glslang pkg-config wayland-devel"
+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-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="9e87688833effc9d52c746637aa6a82cdad37776bb372fdb0f22d84e815c9c6f
+ d00921d49b06af62aa6bfb97c1b136bec661dd11dd4eecbcb0da1f6da7cedb4c
+ b4eca5edca75355ea1443ad96fd59b0a407f6a2ce17ef5a8f9849c05fc10155f
+ 165726ad21fbfc221c0363e40b597834068a416a11a1204ae2ac6d13ec161035"
+skip_extraction="${_stb_hash}.tar.gz
+ ${_vkroots_hash}.tar.gz
+ ${_reshade_hash}.tar.gz"
+
+post_extract() {
+ vsrcextract -C subprojects/stb "${_stb_hash}.tar.gz"
+ cp subprojects/packagefiles/stb/meson.build subprojects/stb
+ vsrcextract -C subprojects/vkroots "${_vkroots_hash}.tar.gz"
+ vsrcextract -C src/reshade "${_reshade_hash}.tar.gz"
+}
+
+post_patch() {
+ # Use system SPIRV headers rather than gamescope's vendored headers
+ vsed -i src/meson.build -e "s|../thirdparty/SPIRV-Headers/include/spirv/unified1|${XBPS_CROSS_BASE}/usr/include/spirv/unified1|"
+}
+
+post_install() {
+ vlicense LICENSE
+ rm ${DESTDIR}/usr/lib/pkgconfig/vkroots.pc
+ rm ${DESTDIR}/usr/include/vkroots.h
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (33 preceding siblings ...)
2024-02-16 0:42 ` [PR PATCH] [Updated] " dexgs
@ 2024-02-16 0:44 ` dexgs
2024-02-16 0:46 ` [PR PATCH] [Updated] " dexgs
` (7 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-16 0:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1947568565
Comment:
@classabbyamp I applied the change to `libliftoff`. I don't see a version 4.4.2 for `gamescope`, only 3.14.1 which was released yesterday. I'm assuming that's what you meant.
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.0
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (34 preceding siblings ...)
2024-02-16 0:44 ` dexgs
@ 2024-02-16 0:46 ` dexgs
2024-02-16 0:51 ` New package: gamescope-3.14.1 classabbyamp
` (6 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-16 0:46 UTC (permalink / raw)
To: ml
[-- 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: 5121 bytes --]
From 6aee20562625809e5d8dd9e154c782e1460e034a 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 | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/libliftoff-devel
create mode 100644 srcpkgs/libliftoff/template
diff --git a/common/shlibs b/common/shlibs
index 935ace564ff11..3cf507d8ada87 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4274,3 +4274,4 @@ 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
force-stage.so.0.1 void-force-stage-0.1_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..d5336bcc3b9f3
--- /dev/null
+++ b/srcpkgs/libliftoff/template
@@ -0,0 +1,34 @@
+# Template file for 'libliftoff'
+pkgname=libliftoff
+version=0.4.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libdrm-devel"
+short_desc="Lightweight KMS plane library"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+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
+
+CFLAGS="-Wno-error=unused-but-set-variable"
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ # The test suite checks for NDEBUG and fails if it is defined, even if all other tests would pass
+ CFLAGS+=" -UNDEBUG"
+fi
+
+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 f5f75430f62b27e327dcf9ae4cf4115a364f275d 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.1
---
srcpkgs/gamescope/template | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 srcpkgs/gamescope/template
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 0000000000000..9275ea1c02374
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,50 @@
+# Template file for 'gamescope'
+pkgname=gamescope
+version=3.14.1
+revision=1
+_stb_hash=5736b15f7ea0ffb08dd38af21067c314d6a3aae9
+_vkroots_hash=d5ef31abc7cb5c69aee4bcb67b10dd543c1ff7ac
+_reshade_hash=9fdbea6892f9959fdc18095d035976c574b268b7
+build_style=meson
+configure_args="-Denable_openvr_support=false --force-fallback-for="
+hostmakedepends="glslang pkg-config wayland-devel"
+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-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="9e87688833effc9d52c746637aa6a82cdad37776bb372fdb0f22d84e815c9c6f
+ d00921d49b06af62aa6bfb97c1b136bec661dd11dd4eecbcb0da1f6da7cedb4c
+ b4eca5edca75355ea1443ad96fd59b0a407f6a2ce17ef5a8f9849c05fc10155f
+ 165726ad21fbfc221c0363e40b597834068a416a11a1204ae2ac6d13ec161035"
+skip_extraction="${_stb_hash}.tar.gz
+ ${_vkroots_hash}.tar.gz
+ ${_reshade_hash}.tar.gz"
+
+post_extract() {
+ vsrcextract -C subprojects/stb "${_stb_hash}.tar.gz"
+ cp subprojects/packagefiles/stb/meson.build subprojects/stb
+ vsrcextract -C subprojects/vkroots "${_vkroots_hash}.tar.gz"
+ vsrcextract -C src/reshade "${_reshade_hash}.tar.gz"
+}
+
+post_patch() {
+ # Use system SPIRV headers rather than gamescope's vendored headers
+ vsed -i src/meson.build -e "s|../thirdparty/SPIRV-Headers/include/spirv/unified1|${XBPS_CROSS_BASE}/usr/include/spirv/unified1|"
+}
+
+post_install() {
+ vlicense LICENSE
+ rm ${DESTDIR}/usr/lib/pkgconfig/vkroots.pc
+ rm ${DESTDIR}/usr/include/vkroots.h
+}
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.1
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (35 preceding siblings ...)
2024-02-16 0:46 ` [PR PATCH] [Updated] " dexgs
@ 2024-02-16 0:51 ` classabbyamp
2024-02-16 1:02 ` classabbyamp
` (5 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-02-16 0:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1947574006
Comment:
then it probably needs an `update` file: https://github.com/void-linux/void-packages/actions/runs/7924327179/job/21635686863#step:7:33
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.1
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (36 preceding siblings ...)
2024-02-16 0:51 ` New package: gamescope-3.14.1 classabbyamp
@ 2024-02-16 1:02 ` classabbyamp
2024-02-16 1:04 ` classabbyamp
` (4 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-02-16 1:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1947574006
Comment:
then it probably needs an `update` file: https://github.com/void-linux/void-packages/actions/runs/7924327179/job/21635686863#step:7:34
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.1
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (37 preceding siblings ...)
2024-02-16 1:02 ` classabbyamp
@ 2024-02-16 1:04 ` classabbyamp
2024-02-16 1:10 ` [PR PATCH] [Updated] " dexgs
` (3 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-02-16 1:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1947584245
Comment:
ok it's picking up tags from https://github.com/Joshua-Ashton/reshade, an `update` file containing `site=https://github.com/ValveSoftware/gamescope/tags` should be enough
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] New package: gamescope-3.14.1
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (38 preceding siblings ...)
2024-02-16 1:04 ` classabbyamp
@ 2024-02-16 1:10 ` dexgs
2024-02-16 1:11 ` dexgs
` (2 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-16 1:10 UTC (permalink / raw)
To: ml
[-- 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.1
<!-- 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: 5459 bytes --]
From 6aee20562625809e5d8dd9e154c782e1460e034a 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 | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/libliftoff-devel
create mode 100644 srcpkgs/libliftoff/template
diff --git a/common/shlibs b/common/shlibs
index 935ace564ff11d..3cf507d8ada879 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4274,3 +4274,4 @@ 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
force-stage.so.0.1 void-force-stage-0.1_1
+libliftoff.so.0 libliftoff-0.4.1_1
diff --git a/srcpkgs/libliftoff-devel b/srcpkgs/libliftoff-devel
new file mode 120000
index 00000000000000..977a28aa78d3cb
--- /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 00000000000000..d5336bcc3b9f33
--- /dev/null
+++ b/srcpkgs/libliftoff/template
@@ -0,0 +1,34 @@
+# Template file for 'libliftoff'
+pkgname=libliftoff
+version=0.4.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libdrm-devel"
+short_desc="Lightweight KMS plane library"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+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
+
+CFLAGS="-Wno-error=unused-but-set-variable"
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ # The test suite checks for NDEBUG and fails if it is defined, even if all other tests would pass
+ CFLAGS+=" -UNDEBUG"
+fi
+
+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 1254ebbf2f1d26f4720a9028eb481d2ddcd4a712 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.1
---
srcpkgs/gamescope/template | 50 ++++++++++++++++++++++++++++++++++++++
srcpkgs/gamescope/update | 2 ++
2 files changed, 52 insertions(+)
create mode 100644 srcpkgs/gamescope/template
create mode 100644 srcpkgs/gamescope/update
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 00000000000000..9275ea1c023745
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,50 @@
+# Template file for 'gamescope'
+pkgname=gamescope
+version=3.14.1
+revision=1
+_stb_hash=5736b15f7ea0ffb08dd38af21067c314d6a3aae9
+_vkroots_hash=d5ef31abc7cb5c69aee4bcb67b10dd543c1ff7ac
+_reshade_hash=9fdbea6892f9959fdc18095d035976c574b268b7
+build_style=meson
+configure_args="-Denable_openvr_support=false --force-fallback-for="
+hostmakedepends="glslang pkg-config wayland-devel"
+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-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="9e87688833effc9d52c746637aa6a82cdad37776bb372fdb0f22d84e815c9c6f
+ d00921d49b06af62aa6bfb97c1b136bec661dd11dd4eecbcb0da1f6da7cedb4c
+ b4eca5edca75355ea1443ad96fd59b0a407f6a2ce17ef5a8f9849c05fc10155f
+ 165726ad21fbfc221c0363e40b597834068a416a11a1204ae2ac6d13ec161035"
+skip_extraction="${_stb_hash}.tar.gz
+ ${_vkroots_hash}.tar.gz
+ ${_reshade_hash}.tar.gz"
+
+post_extract() {
+ vsrcextract -C subprojects/stb "${_stb_hash}.tar.gz"
+ cp subprojects/packagefiles/stb/meson.build subprojects/stb
+ vsrcextract -C subprojects/vkroots "${_vkroots_hash}.tar.gz"
+ vsrcextract -C src/reshade "${_reshade_hash}.tar.gz"
+}
+
+post_patch() {
+ # Use system SPIRV headers rather than gamescope's vendored headers
+ vsed -i src/meson.build -e "s|../thirdparty/SPIRV-Headers/include/spirv/unified1|${XBPS_CROSS_BASE}/usr/include/spirv/unified1|"
+}
+
+post_install() {
+ vlicense LICENSE
+ rm ${DESTDIR}/usr/lib/pkgconfig/vkroots.pc
+ rm ${DESTDIR}/usr/include/vkroots.h
+}
diff --git a/srcpkgs/gamescope/update b/srcpkgs/gamescope/update
new file mode 100644
index 00000000000000..e96d4b02ec8e82
--- /dev/null
+++ b/srcpkgs/gamescope/update
@@ -0,0 +1,2 @@
+site=https://github.com/ValveSoftware/gamescope/tags
+pkgname=
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.1
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (39 preceding siblings ...)
2024-02-16 1:10 ` [PR PATCH] [Updated] " dexgs
@ 2024-02-16 1:11 ` dexgs
2024-02-16 1:11 ` dexgs
2024-02-16 1:36 ` [PR PATCH] [Merged]: " classabbyamp
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-16 1:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1947589214
Comment:
> then it probably needs an `update` file
done
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: New package: gamescope-3.14.1
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (40 preceding siblings ...)
2024-02-16 1:11 ` dexgs
@ 2024-02-16 1:11 ` dexgs
2024-02-16 1:36 ` [PR PATCH] [Merged]: " classabbyamp
42 siblings, 0 replies; 44+ messages in thread
From: dexgs @ 2024-02-16 1:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/48354#issuecomment-1947589214
Comment:
> then it probably needs an `update` file
done
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Merged]: New package: gamescope-3.14.1
2024-01-24 16:45 [PR PATCH] New package: gamescope-3.14.0 dexgs
` (41 preceding siblings ...)
2024-02-16 1:11 ` dexgs
@ 2024-02-16 1:36 ` classabbyamp
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-02-16 1:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]
There's a merged pull request on the void-packages repository
New package: gamescope-3.14.1
https://github.com/void-linux/void-packages/pull/48354
Description:
<!-- 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)
^ permalink raw reply [flat|nested] 44+ messages in thread