Hello community, here is the log from the commit of package xinput for openSUSE:Factory checked in at 2015-10-22 12:59:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinput (Old) and /work/SRC/openSUSE:Factory/.xinput.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinput" Changes: -------- --- /work/SRC/openSUSE:Factory/xinput/xinput.changes 2013-09-17 15:07:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xinput.new/xinput.changes 2015-10-22 12:59:29.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Oct 20 14:33:16 UTC 2015 - [email protected] + +- Update to version 1.6.2: + A couple of minor patches accumulated over the years. One crasher + fix, one exit status correction, two fixes for the test-xi2 printf. + And some build system cleanups. + +------------------------------------------------------------------- Old: ---- xinput-1.6.1.tar.bz2 New: ---- xinput-1.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinput.spec ++++++ --- /var/tmp/diff_new_pack.ttHfMn/_old 2015-10-22 12:59:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ttHfMn/_new 2015-10-22 12:59:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xinput # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xinput -Version: 1.6.1 +Version: 1.6.2 Release: 0 Summary: Utility to configure and test X input devices License: MIT and HPND ++++++ xinput-1.6.1.tar.bz2 -> xinput-1.6.2.tar.bz2 ++++++ ++++ 3464 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinput-1.6.1/ChangeLog new/xinput-1.6.2/ChangeLog --- old/xinput-1.6.1/ChangeLog 2013-09-16 01:03:55.000000000 +0200 +++ new/xinput-1.6.2/ChangeLog 2015-10-19 23:36:40.000000000 +0200 @@ -1,3 +1,73 @@ +commit 2865729adc2f004b61ba853d98a4c2758fd0b601 +Author: Peter Hutterer <[email protected]> +Date: Tue Oct 20 07:35:40 2015 +1000 + + xinput 1.6.2 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit bc9026e00037845d58bc25c70dda46f192907dd4 +Author: Peter Hutterer <[email protected]> +Date: Tue Aug 18 17:15:18 2015 +1000 + + Print touch event flags in test-xi2 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 90463ec26d4c89bdf63aab4ddac9f8295b6589cc +Author: Peter Hutterer <[email protected]> +Date: Thu Apr 30 07:47:28 2015 +1000 + + property: return EXIT_FAILURE if at least one device fails (#90226) + + list-props allows for multiple devices to be queried simultaneously, so we + don't break out of the loop but rather change the exit code if at least one of + the devices doesn't exist. + + X.Org Bug 90226 <http://bugs.freedesktop.org/show_bug.cgi?id=90226> + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 4ed64e29a0c4c728f3eff64725c0ed386d172ae4 +Author: Peter Hutterer <[email protected]> +Date: Thu Nov 6 11:44:55 2014 +1000 + + Fix valuator printf output in test-xi2 + + Avoid mixing event flags into the valuator output + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 904a32d908219d6fea833576f7c31727bd3aea2f +Author: Peter Hutterer <[email protected]> +Date: Mon Nov 25 14:51:50 2013 +1000 + + Fix crash for enable/disable without a device argument + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 68e488725a95508378d8a24a9da609a7e80e2ef7 +Author: Gaetan Nadon <[email protected]> +Date: Fri Oct 25 21:51:37 2013 -0400 + + config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES + + Fix Automake warning: AC_OUTPUT should be used without arguments. + www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 1f812f44a3a22e27de00a447c34657e590231a76 +Author: Peter Hutterer <[email protected]> +Date: Mon Sep 16 09:08:29 2013 +1000 + + Drop AM_MAINTAINER_MODE + + See http://blogs.gnome.org/desrt/2011/09/08/am_maintainer_mode-is-not-cool/ + + Signed-off-by: Peter Hutterer <[email protected]> + commit 82f1902fef60569680f3a27bf6d0c8da5bafc8a6 Author: Peter Hutterer <[email protected]> Date: Mon Sep 16 09:02:05 2013 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinput-1.6.1/INSTALL new/xinput-1.6.2/INSTALL --- old/xinput-1.6.1/INSTALL 2013-09-16 01:03:55.000000000 +0200 +++ new/xinput-1.6.2/INSTALL 2015-10-19 23:36:40.000000000 +0200 @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +356,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinput-1.6.1/compile new/xinput-1.6.2/compile --- old/xinput-1.6.1/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/xinput-1.6.2/compile 2015-10-19 23:11:03.000000000 +0200 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Written by Tom Tromey <[email protected]>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <[email protected]>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinput-1.6.1/configure.ac new/xinput-1.6.2/configure.ac --- old/xinput-1.6.1/configure.ac 2013-09-16 01:02:55.000000000 +0200 +++ new/xinput-1.6.2/configure.ac 2015-10-19 23:10:45.000000000 +0200 @@ -22,14 +22,13 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xinput], [1.6.1], +AC_INIT([xinput], [1.6.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinput]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -54,6 +53,7 @@ PKG_CHECK_MODULES(XI22, [xi >= 1.5.99.1] [inputproto >= 2.1.99.1], AC_DEFINE(HAVE_XI22, 1, [XI2.2 available])); -AC_OUTPUT([Makefile +AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) +AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinput-1.6.1/src/property.c new/xinput-1.6.2/src/property.c --- old/xinput-1.6.1/src/property.c 2012-07-27 05:57:06.000000000 +0200 +++ new/xinput-1.6.2/src/property.c 2015-10-19 23:04:32.000000000 +0200 @@ -169,6 +169,7 @@ int i; int nprops; Atom *props; + int rc = EXIT_SUCCESS; if (argc == 0) { @@ -182,6 +183,7 @@ if (!info) { fprintf(stderr, "unable to find device '%s'\n", argv[i]); + rc = EXIT_FAILURE; continue; } @@ -189,6 +191,7 @@ if (!dev) { fprintf(stderr, "unable to open device '%s'\n", info->name); + rc = EXIT_FAILURE; continue; } @@ -208,7 +211,7 @@ XFree(props); XCloseDevice(dpy, dev); } - return EXIT_SUCCESS; + return rc; } @@ -532,6 +535,7 @@ int i; int nprops; Atom *props; + int rc = EXIT_SUCCESS; if (argc == 0) { @@ -545,6 +549,7 @@ if (!info) { fprintf(stderr, "unable to find device %s\n", argv[i]); + rc = EXIT_FAILURE; continue; } @@ -563,7 +568,7 @@ XFree(props); } - return EXIT_SUCCESS; + return rc; } static int @@ -832,12 +837,28 @@ int disable(Display *display, int argc, char *argv[], char *name, char *desc) { - char *new_argv[3] = { argv[0], "Device Enabled", "0" }; + char *new_argv[3] = { NULL, "Device Enabled", "0" }; + + if (argc != 1) { + fprintf(stderr, "Usage: xinput %s %s\n", name, desc); + return EXIT_FAILURE; + } + + new_argv[0] = argv[0]; + return set_prop(display, 3, new_argv, name, desc); } int enable(Display *display, int argc, char *argv[], char *name, char *desc) { - char *new_argv[3] = { argv[0], "Device Enabled", "1" }; + char *new_argv[3] = { NULL, "Device Enabled", "1" }; + + if (argc != 1) { + fprintf(stderr, "Usage: xinput %s %s\n", name, desc); + return EXIT_FAILURE; + } + + new_argv[0] = argv[0]; + return set_prop(display, 3, new_argv, name, desc); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xinput-1.6.1/src/test_xi2.c new/xinput-1.6.2/src/test_xi2.c --- old/xinput-1.6.1/src/test_xi2.c 2013-08-26 07:29:28.000000000 +0200 +++ new/xinput-1.6.2/src/test_xi2.c 2015-08-18 09:16:22.000000000 +0200 @@ -60,6 +60,15 @@ printf(" flags: %s\n", (event->flags & XIPointerEmulated) ? "emulated" : ""); break; #endif +#if HAVE_XI22 + case XI_TouchBegin: + case XI_TouchUpdate: + case XI_TouchEnd: + printf(" flags:%s%s\n", + (event->flags & XITouchPendingEnd) ? " pending_end" : "", + (event->flags & XITouchEmulatingPointer) ? " emulating" : ""); + break; +#endif } printf(" root: %.2f/%.2f\n", event->root_x, event->root_y); @@ -149,7 +158,6 @@ printf(" device: %d (%d)\n", event->deviceid, event->sourceid); printf(" detail: %d\n", event->detail); - printf(" valuators:\n"); #if HAVE_XI21 switch(event->evtype) { case XI_RawButtonPress: @@ -160,6 +168,7 @@ } #endif + printf(" valuators:\n"); val = event->valuators.values; raw_val = event->raw_values; for (i = 0; i < event->valuators.mask_len * 8; i++)
