git: dedc6d2cf5fc - main - x11-servers/xwayland-devel: dedup HiDPI code after 05cdd9ed2abe

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sun, 14 Aug 2022 09:41:13 UTC
The branch main has been updated by jbeich:

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

commit dedc6d2cf5fcaa0c253557863b19bd05919e3457
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-08-14 07:56:35 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-08-14 09:40:45 +0000

    x11-servers/xwayland-devel: dedup HiDPI code after 05cdd9ed2abe
---
 x11-servers/xwayland-devel/Makefile | 18 +++++++++++++++---
 x11-servers/xwayland-devel/distinfo | 16 ++++++++++------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 45e5ef1c0ff0..b8dc06dfda73 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -2,13 +2,15 @@ PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	21.0.99.1-265
 DISTVERSIONSUFFIX=	-g2700bc604
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	4d0b5797ea05.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	d7f5c14cea5e.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	ede2ad4556df.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	38be22990fbf.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/960
+PATCHFILES+=	27d3b00b1ffd.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	9e1ea1442d7f.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	74813b4c09ca.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	X11 server as Wayland client (development snapshot)
@@ -34,6 +36,7 @@ USE_GL=		gbm gl
 USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 GH_ACCOUNT=	freedesktop
 GH_PROJECT=	xorg-xserver
+GH_TUPLE=	freedesktop:xorg-xorgproto:xorgproto-2022.2:xorgproto/subprojects/xorgproto
 MESON_ARGS=	-D${PORTNAME}=true \
 		-Dxorg=false \
 		-Dxnest=false \
@@ -72,4 +75,13 @@ NVIDIA_DESC=		EGLStream support for glamor on Xwayland
 NVIDIA_BUILD_DEPENDS=	egl-wayland>0:graphics/egl-wayland
 NVIDIA_MESON_TRUE=	xwayland_eglstream
 
+.ifdef GH_TUPLE
+post-install:
+# XXX USES=meson invokes ninja directly, so doesn't support --skip-subprojects
+	@${RM} -r ${STAGEDIR}${PREFIX}/include/GL
+	@${RM} -r ${STAGEDIR}${PREFIX}/include/X11
+	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc/xorgproto
+	@${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index 89967bdcfb2b..8a2e5def6c39 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,9 +1,13 @@
 TIMESTAMP = 1660177832
 SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-265-g2700bc604_GH0.tar.gz) = f3bdce492e28148c0524482f257f510c2d065c523fca766abae28c58931c3cda
 SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-265-g2700bc604_GH0.tar.gz) = 5468202
-SHA256 (4d0b5797ea05.patch) = 2e152a5e6fa50e7205c2a5cd2058de0385e4b8c101a070f6cb35fdfd358aa4fa
-SIZE (4d0b5797ea05.patch) = 10466
-SHA256 (d7f5c14cea5e.patch) = e78515da18998c55d0c54e11c0ad7d40a8eb5b7403e35efffe90f5582e8f28a5
-SIZE (d7f5c14cea5e.patch) = 18413
-SHA256 (ede2ad4556df.patch) = b3a15198f6a262b1c4cab9eb4c59e98b7037ed2811d69b6f5ed974015d4c0bb2
-SIZE (ede2ad4556df.patch) = 2519
+SHA256 (freedesktop-xorg-xorgproto-xorgproto-2022.2_GH0.tar.gz) = 407311f6fab7cd17404ee0a25eb11cbee0aac0347ddc36ae841070490116a204
+SIZE (freedesktop-xorg-xorgproto-xorgproto-2022.2_GH0.tar.gz) = 983580
+SHA256 (38be22990fbf.patch) = 0a42d8e71c9caaae34bb31a07abc72b81a0fe70eecf929dc9bfbf50f2a55cb10
+SIZE (38be22990fbf.patch) = 888
+SHA256 (27d3b00b1ffd.patch) = 5dd976d9b9cda681fdb7917c59900fd20e30296e0c4d0572b948946953d65d29
+SIZE (27d3b00b1ffd.patch) = 3884
+SHA256 (9e1ea1442d7f.patch) = 3e5f8761953e27cf877b5f3834c97ab236129e26c5a6376143da731a114427fe
+SIZE (9e1ea1442d7f.patch) = 18413
+SHA256 (74813b4c09ca.patch) = 1e115e88f1e2b078a0c2aa32da6ea6dfe6f39451f334b4313c625e10986deb30
+SIZE (74813b4c09ca.patch) = 2519