diff --git a/srcpkgs/gamescope/patches/0002-version-string.patch b/srcpkgs/gamescope/patches/0002-version-string.patch new file mode 100644 index 00000000000..2f0dec13de6 --- /dev/null +++ b/srcpkgs/gamescope/patches/0002-version-string.patch @@ -0,0 +1,18 @@ +Read the VCS version from a local file instead of using git. +We create this file in the `post_patch()` step in the srcpkg +template. + +diff -u -r a/src/meson.build b/src/meson.build +--- a/src/meson.build 2024-12-16 06:11:30.000000000 +0000 ++++ b/src/meson.build 2024-12-22 10:29:49.654509579 +0000 +@@ -171,8 +171,8 @@ + compiler_name = cc.get_id() + compiler_version = cc.version() + +-vcs_tag_cmd = ['git', 'describe', '--always', '--tags', '--dirty=+'] ++vcs_tag_cmd = ['cat', '../voidlinux_pkg_version.txt'] + vcs_tag = run_command(vcs_tag_cmd, check: false).stdout().strip() + version_tag = vcs_tag + ' (' + compiler_name + ' ' + compiler_version + ')' + + gamescope_version_conf = configuration_data() + diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template index e2897572aeb..66b5234a452 100644 --- a/srcpkgs/gamescope/template +++ b/srcpkgs/gamescope/template @@ -1,21 +1,21 @@ # Template file for 'gamescope' pkgname=gamescope -version=3.14.24 +version=3.16.1 revision=1 _stb_hash=5736b15f7ea0ffb08dd38af21067c314d6a3aae9 _vkroots_hash=5106d8a0df95de66cc58dc1ea37e69c99afc9540 _reshade_hash=696b14cd6006ae9ca174e6164450619ace043283 _spirv_hash=d790ced752b5bfc06b6988baadef6eb2d16bdf96 -_libdisplay_info_hash=8fbc366c7c56d584590db50fe5943b0f92b1f448 +_libdisplay_info_hash=66b802d05b374cd8f388dc6ad1e7ae4f08cb3300 _libliftoff_hash=8b08dc1c14fd019cc90ddabe34ad16596b0691f4 -_wlroots_hash=a5c9826e6d7d8b504b07d1c02425e6f62b020791 +_wlroots_hash=4bc5333a2cbba0b0b88559f281dbde04b849e6ef build_style=meson configure_args="-Denable_openvr_support=false" hostmakedepends="glslang pkg-config wayland-devel hwids" makedepends="pipewire-devel SPIRV-Headers libX11-devel libXdamage-devel libXcomposite-devel libXrender-devel libXxf86vm-devel libXtst-devel libXres-devel libXmu-devel libdrm-devel vulkan-loader-devel - libxkbcommon-devel libcap-devel SDL2-devel glm benchmark-devel pixman-devel + libxkbcommon-devel libcap-devel LuaJIT-devel SDL2-devel glm benchmark-devel pixman-devel libinput-devel libseat-devel libavif-devel libei-devel xcb-util-wm-devel wayland-protocols xorg-server-xwayland" depends="xorg-server-xwayland" @@ -31,14 +31,14 @@ distfiles="https://github.com/ValveSoftware/gamescope/archive/refs/tags/${versio https://gitlab.freedesktop.org/emersion/libdisplay-info/-/archive/${_libdisplay_info_hash}/libdisplay-info-${_libdisplay_info_hash}.tar.gz https://gitlab.freedesktop.org/emersion/libliftoff/-/archive/${_libliftoff_hash}/libliftoff-${_libliftoff_hash}.tar.gz https://github.com/Joshua-Ashton/wlroots/archive/${_wlroots_hash}.tar.gz" -checksum="429ef04aab9b3ca5cac76752f59e2219d8326010c0cd9533ad580f65f5bfd3a3 +checksum="acaa77c80670357ed29b8aacd59cc960b7314eb092ca8f2a2f127c456d2ae281 d00921d49b06af62aa6bfb97c1b136bec661dd11dd4eecbcb0da1f6da7cedb4c 37b77586e91f7ebee70380dcddd73bf01ae4acef1053e6be41d0485ede022422 3aa6feda7773cc8ffa8fb012fe95e6207c776101e29198d0e0d34a0c5e339f6a 90141b3f6261dba643fe546d56b4539e61fe40e307c5c3b9985ea9fa0622ac3f - 4f8b35850ba72fc1abdb9ea72af3aa2328a5e95176f779cb3ac3ee3512dfacf8 + bca0664e23671572311b3b91f3b2fff3fd6501940320a8daff5e11b5219554a4 8de28aee6f90f47b7fc7037dcd2360166197c0b5d2033f3afdbd34f2ea1bf216 - f3f91b679114e565d94e87cd0c4c61444e48d7ef8a77cd101ef3081fd87f4726" + 41272ce410c2815de1e268f5baa906b26286bb910e514677d15b8e69f81c5a04" skip_extraction="${_stb_hash}.tar.gz ${_vkroots_hash}.tar.gz ${_reshade_hash}.tar.gz @@ -50,7 +50,8 @@ skip_extraction="${_stb_hash}.tar.gz # wlroots and libliftoff fail to build because of these warnings CFLAGS="-Wno-error=unused-variable -Wno-error=unused-but-set-variable - -Wno-error=unused-result" + -Wno-error=unused-result + -Wno-error=return-type" if [ "$XBPS_CHECK_PKGS" ]; then # The libliftoff test suite checks for NDEBUG and fails if it is defined, @@ -72,6 +73,7 @@ post_extract() { post_patch() { # libdisplay-info tests require currently unpackaged edid-decode vsed -i subprojects/libdisplay-info/meson.build -e "s/subdir('test')//" + echo "${version}" > voidlinux_pkg_version.txt } post_install() { @@ -84,12 +86,12 @@ post_install() { rm ${DESTDIR}/usr/lib/pkgconfig/libliftoff.pc rm ${DESTDIR}/usr/lib/libliftoff.a - rm -r ${DESTDIR}/usr/include/wlr - rm ${DESTDIR}/usr/lib/pkgconfig/wlroots.pc - rm ${DESTDIR}/usr/lib/libwlroots.a + rm -r ${DESTDIR}/usr/include/wlroots* + rm ${DESTDIR}/usr/lib/pkgconfig/wlroots*.pc + rm ${DESTDIR}/usr/lib/libwlroots*.a rm ${DESTDIR}/usr/bin/di-edid-decode rm -r ${DESTDIR}/usr/include/libdisplay-info - rm ${DESTDIR}/usr/lib/pkgconfig/display-info.pc + rm ${DESTDIR}/usr/lib/pkgconfig/libdisplay-info.pc rm ${DESTDIR}/usr/lib/libdisplay-info.a }