Date: Wed, 22 Nov 2023 16:05:16 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: 956c42a3d46a - main - x11-wm/gamescope: back to default wlroots Message-ID: <202311221605.3AMG5GSv001653@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=956c42a3d46a3713caa764124a13ea32833961b6 commit 956c42a3d46a3713caa764124a13ea32833961b6 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-11-22 15:46:35 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-11-22 16:04:33 +0000 x11-wm/gamescope: back to default wlroots --- x11-wm/gamescope/Makefile | 11 +++++++++-- x11-wm/gamescope/distinfo | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index b307a2f9ef91..7972f9b22bda 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,9 +1,11 @@ PORTNAME= gamescope DISTVERSION= 3.13.8 +PORTREVISION= 1 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+= 4a067fb4ebe2.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/678 MAINTAINER= jbeich@FreeBSD.org COMMENT= SteamOS session compositing window manager @@ -18,7 +20,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ 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 + wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots LIB_DEPENDS= libdrm.so:graphics/libdrm \ libliftoff.so:graphics/libliftoff \ libvulkan.so:graphics/vulkan-loader \ @@ -55,6 +57,12 @@ PIPEWIRE_MESON_ENABLED= pipewire post-extract: # Merge patch_directory for subprojects without meson.build @(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..) +.if defined(PATCHFILES) && ${PATCHFILES:M4a067fb4ebe2*} +# Pretend to be a regular file for vendor patch to apply as is + @${RMDIR} ${WRKSRC}/subprojects/wlroots + @${ECHO_CMD} "Subproject commit 1712a7d27444d62f8da8eeedf0840b386a810e96" \ + >${WRKSRC}/subprojects/wlroots +.endif .ifdef GH_TUPLE post-configure: @@ -87,5 +95,4 @@ bundled-libcxx: .endif .endif # exists(/usr/lib/libc++.so) -.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk" .include <bsd.port.mk> diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index 2e94dc85bd5e..f3e16d93e149 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -13,3 +13,5 @@ SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 SHA256 (a618ea074660.patch) = c79b4b7a231d9c6e34912b8f4a301c6c60b921b6be5fb9c132d999e9a6930424 SIZE (a618ea074660.patch) = 2589 +SHA256 (4a067fb4ebe2.patch) = fb12df8318e06a77ead4aa5752e32eec48efc70de43f069369a4c6a83a590152 +SIZE (4a067fb4ebe2.patch) = 4823
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311221605.3AMG5GSv001653>