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/dist merge xorg-server 1.20.11.
details: https://anonhg.NetBSD.org/xsrc/rev/7c57eb9938e0
branches: trunk
changeset: 10702:7c57eb9938e0
user: mrg <mrg%NetBSD.org@localhost>
date: Tue Apr 27 04:01:25 2021 +0000
description:
merge xorg-server 1.20.11.
diffstat:
external/mit/xorg-server/dist/Xi/chgfctl.c | 5 +-
external/mit/xorg-server/dist/configure | 42 +-
external/mit/xorg-server/dist/configure.ac | 10 +-
external/mit/xorg-server/dist/hw/xquartz/console_redirect.c | 482 ------------
external/mit/xorg-server/dist/hw/xquartz/console_redirect.h | 46 -
external/mit/xorg-server/dist/hw/xquartz/quartzCocoa.m | 66 -
external/mit/xorg-server/dist/hw/xquartz/quartzCommon.h | 55 -
external/mit/xorg-server/dist/include/dix-config.h.in | 3 -
8 files changed, 25 insertions(+), 684 deletions(-)
diffs (truncated from 865 to 300 lines):
diff -r f092245aa1f2 -r 7c57eb9938e0 external/mit/xorg-server/dist/Xi/chgfctl.c
--- a/external/mit/xorg-server/dist/Xi/chgfctl.c Tue Apr 27 03:59:14 2021 +0000
+++ b/external/mit/xorg-server/dist/Xi/chgfctl.c Tue Apr 27 04:01:25 2021 +0000
@@ -464,8 +464,11 @@
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;
diff -r f092245aa1f2 -r 7c57eb9938e0 external/mit/xorg-server/dist/configure
--- a/external/mit/xorg-server/dist/configure Tue Apr 27 03:59:14 2021 +0000
+++ b/external/mit/xorg-server/dist/configure Tue Apr 27 04:01:25 2021 +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.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 @@
# 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 @@
# 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 @@
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 @@
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 @@
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 @@
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_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 @@
# 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 @@
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 @@
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 @@
# 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 @@
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 "$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; }
diff -r f092245aa1f2 -r 7c57eb9938e0 external/mit/xorg-server/dist/configure.ac
--- a/external/mit/xorg-server/dist/configure.ac Tue Apr 27 03:59:14 2021 +0000
+++ b/external/mit/xorg-server/dist/configure.ac Tue Apr 27 04:01:25 2021 +0000
@@ -26,9 +26,9 @@
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 @@
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
diff -r f092245aa1f2 -r 7c57eb9938e0 external/mit/xorg-server/dist/hw/xquartz/console_redirect.c
--- a/external/mit/xorg-server/dist/hw/xquartz/console_redirect.c Tue Apr 27 03:59:14 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,482 +0,0 @@
-/*
- * Copyright (c) 2011-2012 Apple Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above
- * copyright holders shall not be used in advertising or otherwise to
- * promote the sale, use or other dealings in this Software without
- * prior written authorization.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#else
-#define DEBUG_CONSOLE_REDIRECT 1
-#define HAVE_LIBDISPATCH 1
-#endif
-
-#include <assert.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <asl.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include "console_redirect.h"
-
-#define BUF_SIZE 512
-
-#ifdef HAVE_LIBDISPATCH
-#include <dispatch/dispatch.h>
-
-static dispatch_queue_t redirect_serial_q;
-static dispatch_group_t read_source_group;
-#else
-#include <pthread.h>
-
-static pthread_t redirect_pthread;
-static pthread_mutex_t redirect_fds_lock = PTHREAD_MUTEX_INITIALIZER;
-
-static int kq;
-
-/* Notifications to our reader thread */
-#define ASL_REDIRECT_TERMINATE ((void *)(uintptr_t)1)
-#endif
-
-typedef struct {
- int level;
- aslclient asl;
- aslmsg msg;
-
- /* Buffered reading */
- char *buf;
- char *w;
-
-#ifdef HAVE_LIBDISPATCH
- dispatch_source_t read_source;
-#endif
-} asl_redirect;
-
-static asl_redirect *redirect_fds = NULL;
-static int n_redirect_fds = 0;
-
-/* Read from the FD until there is no more to read and redirect to ASL.
- * Preconditions:
- * 1: pthread_mutex_lock lock is held (pthreads) or called
- * from the appropriate serial queue for operating on
- * redirect_fds
- * 2: fd corresponds to a valid entry in redirect_fds
- *
- * Return values:
- * If the pipe is closed, EOF is returned regardless of how many bytes
- * were processed. If the pipe is still open, the number of read bytes
- * is returned.
- */
-static inline int
-_read_redirect(int fd, int flush)
-{
- int total_read = 0;
- int nbytes;
- asl_redirect *aslr = &redirect_fds[fd];
-
- while ((nbytes =
- read(fd, aslr->w,
- BUF_SIZE - (aslr->w - aslr->buf) - 1)) > 0) {
- char *s, *p;
-
Home |
Main Index |
Thread Index |
Old Index