Update to xserver 1.20.5. Tested by jsg@

1 files changed, 37 insertions, 19 deletions

diff --git a/xserver/hw/xquartz/man/Makefile.in b/xserver/hw/xquartz/man/Makefile.in
index f5ed0fd7c..a458e3c1b 100644
--- a/xserver/hw/xquartz/man/Makefile.in
+++ b/xserver/hw/xquartz/man/Makefile.in
@@ -68,7 +68,7 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
 	$(top_builddir)/include/xorg-config.h \
 	$(top_builddir)/include/xkb-config.h \
 	$(top_builddir)/include/xwin-config.h \
-	$(top_builddir)/include/kdrive-config.h \
+	$(top_builddir)/include/xwayland-config.h \
 	$(top_builddir)/include/version-config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -263,22 +263,36 @@ MAIN_LIB = @MAIN_LIB@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 
+# xorg-macros.m4 has these bracketed by double underscores, but meson
+# wants ats.
+
 # Add server specific man pages string substitution from XORG_MANPAGE_SECTIONS
 # 's|/,|/, |g' will add a space to help font path formatting
-MAN_SUBSTS = @MAN_SUBSTS@ -e 's|__logdir__|$(logdir)|g' -e \
-	's|__datadir__|$(datadir)|g' -e 's|__mandir__|$(mandir)|g' -e \
-	's|__sysconfdir__|$(sysconfdir)|g' -e \
-	's|__xconfigdir__|$(__XCONFIGDIR__)|g' -e \
-	's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' -e \
-	's|__XKB_DFLT_RULES__|$(XKB_DFLT_RULES)|g' -e \
-	's|__XKB_DFLT_MODEL__|$(XKB_DFLT_MODEL)|g' -e \
-	's|__XKB_DFLT_LAYOUT__|$(XKB_DFLT_LAYOUT)|g' -e \
-	's|__XKB_DFLT_VARIANT__|$(XKB_DFLT_VARIANT)|g' -e \
-	's|__XKB_DFLT_OPTIONS__|$(XKB_DFLT_OPTIONS)|g' -e \
-	's|__bundle_id_prefix__|$(BUNDLE_ID_PREFIX)|g' -e \
-	's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' -e \
-	's|__suid_wrapper_dir__|$(SUID_WRAPPER_DIR)|g' -e \
-	's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' -e \
+MAN_SUBSTS = @MAN_SUBSTS@ -e 's|@vendorversion@|"$(PACKAGE_STRING)" \
+	"$(XORG_MAN_PAGE)"|' -e 's|@xorgversion@|"$(PACKAGE_STRING)" \
+	"$(XORG_MAN_PAGE)"|' -e 's|@xservername@|Xorg|g' -e \
+	's|@xconfigfile@|xorg.conf|g' -e 's|@projectroot@|$(prefix)|g' \
+	-e 's|@apploaddir@|$(appdefaultdir)|g' -e \
+	's|@appmansuffix@|$(APP_MAN_SUFFIX)|g' -e \
+	's|@drivermansuffix@|$(DRIVER_MAN_SUFFIX)|g' -e \
+	's|@adminmansuffix@|$(ADMIN_MAN_SUFFIX)|g' -e \
+	's|@libmansuffix@|$(LIB_MAN_SUFFIX)|g' -e \
+	's|@miscmansuffix@|$(MISC_MAN_SUFFIX)|g' -e \
+	's|@filemansuffix@|$(FILE_MAN_SUFFIX)|g' -e \
+	's|[@]logdir[@]|$(logdir)|g' -e 's|[@]datadir[@]|$(datadir)|g' \
+	-e 's|[@]mandir[@]|$(mandir)|g' -e \
+	's|[@]sysconfdir[@]|$(sysconfdir)|g' -e \
+	's|[@]xconfigdir[@]|$(XCONFIGDIR)|g' -e \
+	's|[@]xkbdir[@]|$(XKB_BASE_DIRECTORY)|g' -e \
+	's|[@]XKB_DFLT_RULES[@]|$(XKB_DFLT_RULES)|g' -e \
+	's|[@]XKB_DFLT_MODEL[@]|$(XKB_DFLT_MODEL)|g' -e \
+	's|[@]XKB_DFLT_LAYOUT[@]|$(XKB_DFLT_LAYOUT)|g' -e \
+	's|[@]XKB_DFLT_VARIANT[@]|$(XKB_DFLT_VARIANT)|g' -e \
+	's|[@]XKB_DFLT_OPTIONS[@]|$(XKB_DFLT_OPTIONS)|g' -e \
+	's|[@]bundle_id_prefix[@]|$(BUNDLE_ID_PREFIX)|g' -e \
+	's|[@]modulepath[@]|$(DEFAULT_MODULE_PATH)|g' -e \
+	's|[@]suid_wrapper_dir[@]|$(SUID_WRAPPER_DIR)|g' -e \
+	's|[@]default_font_path[@]|$(COMPILEDDEFAULTFONTPATH)|g' -e \
 	'\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g'
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
@@ -322,6 +336,7 @@ RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
 RELEASE_DATE = @RELEASE_DATE@
+SCANNER_ARG = @SCANNER_ARG@
 SDK_REQUIRED_MODULES = @SDK_REQUIRED_MODULES@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
@@ -340,15 +355,18 @@ SYSCONFDIR = @SYSCONFDIR@
 SYSTEMD_DAEMON_CFLAGS = @SYSTEMD_DAEMON_CFLAGS@
 SYSTEMD_DAEMON_LIBS = @SYSTEMD_DAEMON_LIBS@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
-TSLIB_CFLAGS = @TSLIB_CFLAGS@
-TSLIB_LIBS = @TSLIB_LIBS@
 UDEV_CFLAGS = @UDEV_CFLAGS@
 UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
+WAYLAND_EGLSTREAM_CFLAGS = @WAYLAND_EGLSTREAM_CFLAGS@
+WAYLAND_EGLSTREAM_DATADIR = @WAYLAND_EGLSTREAM_DATADIR@
+WAYLAND_EGLSTREAM_LIBS = @WAYLAND_EGLSTREAM_LIBS@
 WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@
 WAYLAND_SCANNER = @WAYLAND_SCANNER@
+WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
+WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
 WINDOWSDRI_CFLAGS = @WINDOWSDRI_CFLAGS@
 WINDOWSDRI_LIBS = @WINDOWSDRI_LIBS@
 WINDOWSWM_CFLAGS = @WINDOWSWM_CFLAGS@
@@ -356,6 +374,8 @@ WINDOWSWM_LIBS = @WINDOWSWM_LIBS@
 WINDRES = @WINDRES@
 X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
 X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
+XCONFIGDIR = @XCONFIGDIR@
+XCONFIGFILE = @XCONFIGFILE@
 XDMCP_CFLAGS = @XDMCP_CFLAGS@
 XDMCP_LIBS = @XDMCP_LIBS@
 XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
@@ -427,8 +447,6 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-__XCONFIGDIR__ = @__XCONFIGDIR__@
-__XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
 abi_videodrv = @abi_videodrv@