diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 1760c0f0f277..1ad2841ad8ca 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -1,80 +1,83 @@
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
-DISTVERSION=	21.0.99.1-841
-DISTVERSIONSUFFIX=	-g052909ab9
-PORTREVISION=	3
+DISTVERSION=	21.0.99.1-923
+DISTVERSIONSUFFIX=	-gc7d56b0e2
 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)
 WWW=		https://wayland.freedesktop.org/xserver.html
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
 		wayland-protocols>=1.30:graphics/wayland-protocols
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libepoxy.so:graphics/libepoxy \
 		libwayland-client.so:graphics/wayland \
 		libxcvt.so:x11/libxcvt
 RUN_DEPENDS=	xkbcomp:x11/xkbcomp \
 		xkeyboard-config>0:x11/xkeyboard-config
 
 CONFLICTS_INSTALL=	${PORTNAME}
 
 USES=		compiler:c11 gl meson pkgconfig xorg
 USE_GITLAB=	yes
 USE_GL=		gbm gl
 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 \
 		-Dxvfb=false \
 		-Dudev=false \
 		-Dudev_kms=false \
 		-Dxcsecurity=true \
 		-Dxkb_output_dir=/var/lib/xkb \
 		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 PLIST_FILES=	bin/Xwayland \
 		"@comment lib/xorg/protocol.txt" \
 		libdata/pkgconfig/xwayland.pc \
 		"@comment share/man/man1/Xserver.1.gz" \
 		share/man/man1/Xwayland.1.gz \
 		share/applications/org.freedesktop.Xwayland.desktop
 
 # Keep in sync with xorg-server
 FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
 FONTPATHD?=	${PREFIX}/etc/X11/fontpath.d
 DEFAULT_FONTPATH_LIST= \
 	${FONTPATH_ROOT}/misc/	\
 	${FONTPATH_ROOT}/TTF/ \
 	${FONTPATH_ROOT}/OTF/ \
 	${FONTPATH_ROOT}/Type1/ \
 	${FONTPATH_ROOT}/100dpi/ \
 	${FONTPATH_ROOT}/75dpi/ \
 	catalogue:${FONTPATHD}
 
 OPTIONS_DEFINE=	CSD EI
 OPTIONS_DEFAULT=CSD EI
 
 CSD_DESC=		Client-side decorations via libdecor
 CSD_LIB_DEPENDS=	libdecor-0.so:x11-toolkits/libdecor
 CSD_MESON_TRUE=		libdecor
 
 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..70d6f54e37c6 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 = 1712739308
+SHA256 (xserver-xorg-server-21.0.99.1-923-gc7d56b0e2.tar.bz2) = 6eb6b36549db29194da2931e0030ec0774abc960461c204b6205c285bd4e792b
+SIZE (xserver-xorg-server-21.0.99.1-923-gc7d56b0e2.tar.bz2) = 3709024
+SHA256 (xorgproto-xorgproto-2024.1.tar.bz2) = 3959b2d17d86dd9d165dc24d26f372ca64f27127cd381739366ba8383a6cd51a
+SIZE (xorgproto-xorgproto-2024.1.tar.bz2) = 775116
+SHA256 (cc43713d49ab.patch) = 4d7b0c95f899ead624d26af2952053c2840bec0b4a010e566ef0a0dfb0056f34
+SIZE (cc43713d49ab.patch) = 1011