Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[xsrc/xorg]: xsrc/external/mit/libxcb/dist initial import of libxcb-1.13.1



details:   https://anonhg.NetBSD.org/xsrc/rev/28ef71493e76
branches:  xorg
changeset: 10016:28ef71493e76
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Dec 28 22:14:51 2018 +0000

description:
initial import of libxcb-1.13.1

diffstat:

 external/mit/libxcb/dist/ChangeLog              |   50 +
 external/mit/libxcb/dist/Makefile.in            |   19 +-
 external/mit/libxcb/dist/NEWS                   |    4 +
 external/mit/libxcb/dist/aclocal.m4             |  214 ++++----
 external/mit/libxcb/dist/build-aux/compile      |    8 +-
 external/mit/libxcb/dist/build-aux/config.guess |  558 +++++++++++----------
 external/mit/libxcb/dist/build-aux/config.sub   |  247 ++++-----
 external/mit/libxcb/dist/build-aux/depcomp      |    8 +-
 external/mit/libxcb/dist/build-aux/install-sh   |   45 +-
 external/mit/libxcb/dist/build-aux/ltmain.sh    |  607 +++++++++++++++--------
 external/mit/libxcb/dist/build-aux/missing      |   14 +-
 external/mit/libxcb/dist/build-aux/test-driver  |    8 +-
 external/mit/libxcb/dist/configure              |  257 +++++----
 external/mit/libxcb/dist/configure.ac           |    2 +-
 external/mit/libxcb/dist/doc/Makefile.in        |   14 +-
 external/mit/libxcb/dist/m4/libtool.m4          |   45 +-
 external/mit/libxcb/dist/man/Makefile.in        |   14 +-
 external/mit/libxcb/dist/src/Makefile.in        |  200 +++++-
 external/mit/libxcb/dist/src/xcb_in.c           |   16 +-
 external/mit/libxcb/dist/src/xcb_out.c          |   10 +-
 external/mit/libxcb/dist/tests/Makefile.in      |   67 +-
 21 files changed, 1415 insertions(+), 992 deletions(-)

diffs (truncated from 5212 to 300 lines):

diff -r 1c9e5e413227 -r 28ef71493e76 external/mit/libxcb/dist/ChangeLog
--- a/external/mit/libxcb/dist/ChangeLog        Fri Dec 28 22:14:48 2018 +0000
+++ b/external/mit/libxcb/dist/ChangeLog        Fri Dec 28 22:14:51 2018 +0000
@@ -1,3 +1,53 @@
+commit 8287ebd7b752c33b0cabc4982606fe4831106f7e
+Author: Uli Schlachter <psychon%znc.in@localhost>
+Date:   Thu Sep 27 14:04:17 2018 +0200
+
+    Release libxcb 1.13.1
+
+commit bbda345a718ff73086437e51f03fcbb73e4365b9
+Author: Erik Kurzinger <ekurzinger%nvidia.com@localhost>
+Date:   Mon Aug 20 12:06:25 2018 -0700
+
+    don't flag extra reply in xcb_take_socket
+    
+    If any flags are specified in a call to xcb_take_socket,
+    they should only be applied to replies for requests sent
+    after that function returns (and until the socket is
+    re-acquired by XCB).
+    
+    Previously, they would also be incorrectly applied to the
+    reply for the last request sent before the socket was taken.
+    For instance, in this example program the reply for the
+    GetInputFocus request gets discarded, even though it was
+    sent before the socket was taken. This results in the
+    call to retrieve the reply hanging indefinitely.
+    
+    static void return_socket(void *closure) {}
+    
+    int main(void)
+    {
+        Display *dpy = XOpenDisplay(NULL);
+        xcb_connection_t *c = XGetXCBConnection(dpy);
+    
+        xcb_get_input_focus_cookie_t cookie = xcb_get_input_focus_unchecked(c);
+        xcb_flush(c);
+    
+        uint64_t seq;
+        xcb_take_socket(c, return_socket, dpy, XCB_REQUEST_DISCARD_REPLY, &seq);
+    
+        xcb_generic_error_t *err;
+        xcb_get_input_focus_reply(c, cookie, &err);
+    }
+    
+    In practice, this has been causing intermittent KWin crashes when
+    used in combination with the proprietary NVIDIA driver such as
+    https://bugs.kde.org/show_bug.cgi?id=386370 since when Xlib fails to
+    retrieve one of these incorrectly discarded replies it triggers
+    an IO error.
+    
+    Signed-off-by: Erik Kurzinger <ekurzinger%nvidia.com@localhost>
+    Signed-off-by: Uli Schlachter <psychon%znc.in@localhost>
+
 commit 7e0f166579672d71efd819c81f0c932b0acd542c
 Author: Daniel Stone <daniels%collabora.com@localhost>
 Date:   Wed Feb 28 01:26:55 2018 +0000
diff -r 1c9e5e413227 -r 28ef71493e76 external/mit/libxcb/dist/Makefile.in
--- a/external/mit/libxcb/dist/Makefile.in      Fri Dec 28 22:14:48 2018 +0000
+++ b/external/mit/libxcb/dist/Makefile.in      Fri Dec 28 22:14:51 2018 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -200,7 +200,8 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-       cscope check recheck distdir dist dist-all distcheck
+       cscope check recheck distdir distdir-am dist dist-all \
+       distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -622,6 +623,7 @@
 psdir = @psdir@
 pyexecdir = @pyexecdir@
 pythondir = @pythondir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -681,8 +683,8 @@
            echo ' $(SHELL) ./config.status'; \
            $(SHELL) ./config.status;; \
          *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
        esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -1006,7 +1008,7 @@
        fi;                                                             \
        $$success || exit 1
 
-check-TESTS:
+check-TESTS: 
        @list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
        @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
        @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1049,7 +1051,10 @@
 @am__EXEEXT_TRUE@      $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@      "$$tst" $(AM_TESTS_FD_REDIRECT)
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
        $(am__remove_distdir)
        test -d "$(distdir)" || mkdir "$(distdir)"
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
diff -r 1c9e5e413227 -r 28ef71493e76 external/mit/libxcb/dist/NEWS
--- a/external/mit/libxcb/dist/NEWS     Fri Dec 28 22:14:48 2018 +0000
+++ b/external/mit/libxcb/dist/NEWS     Fri Dec 28 22:14:51 2018 +0000
@@ -1,3 +1,7 @@
+Release 1.13.1 (2018-09-27)
+===========================
+* Don't flag extra reply in xcb_take_socket
+
 Release 1.13 (2018-02-28)
 =========================
 * Add support for variable-sized lists of FDs
diff -r 1c9e5e413227 -r 28ef71493e76 external/mit/libxcb/dist/aclocal.m4
--- a/external/mit/libxcb/dist/aclocal.m4       Fri Dec 28 22:14:48 2018 +0000
+++ b/external/mit/libxcb/dist/aclocal.m4       Fri Dec 28 22:14:51 2018 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -788,13 +788,24 @@
 fi])
 
 # Test for the ability of xmlto to generate a text target
+#
+# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the
+# following test for empty XML docbook files.
+# For compatibility reasons use the following empty XML docbook file and if
+# it fails try it again with a non-empty XML file.
 have_xmlto_text=no
 cat > conftest.xml << "EOF"
 EOF
 AS_IF([test "$have_xmlto" = yes],
       [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
              [have_xmlto_text=yes],
-             [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
+             [# Try it again with a non-empty XML file.
+              cat > conftest.xml << "EOF"
+<x></x>
+EOF
+              AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
+                    [have_xmlto_text=yes],
+                    [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])])
 rm -f conftest.xml
 AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
 AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
@@ -2259,7 +2270,7 @@
 AC_SUBST([CHANGELOG_CMD])
 ]) # XORG_CHANGELOG
 
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2271,10 +2282,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15.1], [],
+m4_if([$1], [1.16.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -2290,14 +2301,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2349,7 +2360,7 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2380,7 +2391,7 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2571,13 +2582,12 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -2585,49 +2595,41 @@
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE([$CONFIG_FILES],
+          [*\'*], [eval set x "$CONFIG_FILES"],
+          [*], [set x $CONFIG_FILES])
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done



Home | Main Index | Thread Index | Old Index