aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2024-04-09 07:02:26 +0000
committerJan Beich <jbeich@FreeBSD.org>2024-04-09 16:05:21 +0000
commit7982b8922d80be5c96acc6151aa3301040070dae (patch)
treecd843b3cc27233bfd65bdbddc6a655af490c59c7
parent2e435f459ff0a25e517011514c441c2a437ed79c (diff)
downloadports-7982b8922d80be5c96acc6151aa3301040070dae.tar.gz
ports-7982b8922d80be5c96acc6151aa3301040070dae.zip
x11-servers/xwayland-devel: update to 21.0.99.1.910
Explicit sync requires https://github.com/freebsd/drm-kmod/issues/278 and currently disabled at build time due to missing <linux/dma-buf.h> Changes: https://gitlab.freedesktop.org/xorg/xserver/-/compare/052909ab9...337d8d48b
-rw-r--r--x11-servers/xwayland-devel/Makefile17
-rw-r--r--x11-servers/xwayland-devel/distinfo18
2 files changed, 17 insertions, 18 deletions
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 1760c0f0f277..aba47cbbe2af 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -1,16 +1,12 @@
PORTNAME= xwayland
DISTVERSIONPREFIX= xorg-server-
-DISTVERSION= 21.0.99.1-841
-DISTVERSIONSUFFIX= -g052909ab9
-PORTREVISION= 3
+DISTVERSION= 21.0.99.1-910
+DISTVERSIONSUFFIX= -g337d8d48b
CATEGORIES= x11-servers
PKGNAMESUFFIX= -devel
PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+= 96798fc19674.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463
-PATCHFILES+= 3e77295f888c.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463
-PATCHFILES+= 6c684d035c06.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463
-PATCHFILES+= bdca6c3d1f50.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463
+PATCHFILES+= cc43713d49ab.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1481
MAINTAINER= jbeich@FreeBSD.org
COMMENT= X11 server as Wayland client (development snapshot)
@@ -38,6 +34,7 @@ USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
GL_SITE= https://gitlab.freedesktop.org
GL_ACCOUNT= xorg
GL_PROJECT= xserver
+GL_TUPLE= xorg/proto:xorgproto:xorgproto-2024.1:xorgproto/subprojects/xorgproto
MESON_ARGS= -D${PORTNAME}=true \
-Dxorg=false \
-Dxnest=false \
@@ -77,4 +74,10 @@ EI_DESC= Emulated input via libei
EI_LIB_DEPENDS= libei.so:x11/libei
EI_MESON_OFF= -Dxwayland_ei=false
+.ifdef GL_TUPLE
+post-configure:
+ @${REINPLACE_CMD} 's/meson install/& \
+ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
+.endif
+
.include <bsd.port.mk>
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index 5d3e616b8444..bd2c7ccaf8ee 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,11 +1,7 @@
-TIMESTAMP = 1710808655
-SHA256 (xserver-xorg-server-21.0.99.1-841-g052909ab9.tar.bz2) = a5913f854f0d3035cf3c750ee2ddb0f9fd2573daaa1cb47ddc4f0c63b2367a50
-SIZE (xserver-xorg-server-21.0.99.1-841-g052909ab9.tar.bz2) = 3697834
-SHA256 (96798fc19674.patch) = 8b59b74f09476bb44d7b425dc2453b54766db4b7d30e20e1b1f1bef4ad0db7c1
-SIZE (96798fc19674.patch) = 1467
-SHA256 (3e77295f888c.patch) = 33686bbf6ecec42d064b4066b13f79f9e32f86d4ceef819ebdb7567f326fbd7d
-SIZE (3e77295f888c.patch) = 1358
-SHA256 (6c684d035c06.patch) = 01ad0be2af7c0a00fd3efd218eee64fb5bd8acbf0978186947f0b6b4b1b9febd
-SIZE (6c684d035c06.patch) = 1569
-SHA256 (bdca6c3d1f50.patch) = fcec0b3e508ee12824e7b2e48ede67766104105605ff996ad0df9cb1d9ad389d
-SIZE (bdca6c3d1f50.patch) = 3830
+TIMESTAMP = 1712646146
+SHA256 (xserver-xorg-server-21.0.99.1-910-g337d8d48b.tar.bz2) = 9366df0a829b457a6b9955f46ededcf0eca9d8329d428b50c39f96bb0a730392
+SIZE (xserver-xorg-server-21.0.99.1-910-g337d8d48b.tar.bz2) = 3708859
+SHA256 (xorgproto-xorgproto-2024.1.tar.bz2) = 3959b2d17d86dd9d165dc24d26f372ca64f27127cd381739366ba8383a6cd51a
+SIZE (xorgproto-xorgproto-2024.1.tar.bz2) = 775116
+SHA256 (cc43713d49ab.patch) = 4d7b0c95f899ead624d26af2952053c2840bec0b4a010e566ef0a0dfb0056f34
+SIZE (cc43713d49ab.patch) = 1011