Hello community, here is the log from the commit of package mtdev for openSUSE:Factory checked in at 2020-08-28 21:13:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mtdev (Old) and /work/SRC/openSUSE:Factory/.mtdev.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtdev" Fri Aug 28 21:13:42 2020 rev:10 rq:829127 version:1.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/mtdev/mtdev.changes 2015-03-05 18:15:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mtdev.new.3399/mtdev.changes 2020-08-28 21:14:13.000116124 +0200 @@ -1,0 +2,10 @@ +Tue Aug 25 09:27:06 UTC 2020 - Dirk Mueller <dmuel...@suse.com> + +- update to 1.1.6: + * adjust for 64bit time_t for 32bit architectures + * Use a macro for `nlongs` so it can be used in constant expression + * mtdev-matching.c: declare global variables static + * mtdev-mapgen.c: declare init_caps() static + * caps.c: declare mtdev_set_slots() static + +------------------------------------------------------------------- Old: ---- mtdev-1.1.5.tar.bz2 New: ---- mtdev-1.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtdev.spec ++++++ --- /var/tmp/diff_new_pack.A6gkAv/_old 2020-08-28 21:14:15.792117480 +0200 +++ /var/tmp/diff_new_pack.A6gkAv/_new 2020-08-28 21:14:15.796117482 +0200 @@ -1,7 +1,7 @@ # # spec file for package mtdev # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,21 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: mtdev -Version: 1.1.5 +Version: 1.1.6 Release: 0 Summary: Multitouch Protocol Translation Library License: MIT Group: System/Libraries -Url: http://bitmath.org/code/mtdev/ +URL: https://bitmath.org/code/mtdev/ Source: http://bitmath.org/code/mtdev/mtdev-%{version}.tar.bz2 Source1: baselibs.conf -BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig %description The mtdev is a stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol. The events put into mtdev may be from any MT device, specifically type A without contact tracking, type A with contact tracking, or type B with contact tracking. See the kernel documentation for further details. @@ -53,27 +52,24 @@ %build %configure \ --enable-static=no -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n libmtdev1 -p /sbin/ldconfig - %postun -n libmtdev1 -p /sbin/ldconfig %files -%defattr(-, root, root) -%doc COPYING ChangeLog README +%license COPYING +%doc ChangeLog README %{_bindir}/* %files -n libmtdev1 -%defattr(-, root, root) %{_libdir}/lib*.so.* %files devel -%defattr(-, root, root) %{_libdir}/lib*.so %{_includedir}/* %{_libdir}/pkgconfig/*.pc ++++++ mtdev-1.1.5.tar.bz2 -> mtdev-1.1.6.tar.bz2 ++++++ ++++ 23365 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.5/ChangeLog new/mtdev-1.1.6/ChangeLog --- old/mtdev-1.1.5/ChangeLog 2014-02-28 19:58:41.000000000 +0100 +++ new/mtdev-1.1.6/ChangeLog 2020-01-26 15:02:08.000000000 +0100 @@ -1,3 +1,72 @@ +commit 25d541d2b0b526eba58fee99ceac202acca6d4a2 +Author: Henrik Rydberg <rydb...@bitmath.se> +Date: Sun Jan 26 14:40:46 2020 +0100 + + Release mtdev-1.1.6 + + Signed-off-by: Henrik Rydberg <rydb...@bitmath.se> + +commit 598e561881c687cea072375637aa08ac9230fabe +Author: Khem Raj <raj.k...@gmail.com> +Date: Sat Nov 23 18:45:32 2019 -0800 + + adjust for 64bit time_t for 32bit architectures + + libc that has support for 32 bit applications to use 64 bit + time_t supplies __USE_TIME_BITS64 define [1] + + [1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign + + Signed-off-by: Khem Raj <raj.k...@gmail.com> + Signed-off-by: Henrik Rydberg <rydb...@bitmath.se> + +commit 5a260fa95a5e7cebdd8f9da947c8d8eb244efae0 +Author: Michael Forney <mfor...@mforney.org> +Date: Fri Jun 7 11:29:01 2019 -0700 + + Use a macro for `nlongs` so it can be used in constant expression + + This way, it can be used to specify the `absbits` array size (in + `mtdev_configure`) without making it a VLA. + + VLAs are an optional feature in C11, and in this case we can determine + the array size statically. + + This also matches the macros used in libevdev and libinput. + + Signed-off-by: Michael Forney <mfor...@mforney.org> + Signed-off-by: Henrik Rydberg <rydb...@bitmath.se> + +commit 5f9caa26b81155feede6ff71c9b14fa0e8980fbd +Author: Martin Kepplinger <mart...@posteo.de> +Date: Tue Aug 22 11:12:13 2017 +0200 + + mtdev-matching.c: declare global variables static + + n1 and n2 are only locally used and can thus be static. + + Signed-off-by: Martin Kepplinger <mart...@posteo.de> + +commit d9f084c9384f99d3589cf51f8503b7aee4e9666c +Author: Martin Kepplinger <mart...@posteo.de> +Date: Tue Aug 22 11:12:12 2017 +0200 + + mtdev-mapgen.c: declare init_caps() static + + init_caps() is only locally used and can thus be static. + + Signed-off-by: Martin Kepplinger <mart...@posteo.de> + +commit 8ba8d359392693f9882ea2d195fc1bebb8b3a29d +Author: Martin Kepplinger <mart...@posteo.de> +Date: Tue Aug 22 11:12:11 2017 +0200 + + caps.c: declare mtdev_set_slots() static + + mtdev_set_slots() is only used internally, so it should be static. + + Signed-off-by: Martin Kepplinger <mart...@posteo.de> + commit 4381b78fea54de0e775bf54952b2f95e5a06c57d Author: Henrik Rydberg <rydb...@euromail.se> Date: Fri Feb 28 19:57:15 2014 +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.5/config-aux/compile new/mtdev-1.1.6/config-aux/compile --- old/mtdev-1.1.5/config-aux/compile 2013-07-25 09:58:57.000000000 +0200 +++ new/mtdev-1.1.6/config-aux/compile 2020-01-26 14:19:59.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # 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/>. +# along with this program. If not, see <https://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 @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # 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.5/config-aux/missing new/mtdev-1.1.6/config-aux/missing --- old/mtdev-1.1.5/config-aux/missing 2012-02-20 16:04:39.000000000 +0100 +++ new/mtdev-1.1.6/config-aux/missing 2010-08-02 10:03:28.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2012-01-06.13; # UTC +scriptversion=2009-04-28.21; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -84,6 +84,7 @@ 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 @@ -121,6 +122,15 @@ # 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. @@ -216,7 +226,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/'` @@ -246,7 +256,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/'` @@ -308,6 +318,41 @@ 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.5/config.h.in new/mtdev-1.1.6/config.h.in --- old/mtdev-1.1.5/config.h.in 2014-02-28 19:57:54.000000000 +0100 +++ new/mtdev-1.1.6/config.h.in 2020-01-26 15:02:03.000000000 +0100 @@ -30,8 +30,7 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ 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.5/configure.ac new/mtdev-1.1.6/configure.ac --- old/mtdev-1.1.5/configure.ac 2014-02-28 19:56:33.000000000 +0100 +++ new/mtdev-1.1.6/configure.ac 2020-01-26 15:00:32.000000000 +0100 @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([Multitouch Protocol Translation Library], - [1.1.5], + [1.1.6], [], [mtdev]) 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/mtdev-1.1.5/src/caps.c new/mtdev-1.1.6/src/caps.c --- old/mtdev-1.1.5/src/caps.c 2013-07-31 19:25:50.000000000 +0200 +++ new/mtdev-1.1.6/src/caps.c 2020-01-26 15:00:32.000000000 +0100 @@ -32,16 +32,12 @@ static const int SN_WIDTH = 100; /* width signal-to-noise ratio */ static const int SN_ORIENT = 10; /* orientation signal-to-noise ratio */ -static const int bits_per_long = 8 * sizeof(long); - -static inline int nlongs(int nbit) -{ - return (nbit + bits_per_long - 1) / bits_per_long; -} +#define LONG_BITS (sizeof(long) * 8) +#define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) static inline int getbit(const unsigned long *map, int key) { - return (map[key / bits_per_long] >> (key % bits_per_long)) & 0x01; + return (map[key / LONG_BITS] >> (key % LONG_BITS)) & 0x01; } static int getabs(struct input_absinfo *abs, int key, int fd) @@ -82,7 +78,7 @@ abs->fuzz = (abs->maximum - abs->minimum) / sn; } -int mtdev_set_slots(struct mtdev *dev, int fd) +static int mtdev_set_slots(struct mtdev *dev, int fd) { struct { unsigned code; int values[DIM_FINGER]; } req; struct mtdev_state *state = dev->state; @@ -106,7 +102,7 @@ int mtdev_configure(struct mtdev *dev, int fd) { - unsigned long absbits[nlongs(ABS_MAX)]; + unsigned long absbits[NLONGS(ABS_MAX)]; int rc, i; SYSCALL(rc = ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits)); 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.5/src/core.c new/mtdev-1.1.6/src/core.c --- old/mtdev-1.1.5/src/core.c 2013-07-25 09:57:40.000000000 +0200 +++ new/mtdev-1.1.6/src/core.c 2020-01-26 15:00:32.000000000 +0100 @@ -31,6 +31,11 @@ #include "evbuf.h" #include "match.h" +#ifndef input_event_sec +#define input_event_sec time.tv_sec +#define input_event_usec time.tv_usec +#endif + static inline int istouch(const struct mtdev_slot *data, const struct mtdev *dev) { @@ -251,7 +256,8 @@ count++; if (!count) return; - ev.time = syn->time; + ev.input_event_sec = syn->input_event_sec; + ev.input_event_usec = syn->input_event_usec; ev.type = EV_ABS; ev.code = ABS_MT_SLOT; ev.value = slot; 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.5/test/mtdev-mapgen.c new/mtdev-1.1.6/test/mtdev-mapgen.c --- old/mtdev-1.1.5/test/mtdev-mapgen.c 2013-07-25 09:57:40.000000000 +0200 +++ new/mtdev-1.1.6/test/mtdev-mapgen.c 2020-01-26 15:00:32.000000000 +0100 @@ -49,7 +49,7 @@ static unsigned int cabs2mt[ABS_CNT]; static unsigned int cmt2abs[MT_ABS_SIZE]; -void init_caps() +static void init_caps() { static const int init_abs_map[MT_ABS_SIZE] = MT_SLOT_ABS_EVENTS; int 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/mtdev-1.1.5/test/mtdev-matching.c new/mtdev-1.1.6/test/mtdev-matching.c --- old/mtdev-1.1.5/test/mtdev-matching.c 2013-07-25 09:57:40.000000000 +0200 +++ new/mtdev-1.1.6/test/mtdev-matching.c 2020-01-26 15:00:32.000000000 +0100 @@ -31,8 +31,8 @@ #include <time.h> #define ITS 4000000 -const int n1 = 4; -const int n2 = 4; +static const int n1 = 4; +static const int n2 = 4; static void test1() { 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.5/test/mtdev-test.c new/mtdev-1.1.6/test/mtdev-test.c --- old/mtdev-1.1.5/test/mtdev-test.c 2014-02-28 19:48:23.000000000 +0100 +++ new/mtdev-1.1.6/test/mtdev-test.c 2020-01-26 15:00:32.000000000 +0100 @@ -30,9 +30,15 @@ #include <stdio.h> #include <unistd.h> #include <fcntl.h> +#include <stdint.h> + +#ifndef input_event_sec +#define input_event_sec time.tv_sec +#define input_event_usec time.tv_usec +#endif /* year-proof millisecond event time */ -typedef __u64 mstime_t; +typedef uint64_t mstime_t; static int use_event(const struct input_event *ev) { @@ -47,7 +53,7 @@ { static const mstime_t ms = 1000; static int slot; - mstime_t evtime = ev->time.tv_usec / ms + ev->time.tv_sec * ms; + mstime_t evtime = ev->input_event_usec / ms + ev->input_event_sec * ms; if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT) slot = ev->value; fprintf(stderr, "%012llx %02d %01d %04x %d\n",
