Date: Wed, 26 Jul 2023 01:21:42 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4dc6cd79180f - main - x11-wm/gamescope: update to 3.12.0 Message-ID: <202307260121.36Q1Lg6x023071@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4dc6cd79180f56476432d42ff95d927f0e1d9d54 commit 4dc6cd79180f56476432d42ff95d927f0e1d9d54 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-07-25 05:51:58 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-07-26 01:20:43 +0000 x11-wm/gamescope: update to 3.12.0 Changes: https://github.com/Plagman/gamescope/compare/3.11.51...3.12.0 Reported by: Repology, portscout --- x11-wm/gamescope/Makefile | 31 ++++++++++++++++++++++--------- x11-wm/gamescope/distinfo | 18 +++++++----------- x11-wm/gamescope/files/patch-meson.build | 13 ------------- 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index fb5756cfeb3f..70d971067c35 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,11 +1,8 @@ PORTNAME= gamescope -DISTVERSION= 3.11.51 -PORTREVISION= 2 +DISTVERSION= 3.12.0 CATEGORIES= x11-wm # wayland: depends on https://github.com/ValveSoftware/gamescope/issues/543 PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 2a84a44f6897.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/119 -PATCHFILES+= e0927f7bce95.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/119 PATCHFILES+= a618ea074660.patch:-p1 # https://github.com/ValveSoftware/gamescope/issues/120 MAINTAINER= jbeich@FreeBSD.org @@ -15,11 +12,13 @@ WWW= https://github.com/ValveSoftware/gamescope LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN_i386= https://github.com/ValveSoftware/gamescope/issues/917 + BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ glslangValidator:graphics/glslang \ - libliftoff>=0.4.0<0.5.0:graphics/libliftoff \ vulkan-headers>0:graphics/vulkan-headers \ wayland-protocols>=1.17:graphics/wayland-protocols \ + glm>0:math/glm \ hwdata>0:misc/hwdata \ wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ @@ -27,6 +26,7 @@ LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libliftoff.so:graphics/libliftoff \ libvulkan.so:graphics/vulkan-loader \ libwayland-server.so:graphics/wayland \ + libdisplay-info.so:sysutils/libdisplay-info \ libwlroots.so:x11-toolkits/wlroots \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= hwdata>0:misc/hwdata @@ -34,14 +34,16 @@ RUN_DEPENDS= hwdata>0:misc/hwdata USES= compiler:c++11-lib meson pkgconfig sdl xorg USE_GITHUB= yes USE_SDL= sdl2 -USE_XORG= x11 xcomposite xdamage xext xfixes xrender xres xtst xxf86vm +USE_XORG= x11 xcb xcomposite xdamage xext xfixes xmu xrender xres xtst xxf86vm GH_ACCOUNT= ValveSoftware -GH_TUPLE= nothings:stb:af1a5bc:stb/subprojects/stb \ - Joshua-Ashton:vkroots:e6b8949:vkroots/subprojects/vkroots +GH_TUPLE= nothings:stb:5736b15:stb/subprojects/stb \ + Joshua-Ashton:vkroots:2675710:vkroots/subprojects/vkroots MESON_ARGS= --force-fallback-for= # allow system wlroots + libliftoff +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/} PLIST_FILES= bin/${PORTNAME} \ lib/libVkLayer_FROG_${PORTNAME}_wsi.so \ - share/vulkan/implicit_layer.d/VkLayer_FROG_${PORTNAME}_wsi.json + share/vulkan/implicit_layer.d/VkLayer_FROG_${PORTNAME}_wsi.${MESON_ARCH_FAMILY}.json OPTIONS_DEFINE= PIPEWIRE OPTIONS_DEFAULT=PIPEWIRE @@ -54,4 +56,15 @@ 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 + .include <bsd.port.mk> diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index b9ebbfaaf4c3..69b8fda49076 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -1,13 +1,9 @@ -TIMESTAMP = 1670438874 -SHA256 (ValveSoftware-gamescope-3.11.51_GH0.tar.gz) = 0ffe1c3e3cdf40e20b45b758f8e4c334c5c0941eb05437e59e9c6aaf8c948a1e -SIZE (ValveSoftware-gamescope-3.11.51_GH0.tar.gz) = 209920 -SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058 -SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334 -SHA256 (Joshua-Ashton-vkroots-e6b8949_GH0.tar.gz) = 2b2e949642d93a9eba7340e7828d38ea0dac822939812020ec63c02e4c4dbc72 -SIZE (Joshua-Ashton-vkroots-e6b8949_GH0.tar.gz) = 272574 -SHA256 (2a84a44f6897.patch) = 10d836201c657250c295c820f0b86df28f1cf2c1935103af6ce2a274438f2b4e -SIZE (2a84a44f6897.patch) = 2935 -SHA256 (e0927f7bce95.patch) = 729363e0bca5d3e023dd409481ed1c91bddf193d7765231cce62acba92e26bd5 -SIZE (e0927f7bce95.patch) = 1611 +TIMESTAMP = 1690264318 +SHA256 (ValveSoftware-gamescope-3.12.0_GH0.tar.gz) = 50c30efba155459acc1a36d0cbf785eb2cd129db07aa21b0078d7fe0ec1d01b5 +SIZE (ValveSoftware-gamescope-3.12.0_GH0.tar.gz) = 437848 +SHA256 (nothings-stb-5736b15_GH0.tar.gz) = 8e18fa73396a3206129c55a3bc409401353991470245941d6ba7d8ce57df864f +SIZE (nothings-stb-5736b15_GH0.tar.gz) = 1392565 +SHA256 (Joshua-Ashton-vkroots-2675710_GH0.tar.gz) = 15b0338bc93fe3df8fbf28b5db76c406c81e2d0625f0ce88739a4975a7916a38 +SIZE (Joshua-Ashton-vkroots-2675710_GH0.tar.gz) = 306247 SHA256 (a618ea074660.patch) = c79b4b7a231d9c6e34912b8f4a301c6c60b921b6be5fb9c132d999e9a6930424 SIZE (a618ea074660.patch) = 2589 diff --git a/x11-wm/gamescope/files/patch-meson.build b/x11-wm/gamescope/files/patch-meson.build deleted file mode 100644 index 0b813f2ef63b..000000000000 --- a/x11-wm/gamescope/files/patch-meson.build +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/ValveSoftware/gamescope/commit/9600bbaadf9c - ---- meson.build.orig 2022-12-07 18:47:54 UTC -+++ meson.build -@@ -109,7 +109,7 @@ liftoff_dep = dependency( - - liftoff_dep = dependency( - 'libliftoff', -- version: ['>= 0.3.0', '< 0.4.0'], -+ version: ['>= 0.4.0', '< 0.5.0'], - fallback: ['libliftoff', 'liftoff'], - default_options: ['default_library=static'], - )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307260121.36Q1Lg6x023071>