git: a29022d17449 - main - x11-servers/xwayland-devel: update to 21.0.99.1.240

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 01 Jul 2022 10:07:23 UTC
The branch main has been updated by jbeich:

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

commit a29022d17449d8f3ffd88d46752f60fd67ec496e
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-06-27 20:40:03 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-07-01 10:06:52 +0000

    x11-servers/xwayland-devel: update to 21.0.99.1.240
    
    Changes:        https://gitlab.freedesktop.org/xorg/xserver/-/compare/b9b33d88e...727507eb3
---
 x11-servers/xwayland-devel/Makefile | 20 +++++++++++++-------
 x11-servers/xwayland-devel/distinfo | 18 +++++++++---------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index b6519ce4a2e7..05755ea5c53d 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
-DISTVERSION=	21.0.99.1-211
-DISTVERSIONSUFFIX=	-gb9b33d88e
+DISTVERSION=	21.0.99.1-240
+DISTVERSIONSUFFIX=	-g727507eb3
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	42e34498f87a.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	0d56c27582a2.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	1f7b28547011.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	a0a3ccbdacff.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	d0e66b17c809.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	811f3f35c969.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	X11 server as Wayland client (development snapshot)
@@ -45,7 +45,8 @@ PLIST_FILES=	bin/Xwayland \
 		"@comment lib/xorg/protocol.txt" \
 		libdata/pkgconfig/xwayland.pc \
 		"@comment man/man1/Xserver.1.gz" \
-		man/man1/Xwayland.1.gz
+		man/man1/Xwayland.1.gz \
+		share/applications/org.freedesktop.Xwayland.desktop
 
 # Keep in sync with xorg-server
 FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
@@ -59,7 +60,12 @@ DEFAULT_FONTPATH_LIST= \
 	${FONTPATH_ROOT}/75dpi/ \
 	catalogue:${FONTPATHD}
 
-OPTIONS_DEFINE=	NVIDIA
+OPTIONS_DEFINE=	CSD NVIDIA
+OPTIONS_DEFAULT=CSD
+
+CSD_DESC=		Client-side decorations via libdecor
+CSD_LIB_DEPENDS=	libdecor-0.so:x11-toolkits/libdecor
+CSD_MESON_TRUE=		libdecor
 
 NVIDIA_DESC=		EGLStream support for glamor on Xwayland
 NVIDIA_BUILD_DEPENDS=	egl-wayland>0:graphics/egl-wayland
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index 6f969ad5f5a5..6125e5a6d1e8 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1655804555
-SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-211-gb9b33d88e_GH0.tar.gz) = 989793f03888ff2d66cc74f9cef9a60e97690102a1afd9c3db5da7dccd29bd2e
-SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-211-gb9b33d88e_GH0.tar.gz) = 5459283
-SHA256 (42e34498f87a.patch) = 64cd5eed076cdc575f1189e8491fb752054970032697445e6c192b4e63cac2a4
-SIZE (42e34498f87a.patch) = 10310
-SHA256 (0d56c27582a2.patch) = b7a53f6f52c197ac42ae521881c2d5e986f9983f5eb3640ecf1adb51356db40f
-SIZE (0d56c27582a2.patch) = 17463
-SHA256 (1f7b28547011.patch) = 483d5e636f011570953579a53814c45789958af94d003cda19cedd394df93ed8
-SIZE (1f7b28547011.patch) = 2472
+TIMESTAMP = 1656604381
+SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-240-g727507eb3_GH0.tar.gz) = 6b7316a98fe5bc7b6996afcc8798cde024c5d23bdbc24ca2c374432773f2df5c
+SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-240-g727507eb3_GH0.tar.gz) = 5466342
+SHA256 (a0a3ccbdacff.patch) = a0c403ad7cb06284c649bb4fb0617e203521196b8376ae882bc81f864a22c7d0
+SIZE (a0a3ccbdacff.patch) = 10466
+SHA256 (d0e66b17c809.patch) = 10e65f1da1f57c2ff466bc2cf7847bf72e17874003182ae0bdee7a4e177507f5
+SIZE (d0e66b17c809.patch) = 17634
+SHA256 (811f3f35c969.patch) = da1a59adad3147cb5e8f02846580929fd09f008ba9a30b02d845b0fd7df21f74
+SIZE (811f3f35c969.patch) = 2519