xorg: upgrade to 21.1.4

Port changes:
- flavorize the port
- decouple Xwayland as it has been split from Xorg
- switch to meson
- cleanup non necessary patches anymore
- stop butchering the build system to play with Xorg.wrap but do it
  in post-install
- remove dmx (no longer existing)
- use libmd for sha1 (remove dependency on open/libre ssl)
- always activate RPC security
- simplify postinstall/deinstall script and make them cross install friendly
- remove the SUID option and make it the default, we cannot startx as user without it
- only keep the mesa-dri dependency on xorg-server not others

xf86-video-ati: fix build with recent xorg

While here incorporate a patch which prevent crash of the driver
when xrandr is invoked

Update x11/libxcvt to provide cvt(1) and friends which are not provided anymore
Xorg

Reviewed by:		tcberner, manu, jbeich
Approved by:		tcberner, manu
Differential Revision:	https://reviews.freebsd.org/D35661

MOVED

@@ -17528,3 +17528,8 @@ deskutils/gnome-documents||2022-08-01|Has expired: Archived upstream
 deskutils/gnome-search-tool||2022-08-01|Has expired: Did not survive gnome3
 security/nextcloud-twofactor_u2f|security/nextcloud-twofactor_webauthn|2022-08-01|Has expired: Upstream deprecated this port in favor of twofactor_webauthn. Check https://github.com/nextcloud/twofactor_webauthn#migration-from-two-factor-u2f for migration instructions
 editors/codelite||2022-08-01|Has expired: Has been broken for over a year.
+x11-servers/xephyr|x11-servers/xorg@xephyr|2022-08-02|Merged into flavorized version
+x11-servers/xorg-nestserver|x11-servers/xorg@xnest|2022-08-02|Merged into the flavorized version
+x11-servers/xorg-nestserver|x11-servers/xorg@xnest|2022-08-02|Merged into the flavorized version
+x11-servers/xorg-vfbserver|x11-servers/xorg@xvfb|2022-08-02|Merged into the flavorized version
+x11-servers/xorg-dmx||2022-08-02|Discontinued upstream

Mk/Uses/display.mk

@@ -14,7 +14,7 @@ display_ARGS=	install
 .  endif
 
 .  if !defined(DISPLAY)
-BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-vfbserver \
+BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-server@xvfb \
 	${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:x11-fonts/xorg-fonts-miscbitmaps \
 	${LOCALBASE}/share/fonts/misc/fonts.alias:x11-fonts/font-alias \
 	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \

Mk/Uses/xorg-cat.mk

@@ -17,7 +17,6 @@
 # 		* proto    install .pc file, needs pathfix, most only needed at
 # 		           build time.
 # 		* util     no particular notes
-# 		* xserver  xorg x servers
 #
 # 		These categories has to match upstream categories.  Don't invent
 # 		your own.
@@ -35,7 +34,7 @@
 .if !defined(_INCLUDE_USES_XORG_CAT_MK)
 _INCLUDE_USES_XORG_CAT_MK=yes
 
-_XORG_CATEGORIES=	app data doc driver font lib proto util xserver
+_XORG_CATEGORIES=	app data doc driver font lib proto util
 _XORG_BUILDSYSTEMS=	autotools meson
 
 _XORG_CAT=		# empty
@@ -163,21 +162,6 @@ CONFIGURE_ARGS+=--enable-malloc0returnsnull
 .  elif ${_XORG_CAT} == proto
 .include "${USESDIR}/pathfix.mk"
 
-.  elif ${_XORG_CAT} == xserver
-DISTNAME?=	xorg-server-${PORTVERSION}
-CFLAGS+=	-Werror=uninitialized
-.include "${USESDIR}/pathfix.mk"
-.    if ${_XORG_BUILDSYS} == meson
-# put meson stuff here
-.    else
-CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb \
-			--with-fontrootdir=${LOCALBASE}/share/fonts
-libtool_ARGS?=	# empty
-.include "${USESDIR}/libtool.mk"
-.    endif
-LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
-USE_XORG+=	fontutil
-
 .  endif # ${_XORG_CAT} == <category>
 
 # We only need to include xorg.mk if we want USE_XORG modules

net/tsclient/Makefile

@@ -32,7 +32,7 @@ RUN_DEPENDS+=	vncviewer:net/tightvnc
 .endif
 
 .if ${PORT_OPTIONS:MXNEST}
-RUN_DEPENDS+=	Xnest:x11-servers/xorg-nestserver
+RUN_DEPENDS+=	Xnest:x11-servers/xorg-server@xnest
 .endif
 
 .include <bsd.port.pre.mk>

www/selenium/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	selenium
 PORTVERSION=	4.1.3	
+PORTREVISION=	1
 CATEGORIES=	www devel java
 MASTER_SITES=	https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.1.0/
 DISTNAME=	selenium-server-${PORTVERSION}

www/selenium/pkg-message

@@ -7,7 +7,7 @@ www/chromium
 
 With one or more of these complementary ports:
 www/geckodriver
-x11-servers/xorg-vfbserver
+x11-servers/xorg-server@xvfb
 x11-fonts/xorg-fonts
 x11-fonts/webfonts
 x11/xauth

x11-drivers/xf86-video-ati/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	xf86-video-ati
 PORTVERSION=	19.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	x11-drivers
 
@@ -12,6 +12,9 @@ PATCHFILES+=	f223035f4ffcff2a9296d1e907a5193f8e8845a3.patch:-p1
 PATCHFILES+=	4d84cf438e7f1bebf0053035ef0292e9fed257d1.patch:-p1
 PATCHFILES+=	c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54.patch:-p1
 PATCHFILES+=	3845392426e9798c1fb2a6fc5e97bf5dfd5c443d.patch:-p1
+PATCHFILES+=	8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch:-p1
+
+EXTRA_PATCHES=	${FILESDIR}/0001_dont_set_sourcevalidate_pointer_to_null.diff:-p1
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING

x11-drivers/xf86-video-ati/distinfo

@@ -1,4 +1,4 @@
-TIMESTAMP = 1586946702
+TIMESTAMP = 1656682698
 SHA256 (xorg/driver/xf86-video-ati-19.1.0.tar.bz2) = 659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49
 SIZE (xorg/driver/xf86-video-ati-19.1.0.tar.bz2) = 904558
 SHA256 (xorg/driver/f223035f4ffcff2a9296d1e907a5193f8e8845a3.patch) = 34395b16c7849b342a2db62a08eb41dacbb1878583d47692cb6a798b7fd0a60d
@@ -9,3 +9,5 @@ SHA256 (xorg/driver/c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54.patch) = 00c001f873
 SIZE (xorg/driver/c0eb5dbd9c1db6b6d5b1574bcd8c584170d7ab54.patch) = 3679
 SHA256 (xorg/driver/3845392426e9798c1fb2a6fc5e97bf5dfd5c443d.patch) = ba978104ed1209a4e4f0a1e6067b5044745786c6f0183ba756e9860faa8ef914
 SIZE (xorg/driver/3845392426e9798c1fb2a6fc5e97bf5dfd5c443d.patch) = 1867
+SHA256 (xorg/driver/8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch) = fb3c215b742def4a3a412adbcefe5f4d9f36ce9c56af274dbcf50c389d2cd171
+SIZE (xorg/driver/8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch) = 14196

x11-drivers/xf86-video-ati/files/0001_dont_set_sourcevalidate_pointer_to_null.diff

@@ -0,0 +1,27 @@
+diff --git a/src/radeon_kms.c b/src/radeon_kms.c
+index 62962d61d8ee22a02567b7125b4bb3a7f7230be4..51b00dd9b013d183bf93d7f5578014dc16c80ce8 100644
+--- a/src/radeon_kms.c
++++ b/src/radeon_kms.c
+@@ -931,6 +931,13 @@ radeon_dirty_update(ScrnInfoPtr scrn)
+ 	}
+ }
+
++static void
++radeonSourceValidate(DrawablePtr draw, int x, int y, int w, int h,
++		     unsigned int subWindowMode)
++{
++}
++
++
+
+ Bool
+ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
+@@ -993,7 +1000,7 @@ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
+ 	    SetPicturePictFilter(src, xf86_crtc->filter, xf86_crtc->params,
+ 				 xf86_crtc->nparams);
+
+-	pScreen->SourceValidate = NULL;
++	pScreen->SourceValidate = radeonSourceValidate;
+ 	CompositePicture(PictOpSrc,
+ 			 src, NULL, dst,
+ 			 extents.x1, extents.y1, 0, 0, extents.x1,

x11-servers/Makefile

@@ -4,11 +4,7 @@
     SUBDIR += x2vnc
     SUBDIR += x2x
     SUBDIR += xarcan
-    SUBDIR += xephyr
-    SUBDIR += xorg-dmx
-    SUBDIR += xorg-nestserver
     SUBDIR += xorg-server
-    SUBDIR += xorg-vfbserver
     SUBDIR += xwayland
     SUBDIR += xwayland-devel