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.10.
details: https://anonhg.NetBSD.org/xsrc/rev/28cf77f8cb30
branches: trunk
changeset: 10633:28cf77f8cb30
user: mrg <mrg%NetBSD.org@localhost>
date: Sat Dec 05 20:34:03 2020 +0000
description:
merge xorg-server 1.20.10.
diffstat:
external/mit/xorg-server/dist/Xi/xichangehierarchy.c | 2 +-
external/mit/xorg-server/dist/Xi/xipassivegrab.c | 10 +-
external/mit/xorg-server/dist/configure | 149 ++++++-
external/mit/xorg-server/dist/configure.ac | 15 +-
external/mit/xorg-server/dist/dix/devices.c | 2 +-
external/mit/xorg-server/dist/dix/events.c | 8 +-
external/mit/xorg-server/dist/exa/exa_accel.c | 2 +-
external/mit/xorg-server/dist/hw/xfree86/ddc/xf86DDC.h | 3 +
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c | 69 ++-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h | 2 +
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c | 203 ++++++++-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c | 33 +-
external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c | 7 +-
external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c | 6 +
external/mit/xorg-server/dist/include/dix-config.h.in | 3 +
external/mit/xorg-server/dist/include/os.h | 2 +
external/mit/xorg-server/dist/os/backtrace.c | 7 +-
external/mit/xorg-server/dist/os/io.c | 5 +
external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c | 2 +-
external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c | 2 +-
external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c | 2 +-
external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c | 2 +-
external/mit/xorg-server/dist/xkb/xkb.c | 166 ++++++++-
external/mit/xorg-server/include/dix-config.h | 4 +
24 files changed, 617 insertions(+), 89 deletions(-)
diffs (truncated from 1587 to 300 lines):
diff -r 527f279b2b74 -r 28cf77f8cb30 external/mit/xorg-server/dist/Xi/xichangehierarchy.c
--- a/external/mit/xorg-server/dist/Xi/xichangehierarchy.c Sat Dec 05 20:27:45 2020 +0000
+++ b/external/mit/xorg-server/dist/Xi/xichangehierarchy.c Sat Dec 05 20:34:03 2020 +0000
@@ -423,7 +423,7 @@
if (!stuff->num_changes)
return rc;
- len = ((size_t)stuff->length << 2) - sizeof(xXIChangeHierarchyReq);
+ len = ((size_t)client->req_len << 2) - sizeof(xXIChangeHierarchyReq);
any = (xXIAnyHierarchyChangeInfo *) &stuff[1];
while (stuff->num_changes--) {
diff -r 527f279b2b74 -r 28cf77f8cb30 external/mit/xorg-server/dist/Xi/xipassivegrab.c
--- a/external/mit/xorg-server/dist/Xi/xipassivegrab.c Sat Dec 05 20:27:45 2020 +0000
+++ b/external/mit/xorg-server/dist/Xi/xipassivegrab.c Sat Dec 05 20:34:03 2020 +0000
@@ -203,8 +203,14 @@
¶m, XI2, &mask);
break;
case XIGrabtypeKeycode:
- status = GrabKey(client, dev, mod_dev, stuff->detail,
- ¶m, XI2, &mask);
+ /* XI2 allows 32-bit keycodes but thanks to XKB we can never
+ * implement this. Just return an error for all keycodes that
+ * cannot work anyway */
+ if (stuff->detail > 255)
+ status = XIAlreadyGrabbed;
+ else
+ status = GrabKey(client, dev, mod_dev, stuff->detail,
+ ¶m, XI2, &mask);
break;
case XIGrabtypeEnter:
case XIGrabtypeFocusIn:
diff -r 527f279b2b74 -r 28cf77f8cb30 external/mit/xorg-server/dist/configure
--- a/external/mit/xorg-server/dist/configure Sat Dec 05 20:27:45 2020 +0000
+++ b/external/mit/xorg-server/dist/configure Sat Dec 05 20:34:03 2020 +0000
@@ -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.6.
+# Generated by GNU Autoconf 2.69 for xorg-server 1.20.10.
#
# Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>.
#
@@ -651,8 +651,8 @@
# Identity of this package.
PACKAGE_NAME='xorg-server'
PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.20.6'
-PACKAGE_STRING='xorg-server 1.20.6'
+PACKAGE_VERSION='1.20.10'
+PACKAGE_STRING='xorg-server 1.20.10'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
PACKAGE_URL=''
@@ -947,6 +947,8 @@
PRESENT_TRUE
GLX_SYS_LIBS
GLX_DEFINES
+HASHTABLE_FALSE
+HASHTABLE_TRUE
GLX_FALSE
GLX_TRUE
GL_LIBS
@@ -1236,6 +1238,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -1530,6 +1533,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1782,6 +1786,15 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1919,7 +1932,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -2032,7 +2045,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.6 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.20.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2072,6 +2085,7 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -2102,7 +2116,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.20.6:";;
+ short | recursive ) echo "Configuration of xorg-server 1.20.10:";;
esac
cat <<\_ACEOF
@@ -2293,10 +2307,10 @@
org.x)
--with-bundle-version=VERSION
Version to use for X11.app's CFBundleVersion
- (default: 1.20.6)
+ (default: 1.20.10)
--with-bundle-version-string=VERSION
Version to use for X11.app's
- CFBundleShortVersionString (default: 1.20.6)
+ CFBundleShortVersionString (default: 1.20.10)
--with-sparkle-feed-url=URL
URL for the Sparkle feed (default:
https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2553,7 +2567,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.20.6
+xorg-server configure 1.20.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3262,7 +3276,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.6, which was
+It was created by xorg-server $as_me 1.20.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3610,8 +3624,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-RELEASE_DATE="2019-11-22"
-RELEASE_NAME="Enchiladas de Queso"
+RELEASE_DATE="2020-12-01"
+RELEASE_NAME="Chicken Pot Pie"
am__api_version='1.16'
@@ -4129,7 +4143,7 @@
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.20.6'
+ VERSION='1.20.10'
cat >>confdefs.h <<_ACEOF
@@ -13896,6 +13910,11 @@
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -19877,11 +19896,11 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$versuffix$shared_ext $libname$release$major$shared_ext $libname$shared_ext'
soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+ shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
@@ -21691,10 +21710,9 @@
-for ac_prog in cpp
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cpp", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cpp; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_RAWCPP+:} false; then :
@@ -21734,9 +21752,63 @@
fi
- test -n "$RAWCPP" && break
-done
-test -n "$RAWCPP" || RAWCPP="${CPP}"
+fi
+if test -z "$ac_cv_path_RAWCPP"; then
+ ac_pt_RAWCPP=$RAWCPP
+ # Extract the first word of "cpp", so it can be a program name with args.
+set dummy cpp; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_RAWCPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_RAWCPP in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_RAWCPP="$ac_pt_RAWCPP" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib"
+for as_dir in $as_dummy
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_RAWCPP="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_RAWCPP=$ac_cv_path_ac_pt_RAWCPP
+if test -n "$ac_pt_RAWCPP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_RAWCPP" >&5
+$as_echo "$ac_pt_RAWCPP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_RAWCPP" = x; then
+ RAWCPP="${CPP}"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RAWCPP=$ac_pt_RAWCPP
+ fi
+else
+ RAWCPP="$ac_cv_path_RAWCPP"
+fi
# Check for flag to avoid builtin definitions - assumes unix is predefined,
@@ -23706,7 +23778,7 @@
if test "${with_bundle_version+set}" = set; then :
withval=$with_bundle_version; BUNDLE_VERSION="${withval}"
else
- BUNDLE_VERSION="1.20.6"
+ BUNDLE_VERSION="1.20.10"
fi
@@ -26326,6 +26398,7 @@
SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $SCRNSAVERPROTO"
fi
Home |
Main Index |
Thread Index |
Old Index