git: f9c6f550c2f8 - 2023Q4 - x11-servers/xwayland-devel: unbundle x11/xorgproto after 61e150dcde10

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Wed, 08 Nov 2023 02:07:02 UTC
The branch 2023Q4 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f9c6f550c2f89dc4115af5f3fa487635c4f9ec3a

commit f9c6f550c2f89dc4115af5f3fa487635c4f9ec3a
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-11-04 00:26:49 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-11-08 02:06:52 +0000

    x11-servers/xwayland-devel: unbundle x11/xorgproto after 61e150dcde10
    
    (cherry picked from commit 127a1da6a399206adabe74cbdea96da091ed7f68)
---
 x11-servers/xwayland-devel/Makefile | 7 -------
 x11-servers/xwayland-devel/distinfo | 2 --
 2 files changed, 9 deletions(-)

diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 21863ccc0094..2311194b57f6 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -39,7 +39,6 @@ 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-2023.2:xorgproto/subprojects/xorgproto
 MESON_ARGS=	-D${PORTNAME}=true \
 		-Dxorg=false \
 		-Dxnest=false \
@@ -82,10 +81,4 @@ NVIDIA_DESC=		EGLStream support for glamor on Xwayland
 NVIDIA_BUILD_DEPENDS=	egl-wayland>0:graphics/egl-wayland
 NVIDIA_MESON_TRUE=	xwayland_eglstream
 
-.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 a849479e0acd..45ef3b4e3b29 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,8 +1,6 @@
 TIMESTAMP = 1698913080
 SHA256 (xserver-xorg-server-21.0.99.1-553-g141e7dd8a.tar.bz2) = e32773bcaa79e8265129c96426ac43a8831c0a1e874ac6579380899812a98ce7
 SIZE (xserver-xorg-server-21.0.99.1-553-g141e7dd8a.tar.bz2) = 3700375
-SHA256 (xorgproto-xorgproto-2023.2.tar.bz2) = 537da47d01508e706e6321ef95adedc2015dd2e682cd6759df3d8b2de035b718
-SIZE (xorgproto-xorgproto-2023.2.tar.bz2) = 770862
 SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75
 SIZE (cd6c9c1246af.patch) = 3730
 SHA256 (3930d00746b0.patch) = acae16d3636d12e631a14e2584a4ae5d527dfb9897b897631f7c8c8e3d5f49c7