Module Name: xsrc
Committed By: mrg
Date: Sat Jun 1 06:55:44 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/dix: getevents.c
xsrc/external/mit/xorg-server/dist/include: dix.h
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xorg-config.h xorg-server.h
Log Message:
merge xorg-server 1.20.5.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/dix/getevents.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/include/dix.h
cvs rdiff -u -r1.34 -r1.35 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h
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.5 xsrc/external/mit/xorg-server/dist/configure:1.6
--- xsrc/external/mit/xorg-server/dist/configure:1.5 Sun Mar 3 22:01:08 2019
+++ xsrc/external/mit/xorg-server/dist/configure Sat Jun 1 06:55:44 2019
@@ -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.4.
+# 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.20.4'
-PACKAGE_STRING='xorg-server 1.20.4'
+PACKAGE_VERSION='1.20.5'
+PACKAGE_STRING='xorg-server 1.20.5'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
PACKAGE_URL=''
@@ -2033,7 +2033,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.4 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]...
@@ -2103,7 +2103,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.20.4:";;
+ short | recursive ) echo "Configuration of xorg-server 1.20.5:";;
esac
cat <<\_ACEOF
@@ -2294,10 +2294,10 @@ Optional Packages:
org.x)
--with-bundle-version=VERSION
Version to use for X11.app's CFBundleVersion
- (default: 1.20.4)
+ (default: 1.20.5)
--with-bundle-version-string=VERSION
Version to use for X11.app's
- CFBundleShortVersionString (default: 1.20.4)
+ CFBundleShortVersionString (default: 1.20.5)
--with-sparkle-feed-url=URL
URL for the Sparkle feed (default:
https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2558,7 +2558,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.20.4
+xorg-server configure 1.20.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3267,7 +3267,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.4, 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 $@
@@ -3615,8 +3615,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-RELEASE_DATE="2019-02-25"
-RELEASE_NAME="Chestnut Tortelloni"
+RELEASE_DATE="2019-05-30"
+RELEASE_NAME="Red Lentil Dal"
am__api_version='1.16'
@@ -4134,7 +4134,7 @@ fi
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.20.4'
+ VERSION='1.20.5'
cat >>confdefs.h <<_ACEOF
@@ -23701,7 +23701,7 @@ _ACEOF
if test "${with_bundle_version+set}" = set; then :
withval=$with_bundle_version; BUNDLE_VERSION="${withval}"
else
- BUNDLE_VERSION="1.20.4"
+ BUNDLE_VERSION="1.20.5"
fi
@@ -33562,7 +33562,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.4, 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
@@ -33628,7 +33628,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.4
+xorg-server config.status 1.20.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.7 xsrc/external/mit/xorg-server/dist/configure.ac:1.8
--- xsrc/external/mit/xorg-server/dist/configure.ac:1.7 Sun Mar 3 22:01:08 2019
+++ xsrc/external/mit/xorg-server/dist/configure.ac Sat Jun 1 06:55:44 2019
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.20.4, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2019-02-25"
-RELEASE_NAME="Chestnut Tortelloni"
+AC_INIT([xorg-server], 1.20.5, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2019-05-30"
+RELEASE_NAME="Red Lentil Dal"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
Index: xsrc/external/mit/xorg-server/dist/dix/getevents.c
diff -u xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.9 xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.10
--- xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.9 Mon Dec 31 09:49:59 2018
+++ xsrc/external/mit/xorg-server/dist/dix/getevents.c Sat Jun 1 06:55:44 2019
@@ -331,9 +331,6 @@ rescaleValuatorAxis(double coord, AxisIn
static void
updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev)
{
- int i;
- DeviceIntPtr lastSlave;
-
/* master->last.valuators[0]/[1] is in desktop-wide coords and the actual
* position of the pointer */
pDev->last.valuators[0] = master->last.valuators[0];
@@ -358,27 +355,7 @@ updateSlaveDeviceCoords(DeviceIntPtr mas
screenInfo.height);
}
- /* calculate the other axis as well based on info from the old
- * slave-device. If the old slave had less axes than this one,
- * last.valuators is reset to 0.
- */
- if ((lastSlave = master->last.slave) && lastSlave->valuator) {
- for (i = 2; i < pDev->valuator->numAxes; i++) {
- if (i >= lastSlave->valuator->numAxes) {
- pDev->last.valuators[i] = 0;
- valuator_mask_set_double(pDev->last.scroll, i, 0);
- }
- else {
- double val = pDev->last.valuators[i];
-
- val = rescaleValuatorAxis(val, lastSlave->valuator->axes + i,
- pDev->valuator->axes + i, 0, 0);
- pDev->last.valuators[i] = val;
- valuator_mask_set_double(pDev->last.scroll, i, val);
- }
- }
- }
-
+ /* other axes are left as-is */
}
/**
Index: xsrc/external/mit/xorg-server/dist/include/dix.h
diff -u xsrc/external/mit/xorg-server/dist/include/dix.h:1.6 xsrc/external/mit/xorg-server/dist/include/dix.h:1.7
--- xsrc/external/mit/xorg-server/dist/include/dix.h:1.6 Mon Dec 31 09:50:02 2018
+++ xsrc/external/mit/xorg-server/dist/include/dix.h Sat Jun 1 06:55:44 2019
@@ -240,6 +240,8 @@ extern _X_EXPORT void RemoveBlockAndWake
extern _X_EXPORT void InitBlockAndWakeupHandlers(void);
+extern _X_EXPORT void ClearWorkQueue(void);
+
extern _X_EXPORT void ProcessWorkQueue(void);
extern _X_EXPORT void ProcessWorkQueueZombies(void);
Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.34 xsrc/external/mit/xorg-server/include/dix-config.h:1.35
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.34 Tue Apr 16 21:34:44 2019
+++ xsrc/external/mit/xorg-server/include/dix-config.h Sat Jun 1 06:55:44 2019
@@ -355,7 +355,7 @@
#define XINERAMA 1
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((4) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((5) * 1000) + 0)
/* Build Xv Extension */
#define XvExtension 1
Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.8 xsrc/external/mit/xorg-server/include/version-config.h:1.9
--- xsrc/external/mit/xorg-server/include/version-config.h:1.8 Sun Mar 3 22:01:09 2019
+++ xsrc/external/mit/xorg-server/include/version-config.h Sat Jun 1 06:55:44 2019
@@ -5,13 +5,13 @@
#define VERSION_CONFIG_H
/* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 1.20.4"
+#define VENDOR_MAN_VERSION "Version 1.20.5"
/* Vendor name */
/* #define VENDOR_NAME "The X.Org Foundation" */
/* Vendor release */
-#define VENDOR_RELEASE (((1) * 10000000) + ((20) * 100000) + ((4) * 1000) + 0)
+#define VENDOR_RELEASE (((1) * 10000000) + ((20) * 100000) + ((5) * 1000) + 0)
#endif /* VERSION_CONFIG_H */
Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.18 xsrc/external/mit/xorg-server/include/xorg-config.h:1.19
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.18 Sun Mar 3 22:01:09 2019
+++ xsrc/external/mit/xorg-server/include/xorg-config.h Sat Jun 1 06:55:44 2019
@@ -17,7 +17,7 @@
#define XORGSERVER 1
/* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((4) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((5) * 1000) + 0)
/* Name of X server. */
#define __XSERVERNAME__ "Xorg"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.18 xsrc/external/mit/xorg-server/include/xorg-server.h:1.19
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.18 Sun Mar 3 22:01:09 2019
+++ xsrc/external/mit/xorg-server/include/xorg-server.h Sat Jun 1 06:55:44 2019
@@ -140,7 +140,7 @@
#define XORGSERVER 1
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((4) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((20) * 100000) + ((5) * 1000) + 0)
/* Build Xv Extension */
#define XvExtension 1
