Module Name: xsrc
Committed By: mrg
Date: Tue Apr 27 04:01:25 UTC 2021
Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xi: chgfctl.c
xsrc/external/mit/xorg-server/dist/include: dix-config.h.in
Removed Files:
xsrc/external/mit/xorg-server/dist/hw/xquartz: console_redirect.c
console_redirect.h quartzCocoa.m quartzCommon.h
Log Message:
merge xorg-server 1.20.11.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xorg-server/dist/hw/xquartz/console_redirect.c \
xsrc/external/mit/xorg-server/dist/hw/xquartz/console_redirect.h
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xorg-server/dist/hw/xquartz/quartzCocoa.m \
xsrc/external/mit/xorg-server/dist/hw/xquartz/quartzCommon.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/configure
diff -u xsrc/external/mit/xorg-server/dist/configure:1.8 xsrc/external/mit/xorg-server/dist/configure:1.9
--- xsrc/external/mit/xorg-server/dist/configure:1.8 Sat Dec 5 20:34:03 2020
+++ xsrc/external/mit/xorg-server/dist/configure Tue Apr 27 04:01:25 2021
@@ -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.20.10.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.11.
#
# 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.20.10'
-PACKAGE_STRING='xorg-server 1.20.10'
+PACKAGE_VERSION='1.20.11'
+PACKAGE_STRING='xorg-server 1.20.11'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
PACKAGE_URL=''
@@ -2045,7 +2045,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.20.10 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.20.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2116,7 +2116,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.20.10:";;
+ short | recursive ) echo "Configuration of xorg-server 1.20.11:";;
esac
cat <<\_ACEOF
@@ -2307,10 +2307,10 @@ Optional Packages:
org.x)
--with-bundle-version=VERSION
Version to use for X11.app's CFBundleVersion
- (default: 1.20.10)
+ (default: 1.20.11)
--with-bundle-version-string=VERSION
Version to use for X11.app's
- CFBundleShortVersionString (default: 1.20.10)
+ CFBundleShortVersionString (default: 1.20.11)
--with-sparkle-feed-url=URL
URL for the Sparkle feed (default:
https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2567,7 +2567,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.20.10
+xorg-server configure 1.20.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3276,7 +3276,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.20.10, which was
+It was created by xorg-server $as_me 1.20.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3624,8 +3624,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-RELEASE_DATE="2020-12-01"
-RELEASE_NAME="Chicken Pot Pie"
+RELEASE_DATE="2021-04-13"
+RELEASE_NAME="Arroz con Pollo"
am__api_version='1.16'
@@ -4143,7 +4143,7 @@ fi
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.20.10'
+ VERSION='1.20.11'
cat >>confdefs.h <<_ACEOF
@@ -23778,7 +23778,7 @@ _ACEOF
if test "${with_bundle_version+set}" = set; then :
withval=$with_bundle_version; BUNDLE_VERSION="${withval}"
else
- BUNDLE_VERSION="1.20.10"
+ BUNDLE_VERSION="1.20.11"
fi
@@ -24772,14 +24772,6 @@ $as_echo "$xorg_cv_Carbon_framework" >&6
fi
fi
- ac_fn_c_check_func "$LINENO" "dispatch_async" "ac_cv_func_dispatch_async"
-if test "x$ac_cv_func_dispatch_async" = xyes; then :
-
-$as_echo "#define HAVE_LIBDISPATCH 1" >>confdefs.h
-
-fi
-
-
if test "x$XQUARTZ" = xyes ; then
XQUARTZ=yes
XVFB=no
@@ -33631,7 +33623,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# 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.20.10, which was
+This file was extended by xorg-server $as_me 1.20.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -33697,7 +33689,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.20.10
+xorg-server config.status 1.20.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -34906,7 +34898,9 @@ $as_echo X/"$am_mf" |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE=\"gmake\" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).
See \`config.log' for more details" "$LINENO" 5; }
Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.10 xsrc/external/mit/xorg-server/dist/configure.ac:1.11
--- xsrc/external/mit/xorg-server/dist/configure.ac:1.10 Sat Dec 5 20:34:04 2020
+++ xsrc/external/mit/xorg-server/dist/configure.ac Tue Apr 27 04:01:25 2021
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.20.10, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2020-12-01"
-RELEASE_NAME="Chicken Pot Pie"
+AC_INIT([xorg-server], 1.20.11, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2021-04-13"
+RELEASE_NAME="Arroz con Pollo"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
@@ -694,10 +694,6 @@ case $host_os in
fi
fi
- AC_CHECK_FUNC(dispatch_async,
- AC_DEFINE([HAVE_LIBDISPATCH], 1, [Define to 1 if you have the libdispatch (GCD) available]),
- [])
-
if test "x$XQUARTZ" = xyes ; then
XQUARTZ=yes
XVFB=no
Index: xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c
diff -u xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c:1.4 xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c:1.5
--- xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c:1.4 Mon Dec 31 09:49:58 2018
+++ xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c Tue Apr 27 04:01:25 2021
@@ -464,8 +464,11 @@ ProcXChangeFeedbackControl(ClientPtr cli
break;
case StringFeedbackClass:
{
- xStringFeedbackCtl *f = ((xStringFeedbackCtl *) &stuff[1]);
+ xStringFeedbackCtl *f;
+ REQUEST_AT_LEAST_EXTRA_SIZE(xChangeFeedbackControlReq,
+ sizeof(xStringFeedbackCtl));
+ f = ((xStringFeedbackCtl *) &stuff[1]);
if (client->swapped) {
if (len < bytes_to_int32(sizeof(xStringFeedbackCtl)))
return BadLength;
Index: xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
diff -u xsrc/external/mit/xorg-server/dist/include/dix-config.h.in:1.6 xsrc/external/mit/xorg-server/dist/include/dix-config.h.in:1.7
--- xsrc/external/mit/xorg-server/dist/include/dix-config.h.in:1.6 Sat Dec 5 20:34:04 2020
+++ xsrc/external/mit/xorg-server/dist/include/dix-config.h.in Tue Apr 27 04:01:25 2021
@@ -122,9 +122,6 @@
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
-/* Define to 1 if you have the libdispatch (GCD) available */
-#undef HAVE_LIBDISPATCH
-
/* Define to 1 if you have the <linux/agpgart.h> header file. */
#undef HAVE_LINUX_AGPGART_H
