xorg/xserver: version 21.1.0

6 files changed, 27 insertions, 14 deletions

diff --git a/xorg/xserver/BUILD b/xorg/xserver/BUILD
index ebe50c79b9..055b27291b 100755
--- a/xorg/xserver/BUILD
+++ b/xorg/xserver/BUILD
@@ -1,11 +1,9 @@
 #message CFLAGS=$CFLAGS
 OPTS+=" xorg=$XSERVER_XORG \
-        xwayland=false \
         xnest=$XSERVER_XNEST \
         xvfb=$XSERVER_XVFB \
         xselinux=${XSERVER_SELINUX} \
         xephyr=$XSERVER_XEPHYR \
-        dmx=$XSERVER_DMX \
         glamor=$XSERVER_GLAMOR \
         listen_tcp=$XSERVER_TCP \
         log_dir=${INSTALL_ROOT}/var/log \
diff --git a/xorg/xserver/CONFIGURE b/xorg/xserver/CONFIGURE
index 06383d716e..c125918284 100755
--- a/xorg/xserver/CONFIGURE
+++ b/xorg/xserver/CONFIGURE
@@ -1,16 +1,16 @@
-persistent_remove XORG_SERVER_OPTS
-persistent_remove XSERVER_WAYLAND
+persistent_remove XORG_SERVER_OPTS &&
+persistent_remove XSERVER_WAYLAND &&
+persistent_remove XSERVER_DMX &&
 #config_query XORG_XINITRC_XSESSION                                          \
 #                  "install a .desktop file that calls the user's .xinitrc?" n &&
 #config_query_list XSERVER_SHA1 "Choose SHA1 implementation:" \
 #                            nettle 
 #                            libgcrypt \
 #                            SSL
-config_query_option XSERVER_XORG    "Build Xorg server?" y true false
-config_query_option XSERVER_XNEST   "Build XNest nested X server?" n true false
-config_query_option XSERVER_XVFB    "Build Xvfb server?" n true false
-config_query_option XSERVER_XEPHYR  "Build Xephyr nested X server?" n true false
-config_query_option XSERVER_DMX     "Build DMX nested X server?" n true false
-config_query_option XSERVER_GLAMOR  "build Glamor" y true false
-config_query_option XSERVER_TCP     "listen on TCP" n true false
+config_query_option XSERVER_XORG    "Build Xorg server?" y true false &&
+config_query_option XSERVER_XNEST   "Build XNest nested X server?" n true false &&
+config_query_option XSERVER_XVFB    "Build Xvfb server?" n true false &&
+config_query_option XSERVER_XEPHYR  "Build Xephyr nested X server?" n true false &&
+config_query_option XSERVER_GLAMOR  "build Glamor" y true false &&
+config_query_option XSERVER_TCP     "listen on TCP" n true false &&
 config_query_option XSERVER_SELINUX     "Build XSELINUX" n true false
diff --git a/xorg/xserver/DEPENDS b/xorg/xserver/DEPENDS
index ebc5d64e3e..2691e403a5 100755
--- a/xorg/xserver/DEPENDS
+++ b/xorg/xserver/DEPENDS
@@ -14,6 +14,7 @@ depends libepoxy &&
 depends nettle   &&
 
 depends libpciaccess &&
+depends libxcvt      &&
 depends libxdmcp    &&
 depends libxext      &&
 depends libxfont2    &&
@@ -62,7 +63,7 @@ if is_depends_enabled $SPELL libxv;then
 fi &&
 
 optional_depends systemd \
-		 system_logind={true,false} \
+		 'systemd_logind=true' 'systemd_logind=false' \
 		 'for systemd-logind integration' &&
 if is_depends_enabled "$SPELL" systemd; then
   depends dbus
diff --git a/xorg/xserver/DETAILS b/xorg/xserver/DETAILS
index d6432ce657..7b98e11b52 100755
--- a/xorg/xserver/DETAILS
+++ b/xorg/xserver/DETAILS
@@ -1,7 +1,7 @@
 source $GRIMOIRE/MESON_FUNCTIONS
             SPELL=xserver
            SPELLX=xorg-server
-          VERSION=1.20.13
+          VERSION=21.1.0
           SOURCE=$SPELLX-$VERSION.tar.xz
     SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
          SOURCE2=$SOURCE.sig
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index 28ceb0e667..b5322db829 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,9 @@
+2021-10-27 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 21.1.0
+	* BUILD: removed dmx and xwayland options
+	* CONFIGURE: removed dmx knob, added && where needed
+	* DEPENDS: libxcvt is required now, fixed typo and removed bashism for systemd dep
+
 2021-07-30 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: version 1.20.13
 
diff --git a/xorg/xserver/PRE_BUILD b/xorg/xserver/PRE_BUILD
index 8f8d46a549..71c5200686 100755
--- a/xorg/xserver/PRE_BUILD
+++ b/xorg/xserver/PRE_BUILD
@@ -3,4 +3,12 @@ cd $SOURCE_DIRECTORY &&
 apply_patch_dir patches &&
 if is_depends_enabled $SPELL smgl-gl_select;then
   apply_patch_dir smgl
-fi
+fi &&
+
+# Dirty Meson hacks
+mkdir -p test/damage &&
+touch test/damage/meson.build &&
+touch include/Xserver.d &&
+touch hw/xfree86/drivers/inputtest/meson.build &&
+touch hw/xfree86/doc/meson.build &&
+touch doc/meson.build