aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2022-11-26 17:13:22 +0000
committerJan Beich <jbeich@FreeBSD.org>2022-11-26 17:25:47 +0000
commitbc1d9770a8d994898456c311c87049713ce61bc1 (patch)
treeaa91137e7d09d473644d3bc15564580ad311431d
parent0ba92b30f8255d407c2bbeaab8ee01c230802a98 (diff)
downloadports-bc1d9770a8d994898456c311c87049713ce61bc1.tar.gz
ports-bc1d9770a8d994898456c311c87049713ce61bc1.zip
x11-wm/gamescope: back to default wlroots
-rw-r--r--x11-wm/gamescope/Makefile13
-rw-r--r--x11-wm/gamescope/distinfo6
2 files changed, 17 insertions, 2 deletions
diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index f67ab0062dcc..cebb5140805d 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -1,11 +1,15 @@
PORTNAME= gamescope
DISTVERSION= 3.11.49
+PORTREVISION= 1
CATEGORIES= x11-wm wayland
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= 2a84a44f6897.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
PATCHFILES+= e0927f7bce95.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
PATCHFILES+= a618ea074660.patch:-p1 # https://github.com/Plagman/gamescope/issues/120
+PATCHFILES+= 91fbb22bda68.patch:-p1 # https://github.com/Plagman/gamescope/pull/677
+PATCHFILES+= f4a33bd37e49.patch:-p1 # https://github.com/Plagman/gamescope/pull/632
+PATCHFILES+= be5e7d23e49e.patch:-p1 # wlroots 0.16 (black screen fix)
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Micro-compositor from SteamOS
@@ -19,7 +23,7 @@ BUILD_DEPENDS= glslangValidator:graphics/glslang \
libliftoff>=0.3.0<0.4.0:graphics/libliftoff \
vulkan-headers>0:graphics/vulkan-headers \
wayland-protocols>=1.17:graphics/wayland-protocols \
- wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots
+ wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \
libdrm.so:graphics/libdrm \
libliftoff.so:graphics/libliftoff \
@@ -47,6 +51,11 @@ PIPEWIRE_MESON_ENABLED= pipewire
post-extract:
# Merge patch_directory for subprojects without meson.build
@(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..)
+.if defined(PATCHFILES) && ${PATCHFILES:M91fbb22bda68*}
+# Pretend to be a regular file for vendor patch to apply as is
+ @${RMDIR} ${WRKSRC}/subprojects/wlroots
+ @${ECHO_CMD} "Subproject commit 9f41627aa10a94d9427bc315fa3d363a61b94d7c" \
+ >${WRKSRC}/subprojects/wlroots
+.endif
-.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo
index 8d723f58b646..c8a4a23812b8 100644
--- a/x11-wm/gamescope/distinfo
+++ b/x11-wm/gamescope/distinfo
@@ -9,3 +9,9 @@ SHA256 (e0927f7bce95.patch) = 6bbab2f37d7e76a1eade6d81bc0b441cc09f0020143bafb535
SIZE (e0927f7bce95.patch) = 1609
SHA256 (a618ea074660.patch) = c79b4b7a231d9c6e34912b8f4a301c6c60b921b6be5fb9c132d999e9a6930424
SIZE (a618ea074660.patch) = 2589
+SHA256 (91fbb22bda68.patch) = 024f58139f8d07c01138f3dcf39170dbfd48802b11001d73c7cdb494752e315f
+SIZE (91fbb22bda68.patch) = 17412
+SHA256 (f4a33bd37e49.patch) = dd22a0f5e4f0af44b65d04c22c2a67c992b0a3098adb83ddf52e5bcf222c9ec3
+SIZE (f4a33bd37e49.patch) = 1514
+SHA256 (be5e7d23e49e.patch) = 0c9ca3bcb9a580ed7774f2bff1d3b07a34da3ec35ea7292b90e84b315bf3eccf
+SIZE (be5e7d23e49e.patch) = 1216