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

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

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

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

https://github.com/sirkhancision/void-packages gamescope
https://github.com/void-linux/void-packages/pull/44767

New package: gamescope-3.11.51
#### 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**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

Closes #36869


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

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

From a1f1710b0581ef356225da4da013bd0aa11a6c9d Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Sat, 1 Jul 2023 04:26:44 -0300
Subject: [PATCH 1/3] New package: libliftoff-0.4.1

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

diff --git a/common/shlibs b/common/shlibs
index ef71bae3f9a7..b7ac477d6e84 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -109,6 +109,7 @@ libgtk-x11-2.0.so.0 gtk+-2.16.0_1
 libgdk_pixbuf-2.0.so.0 gdk-pixbuf-2.22.0_1
 libgdk_pixbuf_xlib-2.0.so.0 gdk-pixbuf-xlib-2.30.8_1
 libgailutil.so.18 gtk+-2.16.0_1
+libliftoff.so.0 libliftoff-0.3.0_1
 libfreetype.so.6 freetype-2.12.1_1
 libfontconfig.so.1 fontconfig-2.6.0_1
 libX11-xcb.so.1 libX11-1.2_1
diff --git a/srcpkgs/libliftoff-devel b/srcpkgs/libliftoff-devel
new file mode 120000
index 000000000000..977a28aa78d3
--- /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 000000000000..123c84bb38a6
--- /dev/null
+++ b/srcpkgs/libliftoff/template
@@ -0,0 +1,27 @@
+# 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="sirkhancision <jsantiago12tone@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.freedesktop.org/emersion/libliftoff"
+distfiles="https://gitlab.freedesktop.org/emersion/libliftoff/-/releases/v${version}/downloads/libliftoff-${version}.tar.gz"
+checksum=9f16e3168234d63ad636224061bc88b0e5f0e43a5b4edfa24b61bf9d57a3eb3b
+
+pre_build() {
+	vsed -i meson.build -e "/subdir('test')/d"
+}
+
+libliftoff-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From ddb3f71f96565c2d04f530b899db184efb143eeb Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Sat, 1 Jul 2023 04:26:48 -0300
Subject: [PATCH 2/3] New package: stb-20210910

---
 srcpkgs/stb/files/stb.pc | 10 ++++++++++
 srcpkgs/stb/template     | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 srcpkgs/stb/files/stb.pc
 create mode 100644 srcpkgs/stb/template

diff --git a/srcpkgs/stb/files/stb.pc b/srcpkgs/stb/files/stb.pc
new file mode 100644
index 000000000000..49e370af0bf2
--- /dev/null
+++ b/srcpkgs/stb/files/stb.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: stb
+Description: Single-file public domain (or MIT licensed) libraries for C/C++
+Requires:
+Version: @VERSION@
+Cflags: -I${includedir}/stb
diff --git a/srcpkgs/stb/template b/srcpkgs/stb/template
new file mode 100644
index 000000000000..46d05cdf8e06
--- /dev/null
+++ b/srcpkgs/stb/template
@@ -0,0 +1,20 @@
+# Template file for 'stb'
+pkgname=stb
+version=20210910
+revision=1
+_commit=af1a5bc352164740c1cc1354942b1c6b72eacb8a
+short_desc="Single-file public domain (or MIT licensed) libraries for C/C++"
+maintainer="sirkhancision <jsantiago12tone@gmail.com>"
+license="Public Domain"
+homepage="https://github.com/nothings/stb"
+distfiles="https://github.com/nothings/stb/archive/${_commit}.tar.gz"
+checksum=936b4e506b5f55db178207e528ecdf5a411f67431447767d06c9b7061765cd7e
+
+do_install() {
+	vmkdir usr/lib/pkgconfig
+	sed ${FILESDIR}/${pkgname}.pc \
+		-e "s;@VERSION@;${version};" \
+		>${DESTDIR}/usr/lib/pkgconfig/${pkgname}.pc
+	install -Dm 644 *.{c,h} -t "${DESTDIR}"/usr/include/stb/
+	vlicense LICENSE
+}

From a8fe1faa425d1b120b78ddb9983f5cbcad79032d Mon Sep 17 00:00:00 2001
From: sirkhancision <jsantiago12tone@gmail.com>
Date: Sat, 1 Jul 2023 04:26:53 -0300
Subject: [PATCH 3/3] New package: gamescope-3.11.51

---
 srcpkgs/gamescope/patches/gcc133.patch        | 40 +++++++++++++++++++
 .../gamescope/patches/libliftoff-0.4.patch    | 11 +++++
 .../patches/system-wlroots-libliftoff.patch   |  9 +++++
 srcpkgs/gamescope/template                    | 30 ++++++++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 srcpkgs/gamescope/patches/gcc133.patch
 create mode 100644 srcpkgs/gamescope/patches/libliftoff-0.4.patch
 create mode 100644 srcpkgs/gamescope/patches/system-wlroots-libliftoff.patch
 create mode 100644 srcpkgs/gamescope/template

diff --git a/srcpkgs/gamescope/patches/gcc133.patch b/srcpkgs/gamescope/patches/gcc133.patch
new file mode 100644
index 000000000000..f32e0e1d887a
--- /dev/null
+++ b/srcpkgs/gamescope/patches/gcc133.patch
@@ -0,0 +1,40 @@
+diff --git a/src/drm.hpp b/src/drm.hpp
+index 2f416c4..849ec96 100644
+--- a/gamescope-3.11.51/src/drm.hpp
++++ b/gamescope-3.11.51/src/drm.hpp
+@@ -40,12 +40,13 @@ extern "C" {
+ 
+ #include "rendervulkan.hpp"
+ 
++#include <string>
+ #include <unordered_map>
+ #include <utility>
+ #include <atomic>
+ #include <map>
+ #include <unordered_map>
+ #include <mutex>
+ #include <vector>
+ 
+ struct saved_mode {
+diff --git a/src/main.cpp b/src/main.cpp
+index 99a7a48..4cab9d1 100644
+--- a/gamescope-3.11.51/src/main.cpp
++++ b/gamescope-3.11.51/src/main.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include <cstdio>
+ #include <thread>
++#include <string>
+ #include <mutex>
+ #include <vector>
+ #include <cstring>
+diff --git a/src/sdlwindow.cpp b/src/sdlwindow.cpp
+index ecf95ce..d886e15 100644
+--- a/gamescope-3.11.51/src/sdlwindow.cpp
++++ b/gamescope-3.11.51/src/sdlwindow.cpp
+@@ -1,5 +1,6 @@
+ // For the nested case, reads input from the SDL window and send to wayland
+ 
++#include <string>
+ #include <thread>
+ #include <mutex>
diff --git a/srcpkgs/gamescope/patches/libliftoff-0.4.patch b/srcpkgs/gamescope/patches/libliftoff-0.4.patch
new file mode 100644
index 000000000000..fd6879f5f73a
--- /dev/null
+++ b/srcpkgs/gamescope/patches/libliftoff-0.4.patch
@@ -0,0 +1,11 @@
+--- a/gamescope-3.11.51/meson.build
++++ b/gamescope-3.11.51/meson.build
+@@ -109,7 +109,7 @@ spirv_shaders = glsl_generator.process(shader_src)
+ 
+ liftoff_dep = dependency(
+   'libliftoff',
+-  version: ['>= 0.3.0', '< 0.4.0'],
++  version: ['>= 0.3.0', '< 0.5.0'],
+   fallback: ['libliftoff', 'liftoff'],
+   default_options: ['default_library=static'],
+ )
diff --git a/srcpkgs/gamescope/patches/system-wlroots-libliftoff.patch b/srcpkgs/gamescope/patches/system-wlroots-libliftoff.patch
new file mode 100644
index 000000000000..087bf64819a0
--- /dev/null
+++ b/srcpkgs/gamescope/patches/system-wlroots-libliftoff.patch
@@ -0,0 +1,9 @@
+--- a/gamescope-3.11.51/meson.build
++++ b/gamescope-3.11.51/meson.build
+@@ -6,7 +6,6 @@
+   default_options: [
+     'cpp_std=c++14',
+     'warning_level=2',
+-    'force_fallback_for=wlroots,libliftoff',
+   ],
+ )
diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template
new file mode 100644
index 000000000000..0866c28bb7d0
--- /dev/null
+++ b/srcpkgs/gamescope/template
@@ -0,0 +1,30 @@
+# Template file for 'gamescope'
+pkgname=gamescope
+version=3.11.51
+revision=1
+_vkroots=e6b89494142eec0ac6061f82a947d2f1246d3d7a
+archs="x86_64* i686"
+create_wrksrc=yes
+build_wrksrc=$pkgname-$version
+build_style=meson
+# configure_args="-Dforce_fallback_for=stb -Dpipewire=enabled"
+hostmakedepends="pkg-config glslang Vulkan-Headers xorg-server-xwayland"
+makedepends="SDL2-devel hwids libX11-devel libXcomposite-devel libXdamage-devel libXext-devel libXfixes-devel libXrender-devel libXres-devel libXtst-devel libXxf86vm-devel libcap-devel libdrm-devel libliftoff-devel libpipewire libseat-devel libxkbcommon-devel stb vulkan-loader wayland-devel wayland-protocols wlroots-devel"
+depends="xorg-server-xwayland"
+short_desc="SteamOS session compositing window manager"
+maintainer="sirkhancision <jsantiago12tone@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/Plagman/gamescope"
+distfiles="https://github.com/Plagman/gamescope/archive/refs/tags/${version}.tar.gz
+ https://github.com/Joshua-Ashton/vkroots/archive/${_vkroots}.tar.gz>vkroots-${_vkroots}.tar.gz"
+checksum="0ffe1c3e3cdf40e20b45b758f8e4c334c5c0941eb05437e59e9c6aaf8c948a1e
+ 501568cf7f868b1b7fda71030a20ca9cb785025c89f45a156534270c376758ce"
+
+pre_configure() {
+	rmdir subprojects/vkroots
+	cp -r "../vkroots-${_vkroots}" subprojects/vkroots
+}
+
+post_install() {
+	vlicense LICENSE
+}