Update to xserver 1.20.5. Tested by jsg@

1 files changed, 409 insertions, 731 deletions

diff --git a/xserver/configure b/xserver/configure
index e68eead19..98691730c 100644
--- a/xserver/configure
+++ b/xserver/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorg-server 1.19.7.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.5.
 #
 # Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>.
 #
@@ -651,8 +651,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.19.7'
-PACKAGE_STRING='xorg-server 1.19.7'
+PACKAGE_VERSION='1.20.5'
+PACKAGE_STRING='xorg-server 1.20.5'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -703,32 +703,24 @@ BUILD_DATE
 RELEASE_DATE
 SYSCONFDIR
 PROJECTROOT
+XWAYLAND_EGLSTREAM_FALSE
+XWAYLAND_EGLSTREAM_TRUE
 WAYLAND_PROTOCOLS_DATADIR
+SCANNER_ARG
+WAYLAND_SCANNER_LIBS
+WAYLAND_SCANNER_CFLAGS
 WAYLAND_SCANNER
 XWAYLAND_SYS_LIBS
 XWAYLAND_LIBS
+WAYLAND_EGLSTREAM_DATADIR
+WAYLAND_EGLSTREAM_LIBS
+WAYLAND_EGLSTREAM_CFLAGS
 XWAYLAND_FALSE
 XWAYLAND_TRUE
 XWAYLANDMODULES_LIBS
 XWAYLANDMODULES_CFLAGS
-XFAKESERVER_FALSE
-XFAKESERVER_TRUE
-BUILD_KDRIVEFBDEVLIB_FALSE
-BUILD_KDRIVEFBDEVLIB_TRUE
 XEPHYR_FALSE
 XEPHYR_TRUE
-KDRIVEFBDEV_FALSE
-KDRIVEFBDEV_TRUE
-TSLIB_FALSE
-TSLIB_TRUE
-KDRIVE_MOUSE_FALSE
-KDRIVE_MOUSE_TRUE
-KDRIVE_KBD_FALSE
-KDRIVE_KBD_TRUE
-KDRIVE_EVDEV_FALSE
-KDRIVE_EVDEV_TRUE
-KDRIVELINUX_FALSE
-KDRIVELINUX_TRUE
 KDRIVE_LIBS
 KDRIVE_LOCAL_LIBS
 KDRIVE_MAIN_LIB
@@ -739,14 +731,10 @@ KDRIVE_INCS
 XEPHYR_INCS
 XEPHYR_LIBS
 XEPHYR_CFLAGS
-TSLIB_LIBS
-TSLIB_CFLAGS
 KDRIVE_FALSE
 KDRIVE_TRUE
 DMX_BUILD_USB_FALSE
 DMX_BUILD_USB_TRUE
-DMX_BUILD_LNX_FALSE
-DMX_BUILD_LNX_TRUE
 X11EXAMPLES_DEP_LIBS
 X11EXAMPLES_DEP_CFLAGS
 XRESEXAMPLES_DEP_LIBS
@@ -786,20 +774,12 @@ PSEUDORAMIX_TRUE
 XPBPROXY_LIBS
 XPBPROXY_CFLAGS
 XQUARTZ_LIBS
-XWIN_XV_FALSE
-XWIN_XV_TRUE
-XWIN_RANDR_FALSE
-XWIN_RANDR_TRUE
 XWIN_WINDOWS_DRI_FALSE
 XWIN_WINDOWS_DRI_TRUE
 XWIN_GLX_WINDOWS_FALSE
 XWIN_GLX_WINDOWS_TRUE
-XWIN_CLIPBOARD_FALSE
-XWIN_CLIPBOARD_TRUE
 XWIN_MULTIWINDOWEXTWM_FALSE
 XWIN_MULTIWINDOWEXTWM_TRUE
-XWIN_MULTIWINDOW_FALSE
-XWIN_MULTIWINDOW_TRUE
 XWIN_FALSE
 XWIN_TRUE
 KHRONOS_SPEC_DIR
@@ -836,8 +816,6 @@ LNXAPM_FALSE
 LNXAPM_TRUE
 LNXACPI_FALSE
 LNXACPI_TRUE
-LINUX_ALPHA_FALSE
-LINUX_ALPHA_TRUE
 XORG_BUS_SPARC_FALSE
 XORG_BUS_SPARC_TRUE
 XORG_BUS_BSDPCI_FALSE
@@ -862,9 +840,9 @@ DEFAULT_LOGPREFIX
 DEFAULT_LOGDIR
 DEFAULT_LIBRARY_PATH
 DEFAULT_MODULE_PATH
-__XCONFIGDIR__
+XCONFIGDIR
 XF86CONFIGFILE
-__XCONFIGFILE__
+XCONFIGFILE
 XF86CONFIGDIR
 XORG_CFLAGS
 XORG_OS_SUBDIR
@@ -1376,7 +1354,6 @@ enable_xf86vidmode
 enable_xace
 enable_xselinux
 enable_xcsecurity
-enable_tslib
 enable_dbe
 enable_xf86bigfont
 enable_dpms
@@ -1404,16 +1381,12 @@ enable_xvfb
 enable_xnest
 enable_xquartz
 enable_xwayland
+enable_xwayland_eglstream
 enable_standalone_xpbproxy
 enable_xwin
 enable_glamor
 enable_kdrive
 enable_xephyr
-enable_xfake
-enable_xfbdev
-enable_kdrive_kbd
-enable_kdrive_mouse
-enable_kdrive_evdev
 enable_libunwind
 enable_xshmfence
 enable_install_setuid
@@ -1525,12 +1498,14 @@ XRESEXAMPLES_DEP_CFLAGS
 XRESEXAMPLES_DEP_LIBS
 X11EXAMPLES_DEP_CFLAGS
 X11EXAMPLES_DEP_LIBS
-TSLIB_CFLAGS
-TSLIB_LIBS
 XEPHYR_CFLAGS
 XEPHYR_LIBS
 XWAYLANDMODULES_CFLAGS
-XWAYLANDMODULES_LIBS'
+XWAYLANDMODULES_LIBS
+WAYLAND_EGLSTREAM_CFLAGS
+WAYLAND_EGLSTREAM_LIBS
+WAYLAND_SCANNER_CFLAGS
+WAYLAND_SCANNER_LIBS'
 
 
 # Initialize some variables set by options.
@@ -2071,7 +2046,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xorg-server 1.19.7 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.20.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2141,7 +2116,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xorg-server 1.19.7:";;
+     short | recursive ) echo "Configuration of xorg-server 1.20.5:";;
    esac
   cat <<\_ACEOF
 
@@ -2204,8 +2179,6 @@ Optional Features:
   --disable-xace          Build X-ACE extension (default: enabled)
   --enable-xselinux       Build SELinux extension (default: disabled)
   --enable-xcsecurity     Build Security extension (default: disabled)
-  --enable-tslib          Build kdrive tslib touchscreen support (default:
-                          disabled)
   --disable-dbe           Build DBE extension (default: enabled)
   --enable-xf86bigfont    Build XF86 Big Font extension (default: disabled)
   --disable-dpms          Build DPMS extension (default: enabled)
@@ -2239,6 +2212,8 @@ Optional Features:
   --enable-xnest          Build Xnest server (default: auto)
   --enable-xquartz        Build Xquartz server for OS-X (default: auto)
   --enable-xwayland       Build Xwayland server (default: auto)
+  --enable-xwayland-eglstream
+                          Build Xwayland eglstream support (default: no)
   --enable-standalone-xpbproxy
                           Build a standalone xpbproxy (in addition to the one
                           integrated into Xquartz as a separate thread)
@@ -2247,12 +2222,6 @@ Optional Features:
   --enable-glamor         Build glamor dix module (default: auto)
   --enable-kdrive         Build kdrive servers (default: no)
   --enable-xephyr         Build the kdrive Xephyr server (default: auto)
-  --enable-xfake          Build the kdrive 'fake' server (default: auto)
-  --enable-xfbdev         Build the kdrive framebuffer device server (default:
-                          auto)
-  --enable-kdrive-kbd     Build kbd driver for kdrive (default: auto)
-  --enable-kdrive-mouse   Build mouse driver for kdrive (default: auto)
-  --enable-kdrive-evdev   Build evdev driver for kdrive (default: auto)
   --enable-libunwind      Use libunwind for backtracing (default: auto)
   --disable-xshmfence     Disable xshmfence (default: auto)
   --enable-install-setuid Install Xorg server as owned by root with setuid bit
@@ -2316,7 +2285,7 @@ Optional Packages:
                           Path to 100dpi files [FONTROOTDIR/100dpi]
   --with-default-font-path=PATH
                           Comma separated list of font dirs
-  --with-xkb-path=PATH    Path to XKB base dir (default: ${datadir}/X11/xkb)
+  --with-xkb-path=PATH    Path to XKB base dir (default: auto)
   --with-xkb-output=PATH  Path to XKB output dir (default:
                           ${datadir}/X11/xkb/compiled)
   --with-default-xkb-rules=RULES
@@ -2342,10 +2311,10 @@ Optional Packages:
                           org.x)
   --with-bundle-version=VERSION
                           Version to use for X11.app's CFBundleVersion
-                          (default: 1.19.7)
+                          (default: 1.20.5)
   --with-bundle-version-string=VERSION
                           Version to use for X11.app's
-                          CFBundleShortVersionString (default: 1.19.7)
+                          CFBundleShortVersionString (default: 1.20.5)
   --with-sparkle-feed-url=URL
                           URL for the Sparkle feed (default:
                           https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2358,8 +2327,7 @@ Optional Packages:
                           directory for anonymous shared memory (default:
                           auto)
   --with-xkb-bin-directory=DIR
-                          Directory containing xkbcomp program (default:
-                          ${bindir})
+                          Directory containing xkbcomp program (default: auto)
   --with-sha1=libc|libmd|libnettle|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI
                           choose SHA1 implementation
 
@@ -2523,9 +2491,6 @@ Some influential environment variables:
               C compiler flags for X11EXAMPLES_DEP, overriding pkg-config
   X11EXAMPLES_DEP_LIBS
               linker flags for X11EXAMPLES_DEP, overriding pkg-config
-  TSLIB_CFLAGS
-              C compiler flags for TSLIB, overriding pkg-config
-  TSLIB_LIBS  linker flags for TSLIB, overriding pkg-config
   XEPHYR_CFLAGS
               C compiler flags for XEPHYR, overriding pkg-config
   XEPHYR_LIBS linker flags for XEPHYR, overriding pkg-config
@@ -2533,6 +2498,14 @@ Some influential environment variables:
               C compiler flags for XWAYLANDMODULES, overriding pkg-config
   XWAYLANDMODULES_LIBS
               linker flags for XWAYLANDMODULES, overriding pkg-config
+  WAYLAND_EGLSTREAM_CFLAGS
+              C compiler flags for WAYLAND_EGLSTREAM, overriding pkg-config
+  WAYLAND_EGLSTREAM_LIBS
+              linker flags for WAYLAND_EGLSTREAM, overriding pkg-config
+  WAYLAND_SCANNER_CFLAGS
+              C compiler flags for WAYLAND_SCANNER, overriding pkg-config
+  WAYLAND_SCANNER_LIBS
+              linker flags for WAYLAND_SCANNER, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -2600,7 +2573,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 1.19.7
+xorg-server configure 1.20.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3309,7 +3282,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xorg-server $as_me 1.19.7, which was
+It was created by xorg-server $as_me 1.20.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3657,8 +3630,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2019-03-02"
-RELEASE_NAME="Clemson Hamberder"
+RELEASE_DATE="2019-05-30"
+RELEASE_NAME="Red Lentil Dal"
 
 
 am__api_version='1.12'
@@ -4137,7 +4110,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='1.19.7'
+ VERSION='1.20.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12932,7 +12905,7 @@ ac_config_headers="$ac_config_headers include/xkb-config.h"
 
 ac_config_headers="$ac_config_headers include/xwin-config.h"
 
-ac_config_headers="$ac_config_headers include/kdrive-config.h"
+ac_config_headers="$ac_config_headers include/xwayland-config.h"
 
 ac_config_headers="$ac_config_headers include/version-config.h"
 
@@ -21912,132 +21885,6 @@ _ACEOF
 fi
 
 
-# Checks for headers/macros for byte swapping
-# Known variants:
-#	<byteswap.h> bswap_16, bswap_32, bswap_64  (glibc)
-#	<sys/endian.h> __swap16, __swap32, __swap64 (OpenBSD)
-#	<sys/endian.h> bswap16, bswap32, bswap64 (other BSD's)
-#	and a fallback to local macros if none of the above are found
-
-# if <byteswap.h> is found, assume it's the correct version
-for ac_header in byteswap.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
-if test "x$ac_cv_header_byteswap_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BYTESWAP_H 1
-_ACEOF
-
-fi
-
-done
-
-
-# if <sys/endian.h> is found, have to check which version
-ac_fn_c_check_header_mongrel "$LINENO" "sys/endian.h" "ac_cv_header_sys_endian_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_endian_h" = xyes; then :
-  HAVE_SYS_ENDIAN_H="yes"
-else
-  HAVE_SYS_ENDIAN_H="no"
-fi
-
-
-
-if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __swap16 variant of <sys/endian.h> byteswapping macros" >&5
-$as_echo_n "checking for __swap16 variant of <sys/endian.h> byteswapping macros... " >&6; }
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/endian.h>
-
-int
-main ()
-{
-
-int a = 1, b;
-b = __swap16(a);
-
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  SYS_ENDIAN__SWAP='yes'
-else
-  SYS_ENDIAN__SWAP='no'
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYS_ENDIAN__SWAP" >&5
-$as_echo "$SYS_ENDIAN__SWAP" >&6; }
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap16 variant of <sys/endian.h> byteswapping macros" >&5
-$as_echo_n "checking for bswap16 variant of <sys/endian.h> byteswapping macros... " >&6; }
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/endian.h>
-
-int
-main ()
-{
-
-int a = 1, b;
-b = bswap16(a);
-
-  ;
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  SYS_ENDIAN_BSWAP='yes'
-else
-  SYS_ENDIAN_BSWAP='no'
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYS_ENDIAN_BSWAP" >&5
-$as_echo "$SYS_ENDIAN_BSWAP" >&6; }
-
-    	if test "$SYS_ENDIAN_BSWAP" = "yes" ; then
-		USE_SYS_ENDIAN_H=yes
-		BSWAP=bswap
-	else
-	    	if test "$SYS_ENDIAN__SWAP" = "yes" ; then
-			USE_SYS_ENDIAN_H=yes
-			BSWAP=__swap
-		else
-			USE_SYS_ENDIAN_H=no
-		fi
-	fi
-
-	if test "$USE_SYS_ENDIAN_H" = "yes" ; then
-
-$as_echo "#define USE_SYS_ENDIAN_H 1" >>confdefs.h
-
-
-cat >>confdefs.h <<_ACEOF
-#define bswap_16 ${BSWAP}16
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define bswap_32 ${BSWAP}32
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define bswap_64 ${BSWAP}64
-_ACEOF
-
-	fi
-fi
-
 ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes; then :
 
@@ -22086,10 +21933,10 @@ fi
 
 
 
-for ac_func in backtrace ffs geteuid getuid issetugid getresuid \
+for ac_func in backtrace geteuid getuid issetugid getresuid \
 	getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \
 	mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \
-	walkcontext setitimer poll epoll_create1
+	walkcontext setitimer poll epoll_create1 mkostemp
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -22363,20 +22210,6 @@ fi
 done
 
 
-for ac_header in ndbm.h dbm.h rpcsvc/dbm.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
 for ac_header in linux/agpgart.h sys/agpio.h sys/agpgart.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23111,7 +22944,7 @@ $as_echo "$FONTPATH" >&6; }
 if test "${with_xkb_path+set}" = set; then :
   withval=$with_xkb_path;  XKBPATH="$withval"
 else
-   XKBPATH="${datadir}/X11/xkb"
+   XKBPATH="auto"
 fi
 
 
@@ -23206,7 +23039,7 @@ _ACEOF
 if test "${with_bundle_version+set}" = set; then :
   withval=$with_bundle_version;  BUNDLE_VERSION="${withval}"
 else
-   BUNDLE_VERSION="1.19.7"
+   BUNDLE_VERSION="1.20.5"
 fi
 
 
@@ -23412,13 +23245,6 @@ else
   XCSECURITY=no
 fi
 
-# Check whether --enable-tslib was given.
-if test "${enable_tslib+set}" = set; then :
-  enableval=$enable_tslib; TSLIB=$enableval
-else
-  TSLIB=no
-fi
-
 # Check whether --enable-dbe was given.
 if test "${enable_dbe+set}" = set; then :
   enableval=$enable_dbe; DBE=$enableval
@@ -23609,6 +23435,13 @@ else
   XWAYLAND=auto
 fi
 
+# Check whether --enable-xwayland-eglstream was given.
+if test "${enable_xwayland_eglstream+set}" = set; then :
+  enableval=$enable_xwayland_eglstream; XWAYLAND_EGLSTREAM=$enableval
+else
+  XWAYLAND_EGLSTREAM=no
+fi
+
 # Check whether --enable-standalone-xpbproxy was given.
 if test "${enable_standalone_xpbproxy+set}" = set; then :
   enableval=$enable_standalone_xpbproxy; STANDALONE_XPBPROXY=$enableval
@@ -23644,41 +23477,6 @@ else
   XEPHYR=auto
 fi
 
-# Check whether --enable-xfake was given.
-if test "${enable_xfake+set}" = set; then :
-  enableval=$enable_xfake; XFAKE=$enableval
-else
-  XFAKE=auto
-fi
-
-# Check whether --enable-xfbdev was given.
-if test "${enable_xfbdev+set}" = set; then :
-  enableval=$enable_xfbdev; XFBDEV=$enableval
-else
-  XFBDEV=auto
-fi
-
-# Check whether --enable-kdrive-kbd was given.
-if test "${enable_kdrive_kbd+set}" = set; then :
-  enableval=$enable_kdrive_kbd; KDRIVE_KBD=$enableval
-else
-  KDRIVE_KBD=auto
-fi
-
-# Check whether --enable-kdrive-mouse was given.
-if test "${enable_kdrive_mouse+set}" = set; then :
-  enableval=$enable_kdrive_mouse; KDRIVE_MOUSE=$enableval
-else
-  KDRIVE_MOUSE=auto
-fi
-
-# Check whether --enable-kdrive-evdev was given.
-if test "${enable_kdrive_evdev+set}" = set; then :
-  enableval=$enable_kdrive_evdev; KDRIVE_EVDEV=$enableval
-else
-  KDRIVE_EVDEV=auto
-fi
-
 # Check whether --enable-libunwind was given.
 if test "${enable_libunwind+set}" = set; then :
   enableval=$enable_libunwind; LIBUNWIND="$enableval"
@@ -24055,6 +23853,20 @@ $as_echo "#define LOCALCONN 1" >>confdefs.h
 
  fi
 
+ # Other functions Xtrans may need
+ for ac_func in strcasecmp strlcpy
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
 
 
 # Secure RPC detection macro from xtrans.m4
@@ -24206,7 +24018,6 @@ case $host_os in
 		XF86UTILS=no
 		XF86VIDMODE=no
 		XSELINUX=no
-		XV=no
 		SYMBOL_VISIBILITY=no
 		;;
 	darwin*)
@@ -24288,7 +24099,7 @@ SCRNSAVERPROTO="scrnsaverproto >= 1.1"
 RESOURCEPROTO="resourceproto >= 1.2.0"
 DRIPROTO="xf86driproto >= 2.1.0"
 DRI2PROTO="dri2proto >= 2.8"
-DRI3PROTO="dri3proto >= 1.0"
+DRI3PROTO="dri3proto >= 1.2"
 XINERAMAPROTO="xineramaproto"
 BIGFONTPROTO="xf86bigfontproto >= 1.2.0"
 DGAPROTO="xf86dgaproto >= 2.0.99.1"
@@ -24300,7 +24111,7 @@ APPLEWMPROTO="applewmproto >= 1.4"
 LIBXSHMFENCE="xshmfence >= 1.1"
 
 XPROTO="xproto >= 7.0.31"
-RANDRPROTO="randrproto >= 1.5.0"
+RANDRPROTO="randrproto >= 1.6.0"
 RENDERPROTO="renderproto >= 0.11"
 XEXTPROTO="xextproto >= 7.2.99.901"
 INPUTPROTO="inputproto >= 2.3"
@@ -24311,12 +24122,12 @@ DAMAGEPROTO="damageproto >= 1.1"
 XCMISCPROTO="xcmiscproto >= 1.2.0"
 BIGREQSPROTO="bigreqsproto >= 1.1.0"
 XTRANS="xtrans >= 1.3.5"
-PRESENTPROTO="presentproto >= 1.0"
+PRESENTPROTO="presentproto >= 1.1"
 
 LIBAPPLEWM="applewm >= 1.4"
 LIBDMX="dmx >= 1.0.99.1"
 LIBDRI="dri >= 7.8.0"
-LIBDRM="libdrm >= 2.3.1"
+LIBDRM="libdrm >= 2.4.89"
 LIBEGL="egl"
 LIBGBM="gbm >= 10.2.0"
 LIBGL="gl >= 7.1.0"
@@ -26224,6 +26035,7 @@ fi
 
 case "$DRI3,$HAVE_DRI3PROTO" in
 	yes,yes | auto,yes)
+		REQUIRED_MODULES="$REQUIRED_MODULES dri3proto"
 		;;
 	yes,no)
 		as_fn_error $? "DRI3 requested, but dri3proto not found." "$LINENO" 5
@@ -26697,7 +26509,7 @@ fi
 
 $as_echo "#define GLXEXT 1" >>confdefs.h
 
-	GLX_LIBS='$(top_builddir)/glx/libglx.la'
+	GLX_LIBS='$(top_builddir)/glx/libglx.la $(top_builddir)/glx/libglxvnd.la'
 	GLX_SYS_LIBS="$GLX_SYS_LIBS $GL_LIBS"
 else
         GLX=no
@@ -27077,6 +26889,10 @@ fi
 $as_echo "#define SHAPE 1" >>confdefs.h
 
 
+if test "x$XKBPATH" = "xauto"; then
+    XKBPATH=$(pkg-config --variable datadir xkbcomp || echo ${datadir})/X11/xkb
+fi
+
 
   prefix_NONE=
   exec_prefix_NONE=
@@ -27099,10 +26915,14 @@ _ACEOF
 if test "${with_xkb_bin_directory+set}" = set; then :
   withval=$with_xkb_bin_directory; XKB_BIN_DIRECTORY="$withval"
 else
-  XKB_BIN_DIRECTORY="$bindir"
+  XKB_BIN_DIRECTORY="auto"
 fi
 
 
+if test "x$XKB_BIN_DIRECTORY" = "xauto"; then
+    XKB_BIN_DIRECTORY=$(pkg-config --variable bindir xkbcomp || echo ${bindir})
+fi
+
 
   prefix_NONE=
   exec_prefix_NONE=
@@ -27264,50 +27084,6 @@ else
 $as_echo "yes" >&6; }
 	have_libxdmcp="yes"
 fi
-if test "x$have_libxdmcp" = xyes; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XdmcpWrap in -lXdmcp" >&5
-$as_echo_n "checking for XdmcpWrap in -lXdmcp... " >&6; }
-if ${ac_cv_lib_Xdmcp_XdmcpWrap+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXdmcp $XDMCP_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XdmcpWrap ();
-int
-main ()
-{
-return XdmcpWrap ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xdmcp_XdmcpWrap=yes
-else
-  ac_cv_lib_Xdmcp_XdmcpWrap=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp_XdmcpWrap" >&5
-$as_echo "$ac_cv_lib_Xdmcp_XdmcpWrap" >&6; }
-if test "x$ac_cv_lib_Xdmcp_XdmcpWrap" = xyes; then :
-  have_xdmcpwrap="yes"
-else
-  have_xdmcpwrap="no"
-fi
-
-fi
 if test "x$XDMCP" = xauto; then
 	if test "x$have_libxdmcp" = xyes; then
 		XDMCP=yes
@@ -27316,7 +27092,7 @@ if test "x$XDMCP" = xauto; then
 	fi
 fi
 if test "x$XDMAUTH" = xauto; then
-	if test "x$have_libxdmcp" = xyes && test "x$have_xdmcpwrap" = xyes; then
+	if test "x$have_libxdmcp" = xyes; then
 		XDMAUTH=yes
 	else
 		XDMAUTH=no
@@ -27464,11 +27240,6 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define XORG_DATE "$RELEASE_DATE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
 #define XORG_MAN_VERSION "$VENDOR_MAN_VERSION"
 _ACEOF
 
@@ -28793,9 +28564,6 @@ $as_echo "$XSERVER_PLATFORM_BUS" >&6; }
 		XORG_OS_SUBDIR="linux"
 		linux_acpi="no"
 		case $host_cpu in
-		  alpha*)
-		  	linux_alpha=yes
-			;;
 		  i*86|amd64*|x86_64*|ia64*)
 			linux_acpi=$enable_linux_acpi
 			;;
@@ -29193,16 +28961,7 @@ fi
 	fi
 
 	if test "x$DRM" = xyes; then
-				if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.46\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.46") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  XORG_DRIVER_MODESETTING=yes
-else
-  XORG_DRIVER_MODESETTING=no
-fi
+		XORG_DRIVER_MODESETTING=yes
 	fi
 
 
@@ -29248,11 +29007,11 @@ $as_echo "#define __XSERVERNAME__ \"Xorg\"" >>confdefs.h
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$XF86CONFIGFILE\""
   eval ac_define_dir="\"$ac_define_dir\""
-  __XCONFIGFILE__="$ac_define_dir"
+  XCONFIGFILE="$ac_define_dir"
 
 
 cat >>confdefs.h <<_ACEOF
-#define __XCONFIGFILE__ "$ac_define_dir"
+#define XCONFIGFILE "$ac_define_dir"
 _ACEOF
 
   test "$prefix_NONE" && prefix=NONE
@@ -29282,11 +29041,11 @@ _ACEOF
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"$XF86CONFIGDIR\""
   eval ac_define_dir="\"$ac_define_dir\""
-  __XCONFIGDIR__="$ac_define_dir"
+  XCONFIGDIR="$ac_define_dir"
 
 
 cat >>confdefs.h <<_ACEOF
-#define __XCONFIGDIR__ "$ac_define_dir"
+#define XCONFIGDIR "$ac_define_dir"
 _ACEOF
 
   test "$prefix_NONE" && prefix=NONE
@@ -29461,14 +29220,6 @@ else
   XORG_BUS_SPARC_FALSE=
 fi
 
- if test "x$linux_alpha" = xyes; then
-  LINUX_ALPHA_TRUE=
-  LINUX_ALPHA_FALSE='#'
-else
-  LINUX_ALPHA_TRUE='#'
-  LINUX_ALPHA_FALSE=
-fi
-
  if test "x$linux_acpi" = xyes; then
   LNXACPI_TRUE=
   LNXACPI_FALSE='#'
@@ -29519,10 +29270,7 @@ fi
 
 
 if test "x$GLAMOR" = xauto; then
-	if test "x$XORG" = xyes; then
-		GLAMOR=yes
-	fi
-	if test "x$XEPHYR" = xyes; then
+	if echo "$XORG" "$XEPHYR" "$XWAYLAND" | grep -q yes ; then
 		GLAMOR=yes
 	fi
 fi
@@ -29632,6 +29380,17 @@ $as_echo "yes" >&6; }
 
 fi
 
+	if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy >= 1.4.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "epoxy >= 1.4.4") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+
+$as_echo "#define GLAMOR_HAS_EGL_QUERY_DMABUF 1" >>confdefs.h
+
+fi
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GBM" >&5
@@ -29716,6 +29475,16 @@ $as_echo "#define GLAMOR_HAS_GBM_LINEAR 1" >>confdefs.h
 
 fi
 
+				if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gbm >= 17.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gbm >= 17.1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+
+$as_echo "#define GBM_BO_WITH_MODIFIERS 1" >>confdefs.h
+
+fi
 	else
 		if test "x$XORG" = xyes; then
 			as_fn_error $? "Glamor for Xorg requires $LIBGBM" "$LINENO" 5
@@ -30372,14 +30141,6 @@ else
   XWIN_FALSE=
 fi
 
- if test "x$XWIN" = xyes; then
-  XWIN_MULTIWINDOW_TRUE=
-  XWIN_MULTIWINDOW_FALSE='#'
-else
-  XWIN_MULTIWINDOW_TRUE='#'
-  XWIN_MULTIWINDOW_FALSE=
-fi
-
  if test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes; then
   XWIN_MULTIWINDOWEXTWM_TRUE=
   XWIN_MULTIWINDOWEXTWM_FALSE='#'
@@ -30388,14 +30149,6 @@ else
   XWIN_MULTIWINDOWEXTWM_FALSE=
 fi
 
- if test "x$XWIN" = xyes; then
-  XWIN_CLIPBOARD_TRUE=
-  XWIN_CLIPBOARD_FALSE='#'
-else
-  XWIN_CLIPBOARD_TRUE='#'
-  XWIN_CLIPBOARD_FALSE=
-fi
-
  if test "x$XWIN" = xyes && test "x$GLX" = xyes; then
   XWIN_GLX_WINDOWS_TRUE=
   XWIN_GLX_WINDOWS_FALSE='#'
@@ -30412,22 +30165,6 @@ else
   XWIN_WINDOWS_DRI_FALSE=
 fi
 
- if test "x$XWIN" = xyes; then
-  XWIN_RANDR_TRUE=
-  XWIN_RANDR_FALSE='#'
-else
-  XWIN_RANDR_TRUE='#'
-  XWIN_RANDR_FALSE=
-fi
-
- if test "x$XWIN" = xyes && test "x$XV" = xyes; then
-  XWIN_XV_TRUE=
-  XWIN_XV_FALSE='#'
-else
-  XWIN_XV_TRUE='#'
-  XWIN_XV_FALSE=
-fi
-
 
 if test "x$XQUARTZ" = xyes; then
 
@@ -30928,7 +30665,7 @@ if test "x$DMX" = xyes; then
 	fi
 	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"
 	XDMX_CFLAGS="$DMXMODULES_CFLAGS"
-	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $PRESENT_LIB $RANDR_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $DRI3_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"
+	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $RANDR_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"
 	XDMX_SYS_LIBS="$DMXMODULES_LIBS"
 
 
@@ -30942,14 +30679,6 @@ else
 fi
 
 
-	ac_fn_c_check_header_mongrel "$LINENO" "linux/keyboard.h" "ac_cv_header_linux_keyboard_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_keyboard_h" = xyes; then :
-  DMX_BUILD_LNX="yes"
-else
-  DMX_BUILD_LNX="no"
-fi
-
-
 
 
 
@@ -31506,14 +31235,6 @@ fi
 
 
 fi
- if test "x$DMX_BUILD_LNX" = xyes; then
-  DMX_BUILD_LNX_TRUE=
-  DMX_BUILD_LNX_FALSE='#'
-else
-  DMX_BUILD_LNX_TRUE='#'
-  DMX_BUILD_LNX_FALSE=
-fi
-
  if test "x$DMX_BUILD_USB" = xyes; then
   DMX_BUILD_USB_TRUE=
   DMX_BUILD_USB_FALSE='#'
@@ -31537,212 +31258,7 @@ fi
 
 
 if test "$KDRIVE" = yes; then
-
-$as_echo "#define KDRIVESERVER 1" >>confdefs.h
-
-
-$as_echo "#define KDRIVEDDXACTIONS /**/" >>confdefs.h
-
-
-    for ac_header in linux/fb.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "linux/fb.h" "ac_cv_header_linux_fb_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_fb_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_FB_H 1
-_ACEOF
-
-fi
-
-done
-
-    if test "$ac_cv_header_linux_fb_h" = yes && test "x$XFBDEV" = xauto; then
-        XFBDEV=yes
-    fi
-
-    if test "x$XFBDEV" = xyes; then
-        KDRIVEFBDEVLIB=yes
-
-$as_echo "#define KDRIVEFBDEV 1" >>confdefs.h
-
-    fi
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5
-$as_echo_n "checking for TSLIB... " >&6; }
-
-if test -n "$TSLIB_CFLAGS"; then
-    pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_TSLIB_CFLAGS=`$PKG_CONFIG --cflags "tslib-0.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$TSLIB_LIBS"; then
-    pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_TSLIB_LIBS=`$PKG_CONFIG --libs "tslib-0.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "tslib-0.0" 2>&1`
-        else
-	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "tslib-0.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$TSLIB_PKG_ERRORS" >&5
-
-	HAVE_TSLIB="no"
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	HAVE_TSLIB="no"
-else
-	TSLIB_CFLAGS=$pkg_cv_TSLIB_CFLAGS
-	TSLIB_LIBS=$pkg_cv_TSLIB_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	HAVE_TSLIB="yes"
-fi
-    if test "x$HAVE_TSLIB" = xno; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ts_open in -lts" >&5
-$as_echo_n "checking for ts_open in -lts... " >&6; }
-if ${ac_cv_lib_ts_ts_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lts  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ts_open ();
-int
-main ()
-{
-return ts_open ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ts_ts_open=yes
-else
-  ac_cv_lib_ts_ts_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ts_ts_open" >&5
-$as_echo "$ac_cv_lib_ts_ts_open" >&6; }
-if test "x$ac_cv_lib_ts_ts_open" = xyes; then :
-
-			HAVE_TSLIB="yes"
-			TSLIB_LIBS="-lts"
-
-fi
-
-    fi
-
-    if test "xTSLIB" = xauto; then
-        TSLIB="$HAVE_TSLIB"
-    fi
-
-    if test "x$TSLIB" = xyes; then
-        if ! test "x$HAVE_TSLIB" = xyes; then
-            as_fn_error $? "tslib must be installed to build the tslib driver. See http://tslib.berlios.de/" "$LINENO" 5
-        else
-
-$as_echo "#define TSLIB 1" >>confdefs.h
-
-        fi
-    fi
-
-    case $host_os in
-	*linux*)
-	    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la'
-            KDRIVELINUX=yes
-	    if test "x$KDRIVE_EVDEV" = xauto; then
-		KDRIVE_EVDEV=yes
-	    fi
-	    if test "x$KDRIVE_KBD" = xauto; then
-		KDRIVE_KBD=yes
-	    fi
-	    if test "x$KDRIVE_MOUSE" = xauto; then
-		KDRIVE_MOUSE=yes
-	    fi
-	    ;;
-	*)
-	    if test "x$KDRIVE_EVDEV" = xauto; then
-		KDRIVE_EVDEV=no
-	    fi
-	    if test "x$KDRIVE_KBD" = xauto; then
-		KDRIVE_KBD=no
-	    fi
-	    if test "x$KDRIVE_MOUSE" = xauto; then
-		KDRIVE_MOUSE=no
-	    fi
-	    ;;
-    esac
-
-    if test "x$KDRIVE_KBD" = xyes; then
-
-$as_echo "#define KDRIVE_KBD 1" >>confdefs.h
-
-    fi
-    if test "x$KDRIVE_EVDEV" = xyes; then
-
-$as_echo "#define KDRIVE_EVDEV 1" >>confdefs.h
-
-    fi
-    if test "x$KDRIVE_MOUSE" = xyes; then
-
-$as_echo "#define KDRIVE_MOUSE 1" >>confdefs.h
-
-    fi
-
-    XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm xcb-keysyms xcb-randr xcb-xkb"
+    XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb"
     if test "x$XV" = xyes; then
         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv"
     fi
@@ -31973,7 +31489,7 @@ fi
     KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
     KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
 
-    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
+    KDRIVE_CFLAGS="$XSERVER_CFLAGS"
 
     KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
     KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
@@ -31981,7 +31497,7 @@ fi
     KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB"
     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"
-    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
+    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
 
 
 
@@ -31993,54 +31509,6 @@ fi
 
 
 
- if test "x$KDRIVELINUX" = xyes; then
-  KDRIVELINUX_TRUE=
-  KDRIVELINUX_FALSE='#'
-else
-  KDRIVELINUX_TRUE='#'
-  KDRIVELINUX_FALSE=
-fi
-
- if test "x$KDRIVE_EVDEV" = xyes; then
-  KDRIVE_EVDEV_TRUE=
-  KDRIVE_EVDEV_FALSE='#'
-else
-  KDRIVE_EVDEV_TRUE='#'
-  KDRIVE_EVDEV_FALSE=
-fi
-
- if test "x$KDRIVE_KBD" = xyes; then
-  KDRIVE_KBD_TRUE=
-  KDRIVE_KBD_FALSE='#'
-else
-  KDRIVE_KBD_TRUE='#'
-  KDRIVE_KBD_FALSE=
-fi
-
- if test "x$KDRIVE_MOUSE" = xyes; then
-  KDRIVE_MOUSE_TRUE=
-  KDRIVE_MOUSE_FALSE='#'
-else
-  KDRIVE_MOUSE_TRUE='#'
-  KDRIVE_MOUSE_FALSE=
-fi
-
- if test "x$HAVE_TSLIB" = xyes; then
-  TSLIB_TRUE=
-  TSLIB_FALSE='#'
-else
-  TSLIB_TRUE='#'
-  TSLIB_FALSE=
-fi
-
- if test "x$XFBDEV" = xyes; then
-  KDRIVEFBDEV_TRUE=
-  KDRIVEFBDEV_FALSE='#'
-else
-  KDRIVEFBDEV_TRUE='#'
-  KDRIVEFBDEV_FALSE=
-fi
-
  if test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes; then
   XEPHYR_TRUE=
   XEPHYR_FALSE='#'
@@ -32049,25 +31517,9 @@ else
   XEPHYR_FALSE=
 fi
 
- if test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes; then
-  BUILD_KDRIVEFBDEVLIB_TRUE=
-  BUILD_KDRIVEFBDEVLIB_FALSE='#'
-else
-  BUILD_KDRIVEFBDEVLIB_TRUE='#'
-  BUILD_KDRIVEFBDEVLIB_FALSE=
-fi
-
- if test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes; then
-  XFAKESERVER_TRUE=
-  XFAKESERVER_FALSE='#'
-else
-  XFAKESERVER_TRUE='#'
-  XFAKESERVER_FALSE=
-fi
 
 
-
-XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.1 $LIBDRM epoxy"
+XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.10 $LIBDRM epoxy"
 if test "x$XF86VIDMODE" = xyes; then
 	XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO"
 fi
@@ -32163,6 +31615,106 @@ if test "x$XWAYLAND" = xyes; then
 		as_fn_error $? "Xwayland build explicitly requested, but required modules not found." "$LINENO" 5
 	fi
 
+	if test "x$GLAMOR" = xyes && test "x$GBM" = xyes; then
+
+$as_echo "#define XWL_HAS_GLAMOR 1" >>confdefs.h
+
+	fi
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_EGLSTREAM" >&5
+$as_echo_n "checking for WAYLAND_EGLSTREAM... " >&6; }
+
+if test -n "$WAYLAND_EGLSTREAM_CFLAGS"; then
+    pkg_cv_WAYLAND_EGLSTREAM_CFLAGS="$WAYLAND_EGLSTREAM_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-eglstream-protocols >= 1.0.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wayland-eglstream-protocols >= 1.0.2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WAYLAND_EGLSTREAM_CFLAGS=`$PKG_CONFIG --cflags "wayland-eglstream-protocols >= 1.0.2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$WAYLAND_EGLSTREAM_LIBS"; then
+    pkg_cv_WAYLAND_EGLSTREAM_LIBS="$WAYLAND_EGLSTREAM_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-eglstream-protocols >= 1.0.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wayland-eglstream-protocols >= 1.0.2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WAYLAND_EGLSTREAM_LIBS=`$PKG_CONFIG --libs "wayland-eglstream-protocols >= 1.0.2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        WAYLAND_EGLSTREAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-eglstream-protocols >= 1.0.2" 2>&1`
+        else
+	        WAYLAND_EGLSTREAM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-eglstream-protocols >= 1.0.2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$WAYLAND_EGLSTREAM_PKG_ERRORS" >&5
+
+	have_wl_eglstream=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_wl_eglstream=no
+else
+	WAYLAND_EGLSTREAM_CFLAGS=$pkg_cv_WAYLAND_EGLSTREAM_CFLAGS
+	WAYLAND_EGLSTREAM_LIBS=$pkg_cv_WAYLAND_EGLSTREAM_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_wl_eglstream=yes
+fi
+
+	if test "x$XWAYLAND_EGLSTREAM" = xauto; then
+		if test "x$have_wl_eglstream" = xyes && test "x$GLAMOR" = xyes; then
+			XWAYLAND_EGLSTREAM=yes
+		fi
+	fi
+
+	if test "x$XWAYLAND_EGLSTREAM" = xyes; then
+		if test "x$GLAMOR" != xyes; then
+			as_fn_error $? "Xwayland eglstream support explicitly requested, but required modules not found." "$LINENO" 5
+		fi
+
+		if test "x$have_wl_eglstream" = xno; then
+			as_fn_error $? "Xwayland eglstream support requires wayland-eglstream-protocols >= 1.0.2" "$LINENO" 5
+		fi
+
+		WAYLAND_EGLSTREAM_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-eglstream-protocols`
+
+
+$as_echo "#define XWL_HAS_EGLSTREAM 1" >>confdefs.h
+
+	fi
+
 	XWAYLAND_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB"
 	XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS"
 
@@ -32172,7 +31724,6 @@ if test "x$XWAYLAND" = xyes; then
 		as_fn_error $? "Xwayland requires CLOCK_MONOTONIC support." "$LINENO" 5
 	fi
 
-	WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client`
 	# Extract the first word of "wayland-scanner", so it can be a program name with args.
 set dummy wayland-scanner; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -32186,7 +31737,7 @@ else
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in ${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -32213,10 +31764,188 @@ $as_echo "no" >&6; }
 fi
 
 
+	if test "x$WAYLAND_SCANNER" = x; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_SCANNER" >&5
+$as_echo_n "checking for WAYLAND_SCANNER... " >&6; }
+
+if test -n "$WAYLAND_SCANNER_CFLAGS"; then
+    pkg_cv_WAYLAND_SCANNER_CFLAGS="$WAYLAND_SCANNER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-scanner\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wayland-scanner") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WAYLAND_SCANNER_CFLAGS=`$PKG_CONFIG --cflags "wayland-scanner" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$WAYLAND_SCANNER_LIBS"; then
+    pkg_cv_WAYLAND_SCANNER_LIBS="$WAYLAND_SCANNER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-scanner\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wayland-scanner") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WAYLAND_SCANNER_LIBS=`$PKG_CONFIG --libs "wayland-scanner" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        WAYLAND_SCANNER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-scanner" 2>&1`
+        else
+	        WAYLAND_SCANNER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-scanner" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$WAYLAND_SCANNER_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (wayland-scanner) were not met:
+
+$WAYLAND_SCANNER_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables WAYLAND_SCANNER_CFLAGS
+and WAYLAND_SCANNER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables WAYLAND_SCANNER_CFLAGS
+and WAYLAND_SCANNER_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	WAYLAND_SCANNER_CFLAGS=$pkg_cv_WAYLAND_SCANNER_CFLAGS
+	WAYLAND_SCANNER_LIBS=$pkg_cv_WAYLAND_SCANNER_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+		WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
+
+	fi
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_SCANNER" >&5
+$as_echo_n "checking for WAYLAND_SCANNER... " >&6; }
+
+if test -n "$WAYLAND_SCANNER_CFLAGS"; then
+    pkg_cv_WAYLAND_SCANNER_CFLAGS="$WAYLAND_SCANNER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-scanner >= 1.14.91\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wayland-scanner >= 1.14.91") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WAYLAND_SCANNER_CFLAGS=`$PKG_CONFIG --cflags "wayland-scanner >= 1.14.91" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$WAYLAND_SCANNER_LIBS"; then
+    pkg_cv_WAYLAND_SCANNER_LIBS="$WAYLAND_SCANNER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-scanner >= 1.14.91\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "wayland-scanner >= 1.14.91") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WAYLAND_SCANNER_LIBS=`$PKG_CONFIG --libs "wayland-scanner >= 1.14.91" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        WAYLAND_SCANNER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-scanner >= 1.14.91" 2>&1`
+        else
+	        WAYLAND_SCANNER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-scanner >= 1.14.91" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$WAYLAND_SCANNER_PKG_ERRORS" >&5
+
+	SCANNER_ARG='code'
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	SCANNER_ARG='code'
+
+else
+	WAYLAND_SCANNER_CFLAGS=$pkg_cv_WAYLAND_SCANNER_CFLAGS
+	WAYLAND_SCANNER_LIBS=$pkg_cv_WAYLAND_SCANNER_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	SCANNER_ARG='private-code'
+
+fi
 
 	WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
 
 fi
+ if test "x$XWAYLAND_EGLSTREAM" = "xyes"; then
+  XWAYLAND_EGLSTREAM_TRUE=
+  XWAYLAND_EGLSTREAM_FALSE='#'
+else
+  XWAYLAND_EGLSTREAM_TRUE='#'
+  XWAYLAND_EGLSTREAM_FALSE=
+fi
+
 
 
 
@@ -32279,9 +32008,15 @@ _ACEOF
 
 
 
-BUILD_DATE="`date +'%Y%m%d'`"
+DATE_FMT="%Y%m%d"
+TIME_FMT="1%H%M%S"
+BUILD_DATE="`date "+$DATE_FMT"`"
+BUILD_TIME="`date "+$TIME_FMT"`"
+if test "x$SOURCE_DATE_EPOCH" != "x"; then
+	BUILD_DATE="`date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || date -u "+$DATE_FMT"`"
+	BUILD_TIME="`date -u -d "@$SOURCE_DATE_EPOCH" "+$TIME_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+$TIME_FMT" 2>/dev/null || date -u "+$TIME_FMT"`"
+fi
 
-BUILD_TIME="`date +'1%H%M%S'`"
 
 
 DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
@@ -32308,7 +32043,7 @@ $as_echo "$as_me: WARNING:
              ***********************************************" >&2;}
 fi
 
-ac_config_files="$ac_config_files Makefile glx/Makefile include/Makefile composite/Makefile damageext/Makefile dbe/Makefile dix/Makefile doc/Makefile doc/dtrace/Makefile man/Makefile fb/Makefile glamor/Makefile record/Makefile config/Makefile mi/Makefile miext/Makefile miext/sync/Makefile miext/damage/Makefile miext/shadow/Makefile miext/rootless/Makefile os/Makefile pseudoramiX/Makefile randr/Makefile render/Makefile xkb/Makefile Xext/Makefile Xi/Makefile xfixes/Makefile exa/Makefile dri3/Makefile present/Makefile hw/Makefile hw/xfree86/Makefile hw/xfree86/Xorg.sh hw/xfree86/common/Makefile hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile hw/xfree86/doc/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile hw/xfree86/dri2/pci_ids/Makefile hw/xfree86/drivers/Makefile hw/xfree86/drivers/modesetting/Makefile hw/xfree86/exa/Makefile hw/xfree86/exa/man/Makefile hw/xfree86/fbdevhw/Makefile hw/xfree86/fbdevhw/man/Makefile hw/xfree86/glamor_egl/Makefile hw/xfree86/i2c/Makefile hw/xfree86/int10/Makefile hw/xfree86/loader/Makefile hw/xfree86/man/Makefile hw/xfree86/modes/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile hw/xfree86/os-support/bus/Makefile hw/xfree86/os-support/hurd/Makefile hw/xfree86/os-support/misc/Makefile hw/xfree86/os-support/linux/Makefile hw/xfree86/os-support/solaris/Makefile hw/xfree86/os-support/stub/Makefile hw/xfree86/parser/Makefile hw/xfree86/ramdac/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile hw/xfree86/x86emu/Makefile hw/xfree86/xkb/Makefile hw/xfree86/utils/Makefile hw/xfree86/utils/man/Makefile hw/xfree86/utils/cvt/Makefile hw/xfree86/utils/gtf/Makefile hw/dmx/config/Makefile hw/dmx/config/man/Makefile hw/dmx/doc/Makefile hw/dmx/doxygen/doxygen.conf hw/dmx/doxygen/Makefile hw/dmx/examples/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/dmx/man/Makefile hw/vfb/Makefile hw/vfb/man/Makefile hw/xnest/Makefile hw/xnest/man/Makefile hw/xwin/Makefile hw/xwin/dri/Makefile hw/xwin/glx/Makefile hw/xwin/man/Makefile hw/xwin/winclipboard/Makefile hw/xquartz/Makefile hw/xquartz/GL/Makefile hw/xquartz/bundle/Makefile hw/xquartz/man/Makefile hw/xquartz/mach-startup/Makefile hw/xquartz/pbproxy/Makefile hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/ephyr/man/Makefile hw/kdrive/fake/Makefile hw/kdrive/fbdev/Makefile hw/kdrive/linux/Makefile hw/kdrive/src/Makefile hw/xwayland/Makefile test/Makefile test/xi1/Makefile test/xi2/Makefile xserver.ent xorg-server.pc"
+ac_config_files="$ac_config_files Makefile glx/Makefile include/Makefile composite/Makefile damageext/Makefile dbe/Makefile dix/Makefile doc/Makefile doc/dtrace/Makefile man/Makefile fb/Makefile glamor/Makefile record/Makefile config/Makefile mi/Makefile miext/Makefile miext/sync/Makefile miext/damage/Makefile miext/shadow/Makefile miext/rootless/Makefile os/Makefile pseudoramiX/Makefile randr/Makefile render/Makefile xkb/Makefile Xext/Makefile Xi/Makefile xfixes/Makefile exa/Makefile dri3/Makefile present/Makefile hw/Makefile hw/xfree86/Makefile hw/xfree86/Xorg.sh hw/xfree86/common/Makefile hw/xfree86/common/xf86Build.h hw/xfree86/ddc/Makefile hw/xfree86/dixmods/Makefile hw/xfree86/doc/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile hw/xfree86/dri2/pci_ids/Makefile hw/xfree86/drivers/Makefile hw/xfree86/drivers/modesetting/Makefile hw/xfree86/exa/Makefile hw/xfree86/exa/man/Makefile hw/xfree86/fbdevhw/Makefile hw/xfree86/fbdevhw/man/Makefile hw/xfree86/glamor_egl/Makefile hw/xfree86/i2c/Makefile hw/xfree86/int10/Makefile hw/xfree86/loader/Makefile hw/xfree86/man/Makefile hw/xfree86/modes/Makefile hw/xfree86/os-support/Makefile hw/xfree86/os-support/bsd/Makefile hw/xfree86/os-support/bus/Makefile hw/xfree86/os-support/hurd/Makefile hw/xfree86/os-support/misc/Makefile hw/xfree86/os-support/linux/Makefile hw/xfree86/os-support/solaris/Makefile hw/xfree86/os-support/stub/Makefile hw/xfree86/parser/Makefile hw/xfree86/ramdac/Makefile hw/xfree86/shadowfb/Makefile hw/xfree86/vbe/Makefile hw/xfree86/vgahw/Makefile hw/xfree86/x86emu/Makefile hw/xfree86/xkb/Makefile hw/xfree86/utils/Makefile hw/xfree86/utils/man/Makefile hw/xfree86/utils/cvt/Makefile hw/xfree86/utils/gtf/Makefile hw/dmx/config/Makefile hw/dmx/config/man/Makefile hw/dmx/doc/Makefile hw/dmx/doxygen/doxygen.conf hw/dmx/doxygen/Makefile hw/dmx/examples/Makefile hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/dmx/man/Makefile hw/vfb/Makefile hw/vfb/man/Makefile hw/xnest/Makefile hw/xnest/man/Makefile hw/xwin/Makefile hw/xwin/dri/Makefile hw/xwin/glx/Makefile hw/xwin/man/Makefile hw/xwin/winclipboard/Makefile hw/xquartz/Makefile hw/xquartz/GL/Makefile hw/xquartz/bundle/Makefile hw/xquartz/man/Makefile hw/xquartz/mach-startup/Makefile hw/xquartz/pbproxy/Makefile hw/xquartz/xpr/Makefile hw/kdrive/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/ephyr/man/Makefile hw/kdrive/src/Makefile hw/xwayland/Makefile test/Makefile xserver.ent xorg-server.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -32780,10 +32515,6 @@ if test -z "${XORG_BUS_SPARC_TRUE}" && test -z "${XORG_BUS_SPARC_FALSE}"; then
   as_fn_error $? "conditional \"XORG_BUS_SPARC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${LINUX_ALPHA_TRUE}" && test -z "${LINUX_ALPHA_FALSE}"; then
-  as_fn_error $? "conditional \"LINUX_ALPHA\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${LNXACPI_TRUE}" && test -z "${LNXACPI_FALSE}"; then
   as_fn_error $? "conditional \"LNXACPI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -32820,18 +32551,10 @@ if test -z "${XWIN_TRUE}" && test -z "${XWIN_FALSE}"; then
   as_fn_error $? "conditional \"XWIN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${XWIN_MULTIWINDOW_TRUE}" && test -z "${XWIN_MULTIWINDOW_FALSE}"; then
-  as_fn_error $? "conditional \"XWIN_MULTIWINDOW\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${XWIN_MULTIWINDOWEXTWM_TRUE}" && test -z "${XWIN_MULTIWINDOWEXTWM_FALSE}"; then
   as_fn_error $? "conditional \"XWIN_MULTIWINDOWEXTWM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${XWIN_CLIPBOARD_TRUE}" && test -z "${XWIN_CLIPBOARD_FALSE}"; then
-  as_fn_error $? "conditional \"XWIN_CLIPBOARD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${XWIN_GLX_WINDOWS_TRUE}" && test -z "${XWIN_GLX_WINDOWS_FALSE}"; then
   as_fn_error $? "conditional \"XWIN_GLX_WINDOWS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -32840,14 +32563,6 @@ if test -z "${XWIN_WINDOWS_DRI_TRUE}" && test -z "${XWIN_WINDOWS_DRI_FALSE}"; th
   as_fn_error $? "conditional \"XWIN_WINDOWS_DRI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${XWIN_RANDR_TRUE}" && test -z "${XWIN_RANDR_FALSE}"; then
-  as_fn_error $? "conditional \"XWIN_RANDR\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${XWIN_XV_TRUE}" && test -z "${XWIN_XV_FALSE}"; then
-  as_fn_error $? "conditional \"XWIN_XV\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${PSEUDORAMIX_TRUE}" && test -z "${PSEUDORAMIX_FALSE}"; then
   as_fn_error $? "conditional \"PSEUDORAMIX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -32872,10 +32587,6 @@ if test -z "${DMX_TRUE}" && test -z "${DMX_FALSE}"; then
   as_fn_error $? "conditional \"DMX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${DMX_BUILD_LNX_TRUE}" && test -z "${DMX_BUILD_LNX_FALSE}"; then
-  as_fn_error $? "conditional \"DMX_BUILD_LNX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DMX_BUILD_USB_TRUE}" && test -z "${DMX_BUILD_USB_FALSE}"; then
   as_fn_error $? "conditional \"DMX_BUILD_USB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -32884,46 +32595,18 @@ if test -z "${KDRIVE_TRUE}" && test -z "${KDRIVE_FALSE}"; then
   as_fn_error $? "conditional \"KDRIVE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${KDRIVELINUX_TRUE}" && test -z "${KDRIVELINUX_FALSE}"; then
-  as_fn_error $? "conditional \"KDRIVELINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${KDRIVE_EVDEV_TRUE}" && test -z "${KDRIVE_EVDEV_FALSE}"; then
-  as_fn_error $? "conditional \"KDRIVE_EVDEV\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${KDRIVE_KBD_TRUE}" && test -z "${KDRIVE_KBD_FALSE}"; then
-  as_fn_error $? "conditional \"KDRIVE_KBD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${KDRIVE_MOUSE_TRUE}" && test -z "${KDRIVE_MOUSE_FALSE}"; then
-  as_fn_error $? "conditional \"KDRIVE_MOUSE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TSLIB_TRUE}" && test -z "${TSLIB_FALSE}"; then
-  as_fn_error $? "conditional \"TSLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${KDRIVEFBDEV_TRUE}" && test -z "${KDRIVEFBDEV_FALSE}"; then
-  as_fn_error $? "conditional \"KDRIVEFBDEV\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${XEPHYR_TRUE}" && test -z "${XEPHYR_FALSE}"; then
   as_fn_error $? "conditional \"XEPHYR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${BUILD_KDRIVEFBDEVLIB_TRUE}" && test -z "${BUILD_KDRIVEFBDEVLIB_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_KDRIVEFBDEVLIB\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${XFAKESERVER_TRUE}" && test -z "${XFAKESERVER_FALSE}"; then
-  as_fn_error $? "conditional \"XFAKESERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${XWAYLAND_TRUE}" && test -z "${XWAYLAND_FALSE}"; then
   as_fn_error $? "conditional \"XWAYLAND\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${XWAYLAND_EGLSTREAM_TRUE}" && test -z "${XWAYLAND_EGLSTREAM_FALSE}"; then
+  as_fn_error $? "conditional \"XWAYLAND_EGLSTREAM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -33321,7 +33004,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xorg-server $as_me 1.19.7, which was
+This file was extended by xorg-server $as_me 1.20.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -33387,7 +33070,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xorg-server config.status 1.19.7
+xorg-server config.status 1.20.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -33802,7 +33485,7 @@ do
     "include/xorg-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/xorg-config.h" ;;
     "include/xkb-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/xkb-config.h" ;;
     "include/xwin-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/xwin-config.h" ;;
-    "include/kdrive-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/kdrive-config.h" ;;
+    "include/xwayland-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/xwayland-config.h" ;;
     "include/version-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/version-config.h" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "sdksyms") CONFIG_COMMANDS="$CONFIG_COMMANDS sdksyms" ;;
@@ -33908,14 +33591,9 @@ do
     "hw/kdrive/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/Makefile" ;;
     "hw/kdrive/ephyr/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/ephyr/Makefile" ;;
     "hw/kdrive/ephyr/man/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/ephyr/man/Makefile" ;;
-    "hw/kdrive/fake/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/fake/Makefile" ;;
-    "hw/kdrive/fbdev/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/fbdev/Makefile" ;;
-    "hw/kdrive/linux/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/linux/Makefile" ;;
     "hw/kdrive/src/Makefile") CONFIG_FILES="$CONFIG_FILES hw/kdrive/src/Makefile" ;;
     "hw/xwayland/Makefile") CONFIG_FILES="$CONFIG_FILES hw/xwayland/Makefile" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
-    "test/xi1/Makefile") CONFIG_FILES="$CONFIG_FILES test/xi1/Makefile" ;;
-    "test/xi2/Makefile") CONFIG_FILES="$CONFIG_FILES test/xi2/Makefile" ;;
     "xserver.ent") CONFIG_FILES="$CONFIG_FILES xserver.ent" ;;
     "xorg-server.pc") CONFIG_FILES="$CONFIG_FILES xorg-server.pc" ;;