Hello community, here is the log from the commit of package mtdev for openSUSE:Factory checked in at 2013-09-27 17:47:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mtdev (Old) and /work/SRC/openSUSE:Factory/.mtdev.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtdev" Changes: -------- --- /work/SRC/openSUSE:Factory/mtdev/mtdev.changes 2012-02-17 12:06:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mtdev.new/mtdev.changes 2013-09-27 17:47:23.000000000 +0200 @@ -1,0 +2,27 @@ +Thu Sep 5 13:53:53 UTC 2013 - [email protected] + +- update to release 1.1.4; changes since 1.1.0: + * mtdev_close should ignore NULL devices. + * Return EINVAL for invalid parameters on mtdev_init. + * Add the missing distance event to the internal slot + representation + * Add support for kernel MT slot state retrieval + * Fix pc file to allow compiling with mtdev installed in non-std + path. + * Drop maintainer mode - enable by default + * Rename INCLUDES to AM_CPPFLAGS + * Merge build fixes from Peter Hutterer. + * Replace hardcoded 11 with a define + * Fix compiler warning - implicit declaration of function 'abs' + * test: silence compiler warning - implicit declaration of function + ‘atoi’ + * Enable silent rules by default + * Merge more build fixes from Peter Hutterer, along with a more + explicit declaration of the backwards compatibility constraints + on the API. +- removed obsolete patches: + * U_Return-EINVAL-for-invalid-parameters-on-mtdev_init.patch + * U_mtdev_close-should-ignore-NULL-devices.patch + * mtdev-implicit.diff + +------------------------------------------------------------------- Old: ---- U_Return-EINVAL-for-invalid-parameters-on-mtdev_init.patch U_mtdev_close-should-ignore-NULL-devices.patch mtdev-1.1.0.tar.bz2 mtdev-implicit.diff New: ---- mtdev-1.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtdev.spec ++++++ --- /var/tmp/diff_new_pack.IetMhZ/_old 2013-09-27 17:47:24.000000000 +0200 +++ /var/tmp/diff_new_pack.IetMhZ/_new 2013-09-27 17:47:24.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mtdev # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +16,14 @@ # - Name: mtdev BuildRequires: pkgconfig Summary: Multitouch Protocol Translation Library License: MIT Group: System/Libraries -Version: 1.1.0 +Version: 1.1.4 Release: 0 Source: http://bitmath.org/code/mtdev/mtdev-%{version}.tar.bz2 -Patch1: U_mtdev_close-should-ignore-NULL-devices.patch -Patch2: U_Return-EINVAL-for-invalid-parameters-on-mtdev_init.patch -Patch3: mtdev-implicit.diff Url: http://bitmath.org/code/mtdev/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,16 +40,14 @@ %package devel Summary: Development package for mtdev library Group: Development/Libraries/C and C++ -Requires: libmtdev1 = %{version} glibc-devel +Requires: glibc-devel +Requires: libmtdev1 = %{version} %description devel This package contains the files needed to compile programs that use mtdev library. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch -P 3 -p1 %build %configure --disable-static ++++++ mtdev-1.1.0.tar.bz2 -> mtdev-1.1.4.tar.bz2 ++++++ ++++ 22232 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/mtdev-1.1.0/ChangeLog new/mtdev-1.1.4/ChangeLog --- old/mtdev-1.1.0/ChangeLog 2010-12-22 19:11:38.000000000 +0100 +++ new/mtdev-1.1.4/ChangeLog 2013-08-03 22:04:17.000000000 +0200 @@ -1,3 +1,169 @@ +commit 25070dda4b1aaaf402db621d10fc901b82d78377 +Author: Henrik Rydberg <[email protected]> +Date: Sat Aug 3 22:01:06 2013 +0200 + + Release mtdev-1.1.4 + + Signed-off-by: Henrik Rydberg <[email protected]> + +commit 72bbb5f42fe8e47d6314eb92a0ada6554644305c +Merge: b5d8e8e a9ea316 +Author: Henrik Rydberg <[email protected]> +Date: Wed Jul 31 19:25:50 2013 +0200 + + Merge more build fixes from Peter Hutterer, along with a more explicit + declaration of the backwards compatibility constraints on the API. + + Signed-off-by: Henrik Rydberg <[email protected]> + +commit a9ea3168615056360cdb21d6f1576d66be2a43fe +Author: Peter Hutterer <[email protected]> +Date: Wed Jul 24 14:24:43 2013 +1000 + + Enable silent rules by default + + silent rules make it easier to spot compiler errors + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 0bccf8c5268826bdb0835dd9b7964bcc95bae35f +Author: Peter Hutterer <[email protected]> +Date: Wed Jul 24 14:23:25 2013 +1000 + + test: silence compiler warning - implicit declaration of function ‘atoi’ + + mtdev-kernel.c:130:2: warning: implicit declaration of function ‘atoi’ + [-Wimplicit-function-declaration] + eslot = atoi(argv[1]) + 1; + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 1ddaf0af41098d0a01eac162c6fe4d38f2fbbbad +Author: Peter Hutterer <[email protected]> +Date: Wed Jul 24 13:00:32 2013 +1000 + + Fix compiler warning - implicit declaration of function 'abs' + + match_four.c:80:4: warning: implicit declaration of function 'abs' + [-Wimplicit-function-declaration] + *dist++ = abs(q->x - p->x) + abs(q->y - p->y); + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 6f7c5c558006bb69fdf0af73103097c012ccfed5 +Author: Peter Hutterer <[email protected]> +Date: Thu Jul 25 13:21:09 2013 +1000 + + Replace hardcoded 11 with a define + + The 11 comes from the legacy API that we need to be binary compatible with. + Make this clear with a define and a comment. + + Signed-off-by: Peter Hutterer <[email protected]> + +commit b5d8e8e26c0116e4b6e556a0f6da8777bc55c590 +Merge: e5eb274 f4fe569 +Author: Henrik Rydberg <[email protected]> +Date: Thu Jul 25 10:05:20 2013 +0200 + + Merge build fixes from Peter Hutterer. + + Signed-off-by: Henrik Rydberg <[email protected]> + +commit f4fe56973a29265e22f049ceed1e299573f90ec4 +Author: Peter Hutterer <[email protected]> +Date: Wed Jul 3 15:49:21 2013 +1000 + + Rename INCLUDES to AM_CPPFLAGS + + src/Makefile.am:22: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') + + Signed-off-by: Peter Hutterer <[email protected]> + +commit e79f2b211830dec2bae35595c6dfd1d06f75d903 +Author: Peter Hutterer <[email protected]> +Date: Wed Jul 3 15:45:12 2013 +1000 + + Drop maintainer mode - enable by default + + Signed-off-by: Peter Hutterer <[email protected]> + +commit e5eb27494cd237e60645db4d7be5b4acf41cb5e0 +Author: Henrik Rydberg <[email protected]> +Date: Wed Aug 22 22:20:16 2012 +0200 + + Release mtdev-1.1.3 + + Signed-off-by: Henrik Rydberg <[email protected]> + +commit 656d5c9d7e37a301afa3af9c2382d6b869f57ebf +Author: David Kozub <[email protected]> +Date: Tue May 29 22:53:21 2012 +0200 + + Fix pc file to allow compiling with mtdev installed in non-std path. + + The pkgconfig file does not specify the -I flag needed to be able to + compile with `pkg-config mtdev --cflags` when libmtdev is installed to + a directory that is not searched by the C compiler by default. + + This patch fixes the issue. + + Signed-off-by: David Kozub <[email protected]> + Signed-off-by: Henrik Rydberg <[email protected]> + +commit 5a6773f85a77e78dbbb915e32768aa24e1c83124 +Author: Henrik Rydberg <[email protected]> +Date: Mon Feb 20 16:03:05 2012 +0100 + + Release mtdev-1.1.2 + + Signed-off-by: Henrik Rydberg <[email protected]> + +commit 43ce27aab2d990e9a4f54d2050b851bd2da01875 +Author: Henrik Rydberg <[email protected]> +Date: Thu Feb 16 16:25:30 2012 +0100 + + Add support for kernel MT slot state retrieval + + From kernel 3.4, extraction of the MT slot state is supported + via the EVIOGMTSLOTS ioctl. This patch initializes the slots + using that information. + + Signed-off-by: Henrik Rydberg <[email protected]> + +commit 3ec66c3b21e45d6529567f5144ba24dcc4645591 +Author: Henrik Rydberg <[email protected]> +Date: Thu Jan 12 20:05:28 2012 +0100 + + Add the missing distance event to the internal slot representation + + The new distance value was missing from the internal representation, + leading to memory corruption for devices supporting the event. Fixed + with this patch. + + Signed-off-by: Henrik Rydberg <[email protected]> + +commit 3aa3de4c19b80caaf93812fafff20acd5f5a4d12 +Author: Peter Hutterer <[email protected]> +Date: Tue Apr 19 11:45:45 2011 +0200 + + Return EINVAL for invalid parameters on mtdev_init. + + [[email protected]: minor cleanup] + Signed-off-by: Peter Hutterer <[email protected]> + Signed-off-by: Henrik Rydberg <[email protected]> + +commit 61684cf0466200631b6a44af1c662eb760ad3f5d +Author: Peter Hutterer <[email protected]> +Date: Tue Apr 19 11:41:04 2011 +0200 + + mtdev_close should ignore NULL devices. + + Saves us one goto label in mtdev_init. + + Signed-off-by: Peter Hutterer <[email protected]> + Signed-off-by: Henrik Rydberg <[email protected]> + commit 9e3daba37d1d15c99a41a2d838bf683934cc7077 Author: Henrik Rydberg <[email protected]> Date: Wed Dec 22 18:55:09 2010 +0100 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/mtdev-1.1.0/Makefile.am new/mtdev-1.1.4/Makefile.am --- old/mtdev-1.1.0/Makefile.am 2010-11-06 10:35:21.000000000 +0100 +++ new/mtdev-1.1.4/Makefile.am 2013-07-25 10:05:20.000000000 +0200 @@ -3,7 +3,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = mtdev.pc -INCLUDES = $(top_srcdir)/include/ +AM_CPPFLAGS = $(top_srcdir)/include/ .PHONY: ChangeLog INSTALL INSTALL: 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/mtdev-1.1.0/config-aux/compile new/mtdev-1.1.4/config-aux/compile --- old/mtdev-1.1.0/config-aux/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/mtdev-1.1.4/config-aux/compile 2013-07-25 09:58:57.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-2013 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/mtdev-1.1.0/config-aux/missing new/mtdev-1.1.4/config-aux/missing --- old/mtdev-1.1.0/config-aux/missing 2010-12-22 19:11:27.000000000 +0100 +++ new/mtdev-1.1.4/config-aux/missing 2012-02-20 16:04:39.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. 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/mtdev-1.1.0/configure.ac new/mtdev-1.1.4/configure.ac --- old/mtdev-1.1.0/configure.ac 2010-12-22 18:53:06.000000000 +0100 +++ new/mtdev-1.1.4/configure.ac 2013-08-03 22:00:12.000000000 +0200 @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([Multitouch Protocol Translation Library], - [1.1.0], + [1.1.4], [], [mtdev]) AC_CONFIG_SRCDIR([Makefile.am]) @@ -10,7 +10,7 @@ # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE +AM_SILENT_RULES([yes]) LIB_VERSION=1:0:0 AC_SUBST([LIB_VERSION]) 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/mtdev-1.1.0/include/mtdev.h new/mtdev-1.1.4/include/mtdev.h --- old/mtdev-1.1.0/include/mtdev.h 2010-12-22 18:30:43.000000000 +0100 +++ new/mtdev-1.1.4/include/mtdev.h 2013-07-25 09:57:40.000000000 +0200 @@ -68,6 +68,11 @@ #define ABS_MT_DISTANCE 0x3b /* Contact hover distance */ #endif +/* includes available in 3.4 */ +#ifndef EVIOCGMTSLOTS +#define EVIOCGMTSLOTS(len) _IOC(_IOC_READ, 'E', 0x0a, len) +#endif + #define MT_ID_NULL (-1) #define MT_ID_MIN 0 #define MT_ID_MAX 65535 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/mtdev-1.1.0/mtdev.pc.in new/mtdev-1.1.4/mtdev.pc.in --- old/mtdev-1.1.0/mtdev.pc.in 2010-11-06 10:35:21.000000000 +0100 +++ new/mtdev-1.1.4/mtdev.pc.in 2013-07-25 09:57:40.000000000 +0200 @@ -7,3 +7,4 @@ Description: Multitouch Protocol Translation Library Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lmtdev +Cflags: -I${includedir} 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/mtdev-1.1.0/src/Makefile.am new/mtdev-1.1.4/src/Makefile.am --- old/mtdev-1.1.0/src/Makefile.am 2010-12-22 18:26:58.000000000 +0100 +++ new/mtdev-1.1.4/src/Makefile.am 2013-07-25 10:05:20.000000000 +0200 @@ -18,7 +18,7 @@ AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI -INCLUDES = -I$(top_srcdir)/include/ +AM_CPPFLAGS = -I$(top_srcdir)/include/ libmtdevincludedir = $(includedir) libmtdevinclude_HEADERS = \ 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/mtdev-1.1.0/src/caps.c new/mtdev-1.1.4/src/caps.c --- old/mtdev-1.1.0/src/caps.c 2010-12-22 18:48:10.000000000 +0100 +++ new/mtdev-1.1.4/src/caps.c 2013-07-31 19:25:50.000000000 +0200 @@ -61,10 +61,10 @@ return NULL; ix = mtdev_abs2mt(code); - if (ix < 11) + if (ix < LEGACY_API_NUM_MT_AXES) return &dev->abs[ix]; else - return &dev->state->ext_abs[ix - 11]; + return &dev->state->ext_abs[ix - LEGACY_API_NUM_MT_AXES]; } static void set_info(struct mtdev *dev, int code, @@ -82,6 +82,28 @@ abs->fuzz = (abs->maximum - abs->minimum) / sn; } +int mtdev_set_slots(struct mtdev *dev, int fd) +{ + struct { unsigned code; int values[DIM_FINGER]; } req; + struct mtdev_state *state = dev->state; + int rc, i, s, nslot; + + nslot = mtdev_get_abs_maximum(dev, ABS_MT_SLOT) + 1; + + for (i = 0; i < MT_ABS_SIZE; i++) { + req.code = mtdev_mt2abs(i); + if (!mtdev_has_mt_event(dev, req.code)) + continue; + SYSCALL(rc = ioctl(fd, EVIOCGMTSLOTS(sizeof(req)), &req)); + if (rc < 0) + return rc; + for (s = 0; s < DIM_FINGER && s < nslot; s++) + set_sval(&state->data[s], i, req.values[s]); + } + + return 0; +} + int mtdev_configure(struct mtdev *dev, int fd) { unsigned long absbits[nlongs(ABS_MAX)]; @@ -118,6 +140,9 @@ default_fuzz(dev, ABS_MT_WIDTH_MINOR, SN_WIDTH); default_fuzz(dev, ABS_MT_ORIENTATION, SN_ORIENT); + if (dev->has_slot) + mtdev_set_slots(dev, fd); + return 0; } @@ -131,10 +156,10 @@ return 0; ix = mtdev_abs2mt(code); - if (ix < 11) + if (ix < LEGACY_API_NUM_MT_AXES) return dev->has_abs[ix]; else - return dev->state->has_ext_abs[ix - 11]; + return dev->state->has_ext_abs[ix - LEGACY_API_NUM_MT_AXES]; } int mtdev_get_abs_minimum(const struct mtdev *dev, int code) @@ -178,10 +203,10 @@ return; ix = mtdev_abs2mt(code); - if (ix < 11) + if (ix < LEGACY_API_NUM_MT_AXES) dev->has_abs[ix] = value; else - dev->state->has_ext_abs[ix - 11] = value; + dev->state->has_ext_abs[ix - LEGACY_API_NUM_MT_AXES] = value; } void mtdev_set_abs_maximum(struct mtdev *dev, int code, int value) 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/mtdev-1.1.0/src/common.h new/mtdev-1.1.4/src/common.h --- old/mtdev-1.1.0/src/common.h 2010-12-22 18:31:03.000000000 +0100 +++ new/mtdev-1.1.4/src/common.h 2013-07-31 19:25:50.000000000 +0200 @@ -87,6 +87,14 @@ /* robust system ioctl calls */ #define SYSCALL(call) while (((call) == -1) && (errno == EINTR)) +/* To be compatible to the original, non-opaque mtdev API, we can only use 11 + * axes in the basic struct. Everything else is hidden in the state, see the + * use of dev->abs[idx] vs dev->state->ext_abs[idx] + * + * See MT_ABS_SIZE in include/mtdev.h + */ +#define LEGACY_API_NUM_MT_AXES 11 + /** * struct mtdev - represents an input MT device * @has_mtdata: true if the device has MT capabilities @@ -105,9 +113,9 @@ struct mtdev { int has_mtdata; int has_slot; - int has_abs[11]; + int has_abs[LEGACY_API_NUM_MT_AXES]; struct input_absinfo slot; - struct input_absinfo abs[11]; + struct input_absinfo abs[LEGACY_API_NUM_MT_AXES]; struct mtdev_state *state; }; 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/mtdev-1.1.0/src/core.c new/mtdev-1.1.4/src/core.c --- old/mtdev-1.1.0/src/core.c 2010-12-22 18:26:58.000000000 +0100 +++ new/mtdev-1.1.4/src/core.c 2013-07-25 09:57:40.000000000 +0200 @@ -359,17 +359,20 @@ int mtdev_open(struct mtdev *dev, int fd) { - int ret; + int ret = -EINVAL; + + if (!dev || fd < 0) + goto error; ret = mtdev_init(dev); if (ret) goto error; ret = mtdev_configure(dev, fd); if (ret) - goto mtdev; + goto error; return 0; - mtdev: - mtdev_close(dev); + error: + mtdev_close(dev); return ret; } @@ -411,8 +414,10 @@ void mtdev_close(struct mtdev *dev) { - free(dev->state); - memset(dev, 0, sizeof(struct mtdev)); + if (dev) { + free(dev->state); + memset(dev, 0, sizeof(struct mtdev)); + } } void mtdev_delete(struct mtdev *dev) 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/mtdev-1.1.0/src/match_four.c new/mtdev-1.1.4/src/match_four.c --- old/mtdev-1.1.0/src/match_four.c 2010-11-07 18:03:13.000000000 +0100 +++ new/mtdev-1.1.4/src/match_four.c 2013-07-31 19:25:50.000000000 +0200 @@ -1,5 +1,6 @@ #include "match.h" #include <limits.h> +#include <stdlib.h> typedef unsigned char u8; typedef unsigned int u32; 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/mtdev-1.1.0/src/state.h new/mtdev-1.1.4/src/state.h --- old/mtdev-1.1.0/src/state.h 2010-12-22 18:26:58.000000000 +0100 +++ new/mtdev-1.1.4/src/state.h 2013-07-31 19:25:50.000000000 +0200 @@ -48,6 +48,7 @@ int blob_id; int tracking_id; int pressure; + int distance; }; static inline int get_sval(const struct mtdev_slot *slot, int ix) @@ -71,8 +72,8 @@ */ struct mtdev_state { - int has_ext_abs[MT_ABS_SIZE - 11]; - struct input_absinfo ext_abs[MT_ABS_SIZE - 11]; + int has_ext_abs[MT_ABS_SIZE - LEGACY_API_NUM_MT_AXES]; + struct input_absinfo ext_abs[MT_ABS_SIZE - LEGACY_API_NUM_MT_AXES]; struct mtdev_iobuf iobuf; struct mtdev_evbuf inbuf; 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/mtdev-1.1.0/test/Makefile.am new/mtdev-1.1.4/test/Makefile.am --- old/mtdev-1.1.0/test/Makefile.am 2010-12-22 19:10:41.000000000 +0100 +++ new/mtdev-1.1.4/test/Makefile.am 2013-07-25 10:05:20.000000000 +0200 @@ -1,7 +1,7 @@ noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel bin_PROGRAMS = mtdev-test -INCLUDES=-I$(top_srcdir)/include/ +AM_CPPFLAGS=-I$(top_srcdir)/include/ mtdev_mapgen_SOURCES = mtdev-mapgen.c 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/mtdev-1.1.0/test/mtdev-kernel.c new/mtdev-1.1.4/test/mtdev-kernel.c --- old/mtdev-1.1.0/test/mtdev-kernel.c 2010-11-17 15:04:08.000000000 +0100 +++ new/mtdev-1.1.4/test/mtdev-kernel.c 2013-07-31 19:25:50.000000000 +0200 @@ -28,6 +28,7 @@ #include <../src/common.h> #include <stdio.h> +#include <stdlib.h> #include <time.h> /* -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
