Module Name: xsrc Committed By: martin Date: Thu Jul 30 09:15:20 UTC 2015
Modified Files: xsrc/external/mit/libXi/dist [netbsd-7]: ChangeLog configure configure.ac xsrc/external/mit/libXi/dist/src [netbsd-7]: XIAllowEvents.c XIPassiveGrab.c Log Message: Pull up the following revisions, requeusted by mrg in #888: xsrc/external/mit/libXi/dist/ChangeLog 1.1.1.11 xsrc/external/mit/libXi/dist/configure 1.1.1.11 xsrc/external/mit/libXi/dist/configure.ac 1.1.1.11 xsrc/external/mit/libXi/dist/src/XIAllowEvents.c 1.1.1.4 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c 1.1.1.7 Update libXi to 1.7.4. To generate a diff of this commit: cvs rdiff -u -r1.1.1.10 -r1.1.1.10.2.1 xsrc/external/mit/libXi/dist/ChangeLog \ xsrc/external/mit/libXi/dist/configure \ xsrc/external/mit/libXi/dist/configure.ac cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \ xsrc/external/mit/libXi/dist/src/XIAllowEvents.c cvs rdiff -u -r1.4 -r1.4.2.1 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c 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/libXi/dist/ChangeLog diff -u xsrc/external/mit/libXi/dist/ChangeLog:1.1.1.10 xsrc/external/mit/libXi/dist/ChangeLog:1.1.1.10.2.1 --- xsrc/external/mit/libXi/dist/ChangeLog:1.1.1.10 Fri Jul 11 18:30:38 2014 +++ xsrc/external/mit/libXi/dist/ChangeLog Thu Jul 30 09:15:19 2015 @@ -1,3 +1,23 @@ +commit 8c255b30f3a4ed8bf67e6bb76df47cbd480735f8 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Jul 18 16:45:51 2014 +1000 + + libXi 1.7.4 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit b731d1357d993663ee6b28d6627bdeba69b60dd2 +Author: Owen W. Taylor <otay...@fishsoup.net> +Date: Fri Jul 11 15:13:54 2014 -0400 + + Fix locking bugs with XIAllowTouchEvents() and XIUngrabTouchBegin() + + Fix two places where the display was double locked when an API + function chained to an implementation that also locks the display. + + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + commit 0250f40fb7c9cb7d542189b9cd37e0ae75309729 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Thu Jul 10 08:58:48 2014 +1000 Index: xsrc/external/mit/libXi/dist/configure diff -u xsrc/external/mit/libXi/dist/configure:1.1.1.10 xsrc/external/mit/libXi/dist/configure:1.1.1.10.2.1 --- xsrc/external/mit/libXi/dist/configure:1.1.1.10 Fri Jul 11 18:30:38 2014 +++ xsrc/external/mit/libXi/dist/configure Thu Jul 30 09:15:19 2015 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libXi 1.7.3. +# Generated by GNU Autoconf 2.69 for libXi 1.7.4. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -651,8 +651,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libXi' PACKAGE_TARNAME='libXi' -PACKAGE_VERSION='1.7.3' -PACKAGE_STRING='libXi 1.7.3' +PACKAGE_VERSION='1.7.4' +PACKAGE_STRING='libXi 1.7.4' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1447,7 +1447,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 libXi 1.7.3 to adapt to many kinds of systems. +\`configure' configures libXi 1.7.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1517,7 +1517,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXi 1.7.3:";; + short | recursive ) echo "Configuration of libXi 1.7.4:";; esac cat <<\_ACEOF @@ -1653,7 +1653,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXi configure 1.7.3 +libXi configure 1.7.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1977,7 +1977,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 libXi $as_me 1.7.3, which was +It was created by libXi $as_me 1.7.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2845,7 +2845,7 @@ fi # Define the identity of the package. PACKAGE='libXi' - VERSION='1.7.3' + VERSION='1.7.4' cat >>confdefs.h <<_ACEOF @@ -19254,7 +19254,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 libXi $as_me 1.7.3, which was +This file was extended by libXi $as_me 1.7.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19320,7 +19320,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="\\ -libXi config.status 1.7.3 +libXi config.status 1.7.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Index: xsrc/external/mit/libXi/dist/configure.ac diff -u xsrc/external/mit/libXi/dist/configure.ac:1.1.1.10 xsrc/external/mit/libXi/dist/configure.ac:1.1.1.10.2.1 --- xsrc/external/mit/libXi/dist/configure.ac:1.1.1.10 Fri Jul 11 18:30:38 2014 +++ xsrc/external/mit/libXi/dist/configure.ac Thu Jul 30 09:15:19 2015 @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXi], [1.7.3], +AC_INIT([libXi], [1.7.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h]) Index: xsrc/external/mit/libXi/dist/src/XIAllowEvents.c diff -u xsrc/external/mit/libXi/dist/src/XIAllowEvents.c:1.1.1.3 xsrc/external/mit/libXi/dist/src/XIAllowEvents.c:1.1.1.3.4.1 --- xsrc/external/mit/libXi/dist/src/XIAllowEvents.c:1.1.1.3 Wed Jun 5 00:51:23 2013 +++ xsrc/external/mit/libXi/dist/src/XIAllowEvents.c Thu Jul 30 09:15:19 2015 @@ -86,17 +86,12 @@ Status XIAllowTouchEvents(Display *dpy, int deviceid, unsigned int touchid, Window grab_window, int event_mode) { - int status; XExtDisplayInfo *extinfo = XInput_find_display(dpy); LockDisplay(dpy); if (_XiCheckExtInit(dpy, XInput_2_2, extinfo) == -1) return (NoSuchExtension); - - status = _XIAllowEvents(dpy, deviceid, event_mode, CurrentTime, touchid, grab_window); - UnlockDisplay(dpy); - SyncHandle(); - return status; + return _XIAllowEvents(dpy, deviceid, event_mode, CurrentTime, touchid, grab_window); } Index: xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c diff -u xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c:1.4 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c:1.4.2.1 --- xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c:1.4 Fri Jul 11 18:31:47 2014 +++ xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c Thu Jul 30 09:15:19 2015 @@ -249,6 +249,7 @@ XIUngrabTouchBegin(Display* display, int LockDisplay(display); if (_XiCheckExtInit(display, XInput_2_2, extinfo) == -1) return -1; + UnlockDisplay(display); return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeTouchBegin, 0, grab_window, num_modifiers, modifiers);