Hello community,
here is the log from the commit of package xf86-input-evdev for openSUSE:Factory checked in at 2014-12-17 19:19:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-evdev (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-evdev.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-evdev"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-evdev/xf86-input-evdev.changes 2014-07-31 21:49:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-input-evdev.new/xf86-input-evdev.changes 2014-12-17 19:18:21.000000000 +0100
@@ -1,0 +2,9 @@
+Sat Nov 29 21:56:14 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 2.9.1:
+ This release fixes a couple of bugs with absolute devices that
+ have scroll wheels (such as the qemu tablets devices) and avoids
+ the "unable to find touch point 0" warnings previously caused by
+ a touch starting before the device was enabled.
+
+-------------------------------------------------------------------
Old:
----
xf86-input-evdev-2.9.0.tar.bz2
New:
----
xf86-input-evdev-2.9.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-evdev.spec ++++++
--- /var/tmp/diff_new_pack.0b06yR/_old 2014-12-17 19:18:22.000000000 +0100
+++ /var/tmp/diff_new_pack.0b06yR/_new 2014-12-17 19:18:22.000000000 +0100
@@ -17,13 +17,14 @@
Name: xf86-input-evdev
-Version: 2.9.0
+Version: 2.9.1
Release: 0
Summary: Generic Linux input driver for the Xorg X server
License: MIT
Group: System/X11/Servers/XF86_4
Url: http://xorg.freedesktop.org/
-Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
+#Source-URL: http://xorg.freedesktop.org/releases/individual/driver/
+Source0: %{name}-%{version}.tar.bz2
Source1: 11-evdev.conf
#BuildRequires: autoconf >= 2.60
++++++ xf86-input-evdev-2.9.0.tar.bz2 -> xf86-input-evdev-2.9.1.tar.bz2 ++++++
++++ 3776 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/xf86-input-evdev-2.9.0/ChangeLog new/xf86-input-evdev-2.9.1/ChangeLog
--- old/xf86-input-evdev-2.9.0/ChangeLog 2014-05-20 07:42:19.000000000 +0200
+++ new/xf86-input-evdev-2.9.1/ChangeLog 2014-11-26 00:39:48.000000000 +0100
@@ -1,3 +1,100 @@
+commit cb3b023783fe73d9bbb7c9c6ba6c73048b8303ef
+Author: Peter Hutterer
+Date: Wed Nov 26 09:23:39 2014 +1000
+
+ evdev 2.9.1
+
+ Signed-off-by: Peter Hutterer
+
+commit 124eff9ba20c5ae777a6a5aa36f32112ad31b931
+Author: Peter Hutterer
+Date: Fri Nov 7 13:41:06 2014 +1000
+
+ Remove three unused #defines
+
+ Obsolete since 768c25a99b2f4ec07993eb15a0f05a5e22b5c695
+
+ Signed-off-by: Peter Hutterer
+
+commit 605047613c534babf723f25597e8cc4be6758db0
+Author: Éric Brunet
+Date: Sat Sep 27 22:06:36 2014 +0200
+
+ Don't pass superfluous arguments to EvdevPost*Events
+
+ The functions EvdevPostProximityEvents, EvdevPostRelativeMotionEvents,
+ EvdevPostAbsoluteMotionEvents and EvdevPostQueuedEvents are only called
+ by EvdevProcessSyncEvent. These functions take as arguments an array of
+ valuators which is set by EvdevProcessSyncEvent to contain ... nothing.
+ This patch changes the prototype of the four functions, their definitions
+ and the way they are called to remove the useless array of valuators.
+
+ Signed-off-by: Éric Brunet
+ Signed-off-by: Peter Hutterer
+
+commit 3ee98d0b7f7c266b8c7954b7710f9724a9c9cddd
+Author: Peter Hutterer
+Date: Fri Aug 29 13:14:56 2014 +1000
+
+ Drop some unused #defines
+
+ Signed-off-by: Peter Hutterer
+
+commit 977588d24a6bc511454c7bd616e8b24a8bc3f58e
+Author: Peter Hutterer
+Date: Thu Aug 14 11:56:03 2014 +1000
+
+ If only IgnoreRelativeAxes is set, init like a normal relative device
+
+ In the current code, if only IgnoreRelativeAxes is set, the code would go on
+ and force absolute axes to initialize even if the relative axes were
+ successfully initialized.
+
+ Evdev gives precedence to relative axes anyway, initializing absolute axes if
+ the relative axes failed. Thus, if we explicitely want relative axes but leave
+ the abs axes as-is, proceed as normal.
+
+ Signed-off-by: Peter Hutterer
+
+commit 291b60172d25446d2cabe61ed93e56db6570baa3
+Author: Peter Hutterer
+Date: Thu Aug 14 10:48:52 2014 +1000
+
+ Fix axis initialization for devices with abs x/y and rel scrollwheels
+
+ The Xen Virtual Pointer device has ABS_X, ABS_Y and REL_WHEEL. If smooth
+ scrolling is detected, the current code would first initialize relative axes
+ for scrolling and immediately overwrite those axes when the abs valuators are
+ written out.
+
+ This patch fixes the default case only, in the case of a device setting the
+ two Ignore*Axis options both to "off", the axes are still overwritten. The
+ wheels will work, other axes only if the same number of abs axes exists. And
+ it keeps the current memory leak too, but it's marked with a FIXME now.
+
+ Signed-off-by: Peter Hutterer
+
+commit 8ce06c96e469139bb12065d80fe4abb6173e2855
+Author: Peter Hutterer
+Date: Tue Aug 5 15:59:17 2014 +1000
+
+ Make the slot-state per slot
+
+ The previous approach only had the slot state for the current slot. If we
+ changed slots, that means we lost the information if the slot was ever
+ initialized. If the ABS_MT_TRACKING_ID was never received, the slot would
+ still update and try to send events (which the server refused with a warning).
+
+ Avoid this by having a per-slot state and a dirty bit that tells us if the
+ current slot updated at all. If we don't get the tracking ID, leave the slot
+ empty and refuse any further events from that touch.
+
+ This quashes the various "unable to find touch point 0" warnings caused if a
+ touchpoint starts before the device is enabled.
+
+ Signed-off-by: Peter Hutterer
+ Reviewed-by: Walter Harms
+
commit 5d239ceb260cd554245e8f0dc3627990726ea9b9
Author: Peter Hutterer
Date: Thu May 15 08:41:06 2014 +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/xf86-input-evdev-2.9.0/INSTALL new/xf86-input-evdev-2.9.1/INSTALL
--- old/xf86-input-evdev-2.9.0/INSTALL 2014-05-20 07:42:19.000000000 +0200
+++ new/xf86-input-evdev-2.9.1/INSTALL 2014-11-26 00:39:48.000000000 +0100
@@ -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 `' 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/xf86-input-evdev-2.9.0/compile new/xf86-input-evdev-2.9.1/compile
--- old/xf86-input-evdev-2.9.0/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-input-evdev-2.9.1/compile 2014-11-26 00:23:52.000000000 +0100
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# 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 or send patches to
+# .
+
+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 .
+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/xf86-input-evdev-2.9.0/configure.ac new/xf86-input-evdev-2.9.1/configure.ac
--- old/xf86-input-evdev-2.9.0/configure.ac 2014-05-20 07:41:26.000000000 +0200
+++ new/xf86-input-evdev-2.9.1/configure.ac 2014-11-26 00:33:56.000000000 +0100
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-evdev],
- [2.9.0],
+ [2.9.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-evdev])
AC_CONFIG_SRCDIR([Makefile.am])
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/xf86-input-evdev-2.9.0/missing new/xf86-input-evdev-2.9.1/missing
--- old/xf86-input-evdev-2.9.0/missing 2013-08-13 03:00:59.000000000 +0200
+++ new/xf86-input-evdev-2.9.1/missing 2014-11-26 00:23:52.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
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/xf86-input-evdev-2.9.0/src/evdev.c new/xf86-input-evdev-2.9.1/src/evdev.c
--- old/xf86-input-evdev-2.9.0/src/evdev.c 2014-05-20 07:41:26.000000000 +0200
+++ new/xf86-input-evdev-2.9.1/src/evdev.c 2014-11-26 00:33:56.000000000 +0100
@@ -71,12 +71,6 @@
#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
#define MIN_KEYCODE 8
-#define GLYPHS_PER_KEY 2
-#define AltMask Mod1Mask
-#define NumLockMask Mod2Mask
-#define AltLangMask Mod3Mask
-#define KanaMask Mod4Mask
-#define ScrollLockMask Mod5Mask
#define CAPSFLAG 1
#define NUMFLAG 2
@@ -687,28 +681,38 @@
{
EvdevPtr pEvdev = pInfo->private;
int type;
+ int slot = pEvdev->cur_slot;
- if (pEvdev->cur_slot < 0 || !pEvdev->mt_mask)
+ if (slot < 0 || !pEvdev->mt_mask)
return;
- /* If the ABS_MT_SLOT is the first event we get after EV_SYN, skip this */
- if (pEvdev->slot_state == SLOTSTATE_EMPTY)
+ if (!pEvdev->slots[slot].dirty)
return;
- if (pEvdev->slot_state == SLOTSTATE_CLOSE)
- type = XI_TouchEnd;
- else if (pEvdev->slot_state == SLOTSTATE_OPEN)
- type = XI_TouchBegin;
- else
- type = XI_TouchUpdate;
-
+ switch(pEvdev->slots[slot].state)
+ {
+ case SLOTSTATE_EMPTY:
+ return;
+ case SLOTSTATE_CLOSE:
+ type = XI_TouchEnd;
+ pEvdev->slots[slot].state = SLOTSTATE_EMPTY;
+ break;
+ case SLOTSTATE_OPEN:
+ type = XI_TouchBegin;
+ pEvdev->slots[slot].state = SLOTSTATE_UPDATE;
+ break;
+ case SLOTSTATE_UPDATE:
+ default:
+ type = XI_TouchUpdate;
+ break;
+ }
EvdevSwapAbsValuators(pEvdev, pEvdev->mt_mask);
EvdevApplyCalibration(pEvdev, pEvdev->mt_mask);
EvdevQueueTouchEvent(pInfo, pEvdev->cur_slot, pEvdev->mt_mask, type);
- pEvdev->slot_state = SLOTSTATE_EMPTY;
+ pEvdev->slots[slot].dirty = 0;
valuator_mask_zero(pEvdev->mt_mask);
}
@@ -751,29 +755,28 @@
} else
{
int slot_index = last_mt_vals_slot(pEvdev);
+ if (slot_index < 0) {
+ LogMessageVerbSigSafe(X_WARNING, 0,
+ "%s: Invalid slot index %d, touch events may be incorrect.\n",
+ pInfo->name,
+ slot_index);
+ return;
+ }
- if (pEvdev->slot_state == SLOTSTATE_EMPTY)
- pEvdev->slot_state = SLOTSTATE_UPDATE;
+ pEvdev->slots[slot_index].dirty = 1;
if (ev->code == ABS_MT_TRACKING_ID) {
if (ev->value >= 0) {
- pEvdev->slot_state = SLOTSTATE_OPEN;
+ pEvdev->slots[slot_index].state = SLOTSTATE_OPEN;
- if (slot_index >= 0)
- valuator_mask_copy(pEvdev->mt_mask,
- pEvdev->last_mt_vals[slot_index]);
- else
- LogMessageVerbSigSafe(X_WARNING, 0,
- "%s: Attempted to copy values from out-of-range "
- "slot, touch events may be incorrect.\n",
- pInfo->name);
- } else
- pEvdev->slot_state = SLOTSTATE_CLOSE;
+ valuator_mask_copy(pEvdev->mt_mask,
+ pEvdev->last_mt_vals[slot_index]);
+ } else if (pEvdev->slots[slot_index].state != SLOTSTATE_EMPTY)
+ pEvdev->slots[slot_index].state = SLOTSTATE_CLOSE;
} else {
map = pEvdev->abs_axis_map[ev->code];
valuator_mask_set(pEvdev->mt_mask, map, ev->value);
- if (slot_index >= 0)
- valuator_mask_set(pEvdev->last_mt_vals[slot_index], map,
- ev->value);
+ valuator_mask_set(pEvdev->last_mt_vals[slot_index], map,
+ ev->value);
}
}
}
@@ -865,8 +868,7 @@
* Post the relative motion events.
*/
void
-EvdevPostRelativeMotionEvents(InputInfoPtr pInfo, int num_v, int first_v,
- int v[MAX_VALUATORS])
+EvdevPostRelativeMotionEvents(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = pInfo->private;
@@ -879,8 +881,7 @@
* Post the absolute motion events.
*/
void
-EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int num_v, int first_v,
- int v[MAX_VALUATORS])
+EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = pInfo->private;
@@ -899,8 +900,7 @@
}
static void
-EvdevPostProximityEvents(InputInfoPtr pInfo, int which, int num_v, int first_v,
- int v[MAX_VALUATORS])
+EvdevPostProximityEvents(InputInfoPtr pInfo, int which)
{
int i;
EvdevPtr pEvdev = pInfo->private;
@@ -915,8 +915,7 @@
break;
case EV_QUEUE_PROXIMITY:
if (pEvdev->queue[i].val == which)
- xf86PostProximityEventP(pInfo->dev, which, first_v, num_v,
- v + first_v);
+ xf86PostProximityEvent(pInfo->dev, which, 0, 0);
break;
}
}
@@ -925,8 +924,7 @@
/**
* Post the queued key/button events.
*/
-static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v,
- int v[MAX_VALUATORS])
+static void EvdevPostQueuedEvents(InputInfoPtr pInfo)
{
int i;
EvdevPtr pEvdev = pInfo->private;
@@ -944,9 +942,8 @@
break;
if (pEvdev->abs_queued && pEvdev->in_proximity) {
- xf86PostButtonEventP(pInfo->dev, Absolute, pEvdev->queue[i].detail.key,
- pEvdev->queue[i].val, first_v, num_v,
- v + first_v);
+ xf86PostButtonEvent(pInfo->dev, Absolute, pEvdev->queue[i].detail.key,
+ pEvdev->queue[i].val, 0, 0);
} else
xf86PostButtonEvent(pInfo->dev, Relative, pEvdev->queue[i].detail.key,
@@ -973,8 +970,6 @@
EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev)
{
int i;
- int num_v = 0, first_v = 0;
- int v[MAX_VALUATORS] = {};
EvdevPtr pEvdev = pInfo->private;
EvdevProcessProximityState(pInfo);
@@ -982,11 +977,11 @@
EvdevProcessValuators(pInfo);
EvdevProcessTouch(pInfo);
- EvdevPostProximityEvents(pInfo, TRUE, num_v, first_v, v);
- EvdevPostRelativeMotionEvents(pInfo, num_v, first_v, v);
- EvdevPostAbsoluteMotionEvents(pInfo, num_v, first_v, v);
- EvdevPostQueuedEvents(pInfo, num_v, first_v, v);
- EvdevPostProximityEvents(pInfo, FALSE, num_v, first_v, v);
+ EvdevPostProximityEvents(pInfo, TRUE);
+ EvdevPostRelativeMotionEvents(pInfo);
+ EvdevPostAbsoluteMotionEvents(pInfo);
+ EvdevPostQueuedEvents(pInfo);
+ EvdevPostProximityEvents(pInfo, FALSE);
memset(pEvdev->delta, 0, sizeof(pEvdev->delta));
for (i = 0; i < ArrayLength(pEvdev->queue); i++)
@@ -1030,10 +1025,6 @@
}
}
-#undef ABS_X_VALUE
-#undef ABS_Y_VALUE
-#undef ABS_VALUE
-
static void
EvdevFreeMasks(EvdevPtr pEvdev)
{
@@ -1041,6 +1032,8 @@
int i;
#endif
+ free(pEvdev->slots);
+ pEvdev->slots = NULL;
valuator_mask_free(&pEvdev->vals);
valuator_mask_free(&pEvdev->old_vals);
valuator_mask_free(&pEvdev->prox);
@@ -1214,7 +1207,7 @@
static int
-EvdevAddAbsValuatorClass(DeviceIntPtr device, int want_scroll_axes)
+EvdevAddAbsValuatorClass(DeviceIntPtr device, int num_scroll_axes)
{
InputInfoPtr pInfo;
EvdevPtr pEvdev;
@@ -1276,16 +1269,9 @@
#endif
+
#ifdef HAVE_SMOOTH_SCROLLING
- if (want_scroll_axes && libevdev_has_event_type(pEvdev->dev, EV_REL))
- {
- if (libevdev_has_event_code(pEvdev->dev, EV_REL, REL_WHEEL))
- num_axes++;
- if (libevdev_has_event_code(pEvdev->dev, EV_REL, REL_HWHEEL))
- num_axes++;
- if (libevdev_has_event_code(pEvdev->dev, EV_REL, REL_DIAL))
- num_axes++;
- }
+ num_axes += num_scroll_axes;
#endif
if (num_axes + num_mt_axes > MAX_VALUATORS) {
@@ -1320,6 +1306,17 @@
goto out;
}
+ pEvdev->slots = calloc(nslots, sizeof(*pEvdev->slots));
+ if (!pEvdev->slots) {
+ xf86Msg(X_ERROR, "%s: failed to allocate slot state array.\n",
+ device->name);
+ goto out;
+ }
+ for (i = 0; i < nslots; i++) {
+ pEvdev->slots[i].state = SLOTSTATE_EMPTY;
+ pEvdev->slots[i].dirty = 0;
+ }
+
pEvdev->last_mt_vals = calloc(nslots, sizeof(ValuatorMask *));
if (!pEvdev->last_mt_vals) {
xf86IDrvMsg(pInfo, X_ERROR,
@@ -1379,7 +1376,7 @@
}
#ifdef HAVE_SMOOTH_SCROLLING
- if (want_scroll_axes)
+ if (num_scroll_axes > 0)
{
mapping++; /* continue from abs axis mapping */
@@ -1489,7 +1486,7 @@
#endif
#ifdef HAVE_SMOOTH_SCROLLING
- if (want_scroll_axes)
+ if (num_scroll_axes)
{
int idx;
if (libevdev_has_event_code(pEvdev->dev, EV_REL, REL_WHEEL))
@@ -1624,7 +1621,7 @@
}
static int
-EvdevAddRelValuatorClass(DeviceIntPtr device)
+EvdevAddRelValuatorClass(DeviceIntPtr device, int num_scroll_axes)
{
InputInfoPtr pInfo;
EvdevPtr pEvdev;
@@ -1637,24 +1634,22 @@
if (!libevdev_has_event_type(pEvdev->dev, EV_REL))
goto out;
- for (i = 0; i < REL_MAX; i++)
+ for (i = 0; i < REL_MAX; i++) {
+ if (i == REL_WHEEL || i == REL_HWHEEL || i == REL_DIAL)
+ continue;
+
if (libevdev_has_event_code(pEvdev->dev, EV_REL, i))
num_axes++;
- if (num_axes < 1)
- goto out;
+ }
-#ifndef HAVE_SMOOTH_SCROLLING
- /* Wheels are special, we post them as button events. So let's ignore them
- * in the axes list too */
- if (libevdev_has_event_code(pEvdev->dev, EV_REL, REL_WHEEL))
- num_axes--;
- if (libevdev_has_event_code(pEvdev->dev, EV_REL, REL_HWHEEL))
- num_axes--;
- if (libevdev_has_event_code(pEvdev->dev, EV_REL, REL_DIAL))
- num_axes--;
+ /* If we have only relative scroll axes, then we punt axis init to
+ EvdevInitAbsValuators if possible */
+ if (num_axes < 1 &&
+ (num_scroll_axes == 0 || pEvdev->flags & EVDEV_ABSOLUTE_EVENTS))
+ goto out;
- if (num_axes <= 0)
- goto out;
+#ifdef HAVE_SMOOTH_SCROLLING
+ num_axes += num_scroll_axes;
#endif
if (num_axes > MAX_VALUATORS) {
@@ -1793,20 +1788,36 @@
}
+static int
+EvdevCountScrollAxes(EvdevPtr pEvdev)
+{
+ int num_scroll_axes = 0;
+
+#ifdef HAVE_SMOOTH_SCROLLING
+ if (libevdev_has_event_code(pEvdev->dev, EV_REL, REL_WHEEL))
+ num_scroll_axes++;
+ if (libevdev_has_event_code(pEvdev->dev, EV_REL, REL_HWHEEL))
+ num_scroll_axes++;
+ if (libevdev_has_event_code(pEvdev->dev, EV_REL, REL_DIAL))
+ num_scroll_axes++;
+#endif
+
+ return num_scroll_axes;
+}
+
static void
EvdevInitAnyValuators(DeviceIntPtr device, EvdevPtr pEvdev)
{
InputInfoPtr pInfo = device->public.devicePrivate;
- int rel_success = FALSE;
+ int num_scroll_axes = EvdevCountScrollAxes(pEvdev);
if (pEvdev->flags & EVDEV_RELATIVE_EVENTS &&
- EvdevAddRelValuatorClass(device) == Success)
- {
- rel_success = TRUE;
+ EvdevAddRelValuatorClass(device, num_scroll_axes) == Success)
xf86IDrvMsg(pInfo, X_INFO, "initialized for relative axes.\n");
- }
+ /* FIXME: EvdevAddAbsValuatorClass overwrites the valuators initialized
+ in EvdevAddRelValuatorClass and leaks the latter's memory */
if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS &&
- EvdevAddAbsValuatorClass(device, !rel_success) == Success)
+ EvdevAddAbsValuatorClass(device, num_scroll_axes) == Success)
xf86IDrvMsg(pInfo, X_INFO, "initialized for absolute axes.\n");
}
@@ -1814,8 +1825,9 @@
EvdevInitAbsValuators(DeviceIntPtr device, EvdevPtr pEvdev)
{
InputInfoPtr pInfo = device->public.devicePrivate;
+ int num_scroll_axes = EvdevCountScrollAxes(pEvdev);
- if (EvdevAddAbsValuatorClass(device, TRUE) == Success) {
+ if (EvdevAddAbsValuatorClass(device, num_scroll_axes) == Success) {
xf86IDrvMsg(pInfo, X_INFO,"initialized for absolute axes.\n");
} else {
xf86IDrvMsg(pInfo, X_ERROR,"failed to initialize for absolute axes.\n");
@@ -1828,8 +1840,9 @@
{
InputInfoPtr pInfo = device->public.devicePrivate;
int has_abs_axes = pEvdev->flags & EVDEV_ABSOLUTE_EVENTS;
+ int num_scroll_axes = EvdevCountScrollAxes(pEvdev);
- if (EvdevAddRelValuatorClass(device) == Success) {
+ if (EvdevAddRelValuatorClass(device, num_scroll_axes) == Success) {
xf86IDrvMsg(pInfo, X_INFO,"initialized for relative axes.\n");
@@ -1890,7 +1903,9 @@
* used and relative axes are ignored.
*/
- if (pEvdev->flags & (EVDEV_UNIGNORE_RELATIVE | EVDEV_UNIGNORE_ABSOLUTE))
+ if ((pEvdev->flags & (EVDEV_UNIGNORE_RELATIVE|EVDEV_UNIGNORE_ABSOLUTE)) == EVDEV_UNIGNORE_RELATIVE)
+ EvdevInitRelValuators(device, pEvdev);
+ else if (pEvdev->flags & EVDEV_UNIGNORE_ABSOLUTE)
EvdevInitAnyValuators(device, pEvdev);
else if (pEvdev->flags & (EVDEV_TOUCHPAD | EVDEV_TOUCHSCREEN | EVDEV_TABLET))
EvdevInitTouchDevice(device, pEvdev);
@@ -2256,9 +2271,6 @@
#endif
EvdevForceXY(pInfo, Absolute);
}
-
-
-
}
for (i = 0; i < BTN_MISC; i++) {
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/xf86-input-evdev-2.9.0/src/evdev.h new/xf86-input-evdev-2.9.1/src/evdev.h
--- old/xf86-input-evdev-2.9.0/src/evdev.h 2014-05-20 07:41:26.000000000 +0200
+++ new/xf86-input-evdev-2.9.1/src/evdev.h 2014-11-26 00:33:56.000000000 +0100
@@ -167,7 +167,10 @@
ValuatorMask *mt_mask;
ValuatorMask **last_mt_vals;
int cur_slot;
- enum SlotState slot_state;
+ struct slot {
+ int dirty;
+ enum SlotState state;
+ } *slots;
#ifdef MULTITOUCH
struct mtdev *mtdev;
#endif
@@ -262,10 +265,8 @@
#endif
void EvdevPostButtonEvent(InputInfoPtr pInfo, int button, enum ButtonAction act);
void EvdevQueueButtonClicks(InputInfoPtr pInfo, int button, int count);
-void EvdevPostRelativeMotionEvents(InputInfoPtr pInfo, int num_v, int first_v,
- int v[MAX_VALUATORS]);
-void EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int num_v, int first_v,
- int v[MAX_VALUATORS]);
+void EvdevPostRelativeMotionEvents(InputInfoPtr pInfo);
+void EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo);
unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code);
/* Middle Button emulation */
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org