Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/xorg-server merge xorg-server 1.20.4.
details: https://anonhg.NetBSD.org/xsrc/rev/c157eb9a7638
branches: trunk
changeset: 10164:c157eb9a7638
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Mar 03 22:01:08 2019 +0000
description:
merge xorg-server 1.20.4.
diffstat:
external/mit/xorg-server/dist/README | 44 -
external/mit/xorg-server/dist/Xi/xibarriers.c | 10 +
external/mit/xorg-server/dist/configure | 332 +++++----
external/mit/xorg-server/dist/configure.ac | 6 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c | 12 +-
external/mit/xorg-server/dist/hw/xfree86/modes/xf86RandR12.c | 2 +-
external/mit/xorg-server/dist/mi/miinitext.c | 2 +-
external/mit/xorg-server/dist/os/auth.c | 9 +-
external/mit/xorg-server/dist/os/utils.c | 9 +-
external/mit/xorg-server/include/dix-config.h | 2 +-
external/mit/xorg-server/include/version-config.h | 4 +-
external/mit/xorg-server/include/xf86Build.h | 4 +-
external/mit/xorg-server/include/xorg-config.h | 2 +-
external/mit/xorg-server/include/xorg-server.h | 2 +-
14 files changed, 233 insertions(+), 207 deletions(-)
diffs (truncated from 873 to 300 lines):
diff -r 5ce4a209935d -r c157eb9a7638 external/mit/xorg-server/dist/README
--- a/external/mit/xorg-server/dist/README Sun Mar 03 21:57:38 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
- X Server
-
-The X server accepts requests from client applications to create windows,
-which are (normally rectangular) "virtual screens" that the client program
-can draw into.
-
-Windows are then composed on the actual screen by the X server
-(or by a separate composite manager) as directed by the window manager,
-which usually communicates with the user via graphical controls such as buttons
-and draggable titlebars and borders.
-
-For a comprehensive overview of X Server and X Window System, consult the
-following article:
-https://en.wikipedia.org/wiki/X_server
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- https://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/xserver
-
- https://cgit.freedesktop.org/xorg/xserver
-
-For patch submission instructions, see:
-
- https://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- https://wiki.x.org/wiki/GitPage
-
-As with other projects hosted on freedesktop.org, X.Org follows its
-Code of Conduct, based on the Contributor Covenant. Please conduct
-yourself in a respectful and civilized manner when using the above
-mailing lists, bug trackers, etc:
-
- https://www.freedesktop.org/wiki/CodeOfConduct
diff -r 5ce4a209935d -r c157eb9a7638 external/mit/xorg-server/dist/Xi/xibarriers.c
--- a/external/mit/xorg-server/dist/Xi/xibarriers.c Sun Mar 03 21:57:38 2019 +0000
+++ b/external/mit/xorg-server/dist/Xi/xibarriers.c Sun Mar 03 22:01:08 2019 +0000
@@ -611,7 +611,9 @@
}
pbd->deviceid = dev->id;
+ input_lock();
xorg_list_add(&pbd->entry, &ret->per_device);
+ input_unlock();
}
ret->id = stuff->barrier;
@@ -626,7 +628,9 @@
ret->barrier.directions &= ~(BarrierPositiveX | BarrierNegativeX);
if (barrier_is_vertical(&ret->barrier))
ret->barrier.directions &= ~(BarrierPositiveY | BarrierNegativeY);
+ input_lock();
xorg_list_add(&ret->entry, &cs->barriers);
+ input_unlock();
*client_out = ret;
return Success;
@@ -689,7 +693,9 @@
mieqEnqueue(dev, (InternalEvent *) &ev);
}
+ input_lock();
xorg_list_del(&c->entry);
+ input_unlock();
FreePointerBarrierClient(c);
return Success;
@@ -709,7 +715,9 @@
pbd = AllocBarrierDevice();
pbd->deviceid = *deviceid;
+ input_lock();
xorg_list_add(&pbd->entry, &barrier->per_device);
+ input_unlock();
}
static void remove_master_func(void *res, XID id, void *devid)
@@ -752,7 +760,9 @@
mieqEnqueue(dev, (InternalEvent *) &ev);
}
+ input_lock();
xorg_list_del(&pbd->entry);
+ input_unlock();
free(pbd);
}
diff -r 5ce4a209935d -r c157eb9a7638 external/mit/xorg-server/dist/configure
--- a/external/mit/xorg-server/dist/configure Sun Mar 03 21:57:38 2019 +0000
+++ b/external/mit/xorg-server/dist/configure Sun Mar 03 22:01:08 2019 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorg-server 1.20.3.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.4.
#
-# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -275,7 +275,7 @@
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf%gnu.org@localhost and
-$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+$0: https://gitlab.freedesktop.org/xorg/xserver/issues
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
@@ -651,9 +651,9 @@
# Identity of this package.
PACKAGE_NAME='xorg-server'
PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.20.3'
-PACKAGE_STRING='xorg-server 1.20.3'
-PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
+PACKAGE_VERSION='1.20.4'
+PACKAGE_STRING='xorg-server 1.20.4'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
PACKAGE_URL=''
ac_unique_file="Makefile.am"
@@ -1181,7 +1181,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -1255,7 +1254,8 @@
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -2033,7 +2033,7 @@
# 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.3 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.20.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2103,7 +2103,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.20.3:";;
+ short | recursive ) echo "Configuration of xorg-server 1.20.4:";;
esac
cat <<\_ACEOF
@@ -2294,10 +2294,10 @@
org.x)
--with-bundle-version=VERSION
Version to use for X11.app's CFBundleVersion
- (default: 1.20.3)
+ (default: 1.20.4)
--with-bundle-version-string=VERSION
Version to use for X11.app's
- CFBundleShortVersionString (default: 1.20.3)
+ CFBundleShortVersionString (default: 1.20.4)
--with-sparkle-feed-url=URL
URL for the Sparkle feed (default:
https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2495,7 +2495,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>.
_ACEOF
ac_status=$?
fi
@@ -2558,7 +2558,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.20.3
+xorg-server configure 1.20.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2717,9 +2717,9 @@
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##"
+( $as_echo "## ----------------------------------------------------------------- ##
+## Report this to https://gitlab.freedesktop.org/xorg/xserver/issues ##
+## ----------------------------------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -3267,7 +3267,7 @@
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.3, which was
+It was created by xorg-server $as_me 1.20.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3615,11 +3615,11 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-RELEASE_DATE="2018-10-25"
-RELEASE_NAME="Harissa Roasted Carrots"
-
-
-am__api_version='1.15'
+RELEASE_DATE="2019-02-25"
+RELEASE_NAME="Chestnut Tortelloni"
+
+
+am__api_version='1.16'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -4134,7 +4134,7 @@
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.20.3'
+ VERSION='1.20.4'
cat >>confdefs.h <<_ACEOF
@@ -4164,8 +4164,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -4216,7 +4216,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -4231,45 +4231,45 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
Home |
Main Index |
Thread Index |
Old Index