git: 1795a2311ed9 - main - x11-wm/gamescope: update to 3.12.7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 11 Oct 2023 14:34:22 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1795a2311ed97fdb5a71f1ef7817138355e72359
commit 1795a2311ed97fdb5a71f1ef7817138355e72359
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-10-09 09:21:11 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-10-11 14:18:47 +0000
x11-wm/gamescope: update to 3.12.7
Changes: https://github.com/Plagman/gamescope/compare/3.12.5...3.12.7
Reported by: Repology, portscout
---
x11-wm/gamescope/Makefile | 39 ++++++++++++++++++++++++++++++++-------
x11-wm/gamescope/distinfo | 16 +++++++++++++---
2 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index 8ce98dfe1e78..3640bd06d003 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -1,9 +1,11 @@
PORTNAME= gamescope
-DISTVERSION= 3.12.5
+DISTVERSION= 3.12.7
CATEGORIES= x11-wm wayland
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= a618ea074660.patch:-p1 # https://github.com/ValveSoftware/gamescope/issues/120
+PATCHFILES+= dd851e58b79b.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/979
+PATCHFILES+= 8a7fa50bb2fc.patch:-p1 # -Dbenchmark=disabled
MAINTAINER= jbeich@FreeBSD.org
COMMENT= SteamOS session compositing window manager
@@ -34,12 +36,15 @@ USE_SDL= sdl2
USE_XORG= x11 xcb xcomposite xdamage xext xfixes xmu xrender xres xtst xxf86vm
GH_ACCOUNT= ValveSoftware
GH_TUPLE= nothings:stb:5736b15:stb/subprojects/stb \
+ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:spirv_headers/thirdparty/SPIRV-Headers \
+ Joshua-Ashton:reshade:v4.4.2-2572-g9fdbea68:reshade/src/reshade \
Joshua-Ashton:vkroots:2675710:vkroots/subprojects/vkroots
MESON_ARGS= --force-fallback-for= # allow system wlroots + libliftoff
+MESON_ARGS+= -Dbenchmark=disabled # gamescope_color_microbench isn't installed
MESON_ARGS+= -Denable_openvr_support=false # https://github.com/ValveSoftware/openvr/pull/564
MESON_ARCH_FAMILY= ${ARCH:S/amd/x86_/:S/i3/x/:C/v[67]//:S/power/p/:S/le$//}
PLIST_FILES= bin/${PORTNAME} \
- lib/libVkLayer_FROG_${PORTNAME}_wsi.so \
+ lib/libVkLayer_FROG_${PORTNAME}_wsi_${MESON_ARCH_FAMILY}.so \
share/vulkan/implicit_layer.d/VkLayer_FROG_${PORTNAME}_wsi.${MESON_ARCH_FAMILY}.json
OPTIONS_DEFINE= PIPEWIRE
@@ -53,15 +58,35 @@ post-extract:
# Merge patch_directory for subprojects without meson.build
@(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..)
-post-patch:
-# gamescope_color_microbench isn't installed, so make its dependency optional
- @${REINPLACE_CMD} '/dependency.*benchmark/s/)/, required: false, disabler: true&/' \
- ${WRKSRC}/src/meson.build
-
.ifdef GH_TUPLE
post-configure:
@${REINPLACE_CMD} 's/meson install/& \
--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
.endif
+# XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo)
+.if ${CXX} == c++ && exists(/usr/lib/libc++.so)
+.if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch)
+BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core
+USES+= llvm:min=16,build,export
+PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm*
+CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}"
+CMAKE_BIN= ${LOCALBASE}/bin/cmake
+
+# XXX Move into separate port and standardize via USES
+GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx
+CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1
+# Don't link against new libc++ as it's not necessary
+#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt
+
+pre-configure: bundled-libcxx
+bundled-libcxx:
+ @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
+ -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \
+ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \
+ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx
+ @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build
+.endif
+.endif # exists(/usr/lib/libc++.so)
+
.include <bsd.port.mk>
diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo
index 374c14230ca9..9d8527c8c9ec 100644
--- a/x11-wm/gamescope/distinfo
+++ b/x11-wm/gamescope/distinfo
@@ -1,9 +1,19 @@
-TIMESTAMP = 1693528957
-SHA256 (ValveSoftware-gamescope-3.12.5_GH0.tar.gz) = 32a020e35b8443862c900306fb6edb84a8ecb009c89184d2062b0b8ce2811e17
-SIZE (ValveSoftware-gamescope-3.12.5_GH0.tar.gz) = 441125
+TIMESTAMP = 1696843271
+SHA256 (ValveSoftware-gamescope-3.12.7_GH0.tar.gz) = e062eb541e20959cd3d64e79c1c31fe3bf1d773afd3da5816011f07424e33bcb
+SIZE (ValveSoftware-gamescope-3.12.7_GH0.tar.gz) = 469724
SHA256 (nothings-stb-5736b15_GH0.tar.gz) = 8e18fa73396a3206129c55a3bc409401353991470245941d6ba7d8ce57df864f
SIZE (nothings-stb-5736b15_GH0.tar.gz) = 1392565
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-316-gd790ced_GH0.tar.gz) = 4677f51365937acb78df4067359d32742c5c649f2beb8f8afb7e1002329cea46
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-316-gd790ced_GH0.tar.gz) = 463700
+SHA256 (Joshua-Ashton-reshade-v4.4.2-2572-g9fdbea68_GH0.tar.gz) = 2a7f854ad30674ab45889aa9d1727f1904a2ee21dbf944727c31ef21e1fd0c7b
+SIZE (Joshua-Ashton-reshade-v4.4.2-2572-g9fdbea68_GH0.tar.gz) = 1543155
SHA256 (Joshua-Ashton-vkroots-2675710_GH0.tar.gz) = 15b0338bc93fe3df8fbf28b5db76c406c81e2d0625f0ce88739a4975a7916a38
SIZE (Joshua-Ashton-vkroots-2675710_GH0.tar.gz) = 306247
+SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
+SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
SHA256 (a618ea074660.patch) = c79b4b7a231d9c6e34912b8f4a301c6c60b921b6be5fb9c132d999e9a6930424
SIZE (a618ea074660.patch) = 2589
+SHA256 (dd851e58b79b.patch) = 7980feb488f4dd7d096982d02b5bcc1757c2fd49422ab1766872f1ccda7adc6a
+SIZE (dd851e58b79b.patch) = 766
+SHA256 (8a7fa50bb2fc.patch) = 2ade8dca8dc6325486db7cda862d322b62e1a7e762902e8480e03879fe072982
+SIZE (8a7fa50bb2fc.patch) = 1448