Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xf86-input-libinput for
openSUSE:Factory checked in at 2021-04-08 21:03:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-libinput (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-libinput.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-libinput"
Thu Apr 8 21:03:08 2021 rev:36 rq:883203 version:1.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-libinput/xf86-input-libinput.changes
2021-03-16 15:43:09.076916856 +0100
+++
/work/SRC/openSUSE:Factory/.xf86-input-libinput.new.2401/xf86-input-libinput.changes
2021-04-08 21:03:19.205975459 +0200
@@ -1,0 +2,16 @@
+Tue Apr 6 08:29:47 UTC 2021 - Stefan Dirsch <[email protected]>
+
+- Update to version 1.0.0
+ * The biggest change here is the license change to MIT. Due to an unfortunate
+ copy/paste error, the actual license text used was the Historical
Permission
+ Notice and Disclaimer license. With the ack of the various contributors,
the
+ driver is now using the MIT license text as intended. The actual impact is
+ low, the HPND is virtually identical to the MIT license anyway (ianal,
+ consult your legal dept if you have one).
+
+ * The only other notable change: cancelled touch points are now lifted
+ correctly. Where libinput cancels a touch, e.g. in response to a palm being
+ detected, the touch point previously got stuck in the down state. This is
+ fixed now.
+
+-------------------------------------------------------------------
Old:
----
xf86-input-libinput-0.30.0.tar.bz2
xf86-input-libinput-0.30.0.tar.bz2.sig
New:
----
xf86-input-libinput-1.0.0.tar.bz2
xf86-input-libinput-1.0.0.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-libinput.spec ++++++
--- /var/tmp/diff_new_pack.ciVa1u/_old 2021-04-08 21:03:19.881976189 +0200
+++ /var/tmp/diff_new_pack.ciVa1u/_new 2021-04-08 21:03:19.885976193 +0200
@@ -17,7 +17,7 @@
Name: xf86-input-libinput
-Version: 0.30.0
+Version: 1.0.0
Release: 0
Summary: Libinput driver for the Xorg X server
License: MIT
++++++ xf86-input-libinput-0.30.0.tar.bz2 -> xf86-input-libinput-1.0.0.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/COPYING
new/xf86-input-libinput-1.0.0/COPYING
--- old/xf86-input-libinput-0.30.0/COPYING 2020-05-19 08:23:02.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/COPYING 2021-04-06 08:10:19.000000000
+0200
@@ -1,20 +1,20 @@
-Copyright ?? 2014 Red Hat, Inc.
+SPDX-License-Identifier: MIT
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without
-fee, provided that the above copyright notice appear in all copies
-and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of the authors
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission. The authors make no
-representations about the suitability of this software for any
-purpose. It is provided "as is" without express or implied
-warranty.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/ChangeLog
new/xf86-input-libinput-1.0.0/ChangeLog
--- old/xf86-input-libinput-0.30.0/ChangeLog 2020-05-19 08:23:18.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/ChangeLog 2021-04-06 08:10:30.000000000
+0200
@@ -1,3 +1,106 @@
+commit 34f14fdf1222d0b4e75a022fd10a04d57800ea93
+Author: Peter Hutterer <[email protected]>
+Date: Tue Apr 6 15:50:38 2021 +1000
+
+ xf86-input-libinput 1.0.0
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 92047e5d99f271a3c7253b4f1b7b7cca4a6ac834
+Author: Peter Hutterer <[email protected]>
+Date: Tue Apr 6 15:55:31 2021 +1000
+
+ gitlab CI: bump to use Fedora 33
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit b8d3c29f59c15f375911192f9920c96943504bf3
+Author: Peter Hutterer <[email protected]>
+Date: Tue Apr 6 15:51:23 2021 +1000
+
+ Remove trailing whitespaces
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 2bbc4727a12471e3699e2803404a013656066a94
+Author: Peter Hutterer <[email protected]>
+Date: Thu Mar 18 13:34:35 2021 +1000
+
+ Switch to the real MIT license
+
+ Due to a copy/paste error, the COPYING file and subsequently created files
+ with the same content referred to the "Historical Permission Notice and
+ Disclaimer - sell variant", not the proper MIT license.
+
+ Replace with the proper MIT (Expat) license and add the use SPDX license
+ identifiers.
+
+ Acks below are from contributors with substantial changes, collected in MR
!19
+ or via private email correspondence.
+
+
https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/-/merge_requests/19
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+ Acked-by: Dorian Stoll <[email protected]>
+ Acked-by: Jonas ??dahl <[email protected]>
+ Acked-by: Benjamin Tissoires <[email protected]>
+ Acked-by: Evangelos Foutras <[email protected]>
+ Acked-by: Niklas Haas <[email protected]>
+ Acked-by: Olivier Fourdan <[email protected]>
+ Acked-by: David Rosca <[email protected]>
+ Acked-by: Lyude Paul <[email protected]>
+ Acked-by: Keith Packard <[email protected]>
+ Acked-by: Alan Coopersmith <[email protected]>
+ Acked-by: Michel D??nzer <[email protected]>
+ Acked-by: Tim Writer <[email protected]>
+ Acked-by: Friedrich Sch??ller <[email protected]>
+ Acked-by: Mikhail Konev <[email protected]>
+ Acked-by: Martin Pieuchot <[email protected]>
+
+commit 39be9449911a7d59386721944e1c4c45f620b95e
+Author: Dorian Stoll <[email protected]>
+Date: Tue Nov 3 15:41:42 2020 +0100
+
+ Lift canceled touch inputs
+
+ If a touch input gets turned into a palm (by setting ABS_MT_TOOL_TYPE to
+ MT_TOOL_PALM), libinput will emit a cancel event instead of the normal
+ up event. The xorg wrapper needs to be able to handle a canceled touch
+ and lift it, otherwise these inputs will never get lifted and will stick
+ around forever.
+
+ Signed-off-by: Dorian Stoll <[email protected]>
+
+commit bd2aaa246dae9ed1896d48ee4a5594c41107d123
+Author: Povilas Kanapickas <[email protected]>
+Date: Mon Oct 19 21:09:49 2020 +0300
+
+ Remove extraneous semicolon
+
+commit 99773d7bdae7eb67064a35d1eea898f1a1966f70
+Author: Povilas Kanapickas <[email protected]>
+Date: Mon Sep 7 05:46:16 2020 +0300
+
+ Remove unused btnmap variables
+
+commit 3afb6244e3510377eb24c7ce1cca014b2979b359
+Author: Peter Hutterer <[email protected]>
+Date: Tue May 19 16:34:18 2020 +1000
+
+ Bump the server requirement to 1.19 to get rid of a bunch of ifdefs
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit f279108ffd07616299cf9fb922de14bd1249658d
+Author: Peter Hutterer <[email protected]>
+Date: Tue May 19 16:30:11 2020 +1000
+
+ Bump the libinput requirement to 1.11
+
+ Released June 2018, that should be recent enough.
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
commit 583ed5acdc17a4dc7848c891d7cdbd35ff07b781
Author: Peter Hutterer <[email protected]>
Date: Tue May 19 15:37:30 2020 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/Makefile.in
new/xf86-input-libinput-1.0.0/Makefile.in
--- old/xf86-input-libinput-0.30.0/Makefile.in 2020-05-19 08:23:10.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/Makefile.in 2021-04-06 08:10:25.000000000
+0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -186,8 +186,8 @@
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir distdir-am dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+ config.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -388,6 +388,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sdkdir = @sdkdir@
sharedstatedir = @sharedstatedir@
@@ -702,6 +703,10 @@
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c
>$(distdir).tar.xz
$(am__post_remove_distdir)
+dist-zstd: distdir
+ tardir=$(distdir) && $(am__tar) | zstd -c
$${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+ $(am__post_remove_distdir)
+
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@@ -744,6 +749,8 @@
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
+ *.tar.zst*) \
+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
@@ -925,7 +932,7 @@
am--refresh check check-am clean clean-cscope clean-generic \
clean-libtool cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
+ dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/aclocal.m4
new/xf86-input-libinput-1.0.0/aclocal.m4
--- old/xf86-input-libinput-0.30.0/aclocal.m4 2020-05-19 08:23:05.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/aclocal.m4 2021-04-06 08:10:22.000000000
+0200
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9435,7 +9435,7 @@
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.19.2])
+m4_define([vers_have], [1.19.3])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -9455,7 +9455,7 @@
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
AC_REQUIRE([AC_PROG_CPP])
-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
+AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
# Check for flag to avoid builtin definitions - assumes unix is predefined,
@@ -11315,7 +11315,7 @@
AC_SUBST([CHANGELOG_CMD])
]) # XORG_CHANGELOG
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11330,7 +11330,7 @@
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.1], [],
+m4_if([$1], [1.16.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -11346,14 +11346,14 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11405,7 +11405,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11436,7 +11436,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11627,7 +11627,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11666,7 +11666,9 @@
done
if test $am_rc -ne 0; then
AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE="gmake" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).])
fi
@@ -11693,7 +11695,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11890,7 +11892,7 @@
done
echo "timestamp for $_am_arg"
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11911,7 +11913,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11932,7 +11934,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -11975,7 +11977,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -12014,7 +12016,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -12043,7 +12045,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -12090,7 +12092,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -12109,7 +12111,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -12190,7 +12192,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -12250,7 +12252,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -12278,7 +12280,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
+# Copyright (C) 2006-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -12297,7 +12299,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/compile
new/xf86-input-libinput-1.0.0/compile
--- old/xf86-input-libinput-0.30.0/compile 2020-05-19 08:23:09.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/compile 2021-04-06 08:10:25.000000000
+0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
# Written by Tom Tromey <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN* | MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/* | msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/config.h.in
new/xf86-input-libinput-1.0.0/config.h.in
--- old/xf86-input-libinput-0.30.0/config.h.in 2020-05-19 08:23:09.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/config.h.in 2021-04-06 08:10:25.000000000
+0200
@@ -9,9 +9,6 @@
/* libinput_device_config_scroll_get_button_lock() is available */
#undef HAVE_LIBINPUT_SCROLL_BUTTON_LOCK
-/* libinput_device_touch_get_touch_count() is available */
-#undef HAVE_LIBINPUT_TOUCH_COUNT
-
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/configure
new/xf86-input-libinput-1.0.0/configure
--- old/xf86-input-libinput-0.30.0/configure 2020-05-19 08:23:08.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/configure 2021-04-06 08:10:25.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-input-libinput 0.30.0.
+# Generated by GNU Autoconf 2.69 for xf86-input-libinput 1.0.0.
#
# Report bugs to
<https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/issues>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-input-libinput'
PACKAGE_TARNAME='xf86-input-libinput'
-PACKAGE_VERSION='0.30.0'
-PACKAGE_STRING='xf86-input-libinput 0.30.0'
+PACKAGE_VERSION='1.0.0'
+PACKAGE_STRING='xf86-input-libinput 1.0.0'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/issues'
PACKAGE_URL=''
@@ -760,6 +760,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -854,6 +855,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1106,6 +1108,15 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1243,7 +1254,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1356,7 +1367,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-libinput 0.30.0 to adapt to many kinds of
systems.
+\`configure' configures xf86-input-libinput 1.0.0 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1396,6 +1407,7 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1427,7 +1439,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-libinput 0.30.0:";;
+ short | recursive ) echo "Configuration of xf86-input-libinput 1.0.0:";;
esac
cat <<\_ACEOF
@@ -1561,7 +1573,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-libinput configure 0.30.0
+xf86-input-libinput configure 1.0.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1885,7 +1897,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-libinput $as_me 0.30.0, which was
+It was created by xf86-input-libinput $as_me 1.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2753,7 +2765,7 @@
# Define the identity of the package.
PACKAGE='xf86-input-libinput'
- VERSION='0.30.0'
+ VERSION='1.0.0'
cat >>confdefs.h <<_ACEOF
@@ -18318,12 +18330,12 @@
pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"xorg-server >= 1.10 xproto inputproto >= 2.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.10 xproto inputproto
>= 2.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"xorg-server >= 1.19 xproto inputproto >= 2.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.19 xproto inputproto
>= 2.2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.10 xproto
inputproto >= 2.2" 2>/dev/null`
+ pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.19 xproto
inputproto >= 2.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -18335,12 +18347,12 @@
pkg_cv_XORG_LIBS="$XORG_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"xorg-server >= 1.10 xproto inputproto >= 2.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.10 xproto inputproto
>= 2.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"xorg-server >= 1.19 xproto inputproto >= 2.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.19 xproto inputproto
>= 2.2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.10 xproto inputproto
>= 2.2" 2>/dev/null`
+ pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.19 xproto inputproto
>= 2.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -18361,14 +18373,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "xorg-server >= 1.10 xproto inputproto >= 2.2" 2>&1`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "xorg-server >= 1.19 xproto inputproto >= 2.2" 2>&1`
else
- XORG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"xorg-server >= 1.10 xproto inputproto >= 2.2" 2>&1`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"xorg-server >= 1.19 xproto inputproto >= 2.2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XORG_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (xorg-server >= 1.10 xproto
inputproto >= 2.2) were not met:
+ as_fn_error $? "Package requirements (xorg-server >= 1.19 xproto
inputproto >= 2.2) were not met:
$XORG_PKG_ERRORS
@@ -18409,12 +18421,12 @@
pkg_cv_LIBINPUT_CFLAGS="$LIBINPUT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libinput >= 1.7.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libinput >= 1.7.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libinput >= 1.11.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 1.11.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBINPUT_CFLAGS=`$PKG_CONFIG --cflags "libinput >= 1.7.0" 2>/dev/null`
+ pkg_cv_LIBINPUT_CFLAGS=`$PKG_CONFIG --cflags "libinput >= 1.11.0"
2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -18426,12 +18438,12 @@
pkg_cv_LIBINPUT_LIBS="$LIBINPUT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libinput >= 1.7.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libinput >= 1.7.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libinput >= 1.11.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 1.11.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBINPUT_LIBS=`$PKG_CONFIG --libs "libinput >= 1.7.0" 2>/dev/null`
+ pkg_cv_LIBINPUT_LIBS=`$PKG_CONFIG --libs "libinput >= 1.11.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -18452,14 +18464,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libinput >= 1.7.0" 2>&1`
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libinput >= 1.11.0" 2>&1`
else
- LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libinput >= 1.7.0" 2>&1`
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libinput >= 1.11.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBINPUT_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libinput >= 1.7.0) were not met:
+ as_fn_error $? "Package requirements (libinput >= 1.11.0) were not met:
$LIBINPUT_PKG_ERRORS
@@ -18496,33 +18508,6 @@
OLD_CFLAGS=$CFLAGS
LIBS="$LIBS $LIBINPUT_LIBS"
CFLAGS="$CFLAGS $LIBINPUT_CFLAGS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if
libinput_device_touch_get_touch_count is available" >&5
-$as_echo_n "checking if libinput_device_touch_get_touch_count is available...
" >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <libinput.h>
-int
-main ()
-{
-libinput_device_touch_get_touch_count(NULL)
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_LIBINPUT_TOUCH_COUNT 1" >>confdefs.h
-
- libinput_have_touch_count=yes
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- libinput_have_touch_count=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if
libinput_device_config_scroll_get_button_lock is available" >&5
$as_echo_n "checking if libinput_device_config_scroll_get_button_lock is
available... " >&6; }
@@ -19124,7 +19109,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-libinput $as_me 0.30.0, which was
+This file was extended by xf86-input-libinput $as_me 1.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19190,7 +19175,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xf86-input-libinput config.status 0.30.0
+xf86-input-libinput config.status 1.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -20288,7 +20273,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE=\"gmake\" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).
See \`config.log' for more details" "$LINENO" 5; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/configure.ac
new/xf86-input-libinput-1.0.0/configure.ac
--- old/xf86-input-libinput-0.30.0/configure.ac 2020-05-19 08:23:02.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/configure.ac 2021-04-06 08:10:19.000000000
+0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-libinput],
- [0.30.0],
+ [1.0.0],
[https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/issues],
[xf86-input-libinput])
AC_CONFIG_SRCDIR([Makefile.am])
@@ -38,29 +38,19 @@
LT_INIT
# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by
XORG_MANPAGE_SECTIONS
-m4_ifndef([XORG_MACROS_VERSION],
+m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running
autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Obtain compiler/linker options from server and required extensions
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto [inputproto >= 2.2])
-PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.7.0])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.19] xproto [inputproto >= 2.2])
+PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.11.0])
OLD_LIBS=$LIBS
OLD_CFLAGS=$CFLAGS
LIBS="$LIBS $LIBINPUT_LIBS"
CFLAGS="$CFLAGS $LIBINPUT_CFLAGS"
-AC_MSG_CHECKING([if libinput_device_touch_get_touch_count is available])
-AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[#include <libinput.h>]],
-
[[libinput_device_touch_get_touch_count(NULL)]])],
- [AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_LIBINPUT_TOUCH_COUNT, [1],
- [libinput_device_touch_get_touch_count() is
available])
- [libinput_have_touch_count=yes]],
- [AC_MSG_RESULT([no])
- [libinput_have_touch_count=no]])
AC_MSG_CHECKING([if libinput_device_config_scroll_get_button_lock is
available])
AC_LINK_IFELSE(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/depcomp
new/xf86-input-libinput-1.0.0/depcomp
--- old/xf86-input-libinput-0.30.0/depcomp 2020-05-19 08:23:10.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/depcomp 2021-04-06 08:10:26.000000000
+0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
# 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/include/Makefile.in
new/xf86-input-libinput-1.0.0/include/Makefile.in
--- old/xf86-input-libinput-0.30.0/include/Makefile.in 2020-05-19
08:23:10.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/include/Makefile.in 2021-04-06
08:10:25.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -302,6 +302,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sdkdir = @sdkdir@
sharedstatedir = @sharedstatedir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xf86-input-libinput-0.30.0/include/libinput-properties.h
new/xf86-input-libinput-1.0.0/include/libinput-properties.h
--- old/xf86-input-libinput-0.30.0/include/libinput-properties.h
2020-05-19 08:23:02.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/include/libinput-properties.h 2021-04-06
08:10:19.000000000 +0200
@@ -1,24 +1,26 @@
/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright ?? 2015 Red Hat, Inc.
*
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission. Red
- * Hat makes no representations about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied
- * warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
*/
#ifndef _LIBINPUT_PROPERTIES_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/install-sh
new/xf86-input-libinput-1.0.0/install-sh
--- old/xf86-input-libinput-0.30.0/install-sh 2020-05-19 08:23:09.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/install-sh 2021-04-06 08:10:25.000000000
+0200
@@ -451,7 +451,18 @@
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+ (umask $cp_umask &&
+ { test -z "$stripcmd" || {
+ # Create $dsttmp read-write so that cp doesn't create it read-only,
+ # which would cause strip to fail.
+ if test -z "$doit"; then
+ : >"$dsttmp" # No need to fork-exec 'touch'.
+ else
+ $doit touch "$dsttmp"
+ fi
+ }
+ } &&
+ $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/man/Makefile.am
new/xf86-input-libinput-1.0.0/man/Makefile.am
--- old/xf86-input-libinput-0.30.0/man/Makefile.am 2020-05-19
08:23:02.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/man/Makefile.am 2021-04-06
08:10:19.000000000 +0200
@@ -18,7 +18,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-#
+#
drivermandir = $(DRIVER_MAN_DIR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/man/Makefile.in
new/xf86-input-libinput-1.0.0/man/Makefile.in
--- old/xf86-input-libinput-0.30.0/man/Makefile.in 2020-05-19
08:23:10.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/man/Makefile.in 2021-04-06
08:10:25.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-#
+#
VPATH = @srcdir@
am__is_gnu_make = { \
@@ -306,6 +306,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sdkdir = @sdkdir@
sharedstatedir = @sharedstatedir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/man/libinput.man
new/xf86-input-libinput-1.0.0/man/libinput.man
--- old/xf86-input-libinput-0.30.0/man/libinput.man 2020-05-19
08:23:02.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/man/libinput.man 2021-04-06
08:10:19.000000000 +0200
@@ -143,10 +143,10 @@
scroll events.
.TP 7
.BI "Option \*qScrollButtonLock\*q \*q" bool \*q
-Enables or disables the scroll button lock. If enabled, the
+Enables or disables the scroll button lock. If enabled, the
.BI ScrollButton
is considered logically down after the first click and remains down until
-the second click of that button. If disabled (the default), the
+the second click of that button. If disabled (the default), the
.BI ScrollButton
button is considered logically down while held down and up once physically
released.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/missing
new/xf86-input-libinput-1.0.0/missing
--- old/xf86-input-libinput-0.30.0/missing 2020-05-19 08:23:09.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/missing 2021-04-06 08:10:25.000000000
+0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/src/Makefile.in
new/xf86-input-libinput-1.0.0/src/Makefile.in
--- old/xf86-input-libinput-0.30.0/src/Makefile.in 2020-05-19
08:23:10.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/src/Makefile.in 2021-04-06
08:10:26.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -374,6 +374,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sdkdir = @sdkdir@
sharedstatedir = @sharedstatedir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/src/bezier.c
new/xf86-input-libinput-1.0.0/src/bezier.c
--- old/xf86-input-libinput-0.30.0/src/bezier.c 2020-05-19 08:23:02.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/src/bezier.c 2021-04-06 08:10:19.000000000
+0200
@@ -1,24 +1,26 @@
/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright ?? 2016 Red Hat, Inc.
*
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission. Red
- * Hat makes no representations about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied
- * warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/src/bezier.h
new/xf86-input-libinput-1.0.0/src/bezier.h
--- old/xf86-input-libinput-0.30.0/src/bezier.h 2020-05-19 08:23:02.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/src/bezier.h 2021-04-06 08:10:19.000000000
+0200
@@ -1,24 +1,26 @@
/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright ?? 2016 Red Hat, Inc.
*
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission. Red
- * Hat makes no representations about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied
- * warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/src/draglock.c
new/xf86-input-libinput-1.0.0/src/draglock.c
--- old/xf86-input-libinput-0.30.0/src/draglock.c 2020-05-19
08:23:02.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/src/draglock.c 2021-04-06
08:10:19.000000000 +0200
@@ -1,24 +1,26 @@
/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright ?? 2015 Red Hat, Inc.
*
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission. Red
- * Hat makes no representations about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied
- * warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/src/draglock.h
new/xf86-input-libinput-1.0.0/src/draglock.h
--- old/xf86-input-libinput-0.30.0/src/draglock.h 2020-05-19
08:23:02.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/src/draglock.h 2021-04-06
08:10:19.000000000 +0200
@@ -1,24 +1,26 @@
/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright ?? 2015 Red Hat, Inc.
*
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission. Red
- * Hat makes no representations about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied
- * warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/src/xf86libinput.c
new/xf86-input-libinput-1.0.0/src/xf86libinput.c
--- old/xf86-input-libinput-0.30.0/src/xf86libinput.c 2020-05-19
08:23:02.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/src/xf86libinput.c 2021-04-06
08:10:19.000000000 +0200
@@ -1,24 +1,26 @@
/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright ?? 2013-2017 Red Hat, Inc.
*
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission. Red
- * Hat makes no representations about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied
- * warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
@@ -46,20 +48,6 @@
#include "draglock.h"
#include "libinput-properties.h"
-#ifndef XI86_SERVER_FD
-#define XI86_SERVER_FD 0x20
-#endif
-
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 1000 +
GET_ABI_MINOR(ABI_XINPUT_VERSION) > 22000
-#define HAVE_VMASK_UNACCEL 1
-#else
-#undef HAVE_VMASK_UNACCEL
-#endif
-
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23
-#define HAVE_THREADED_INPUT 1
-#endif
-
#define TOUCHPAD_NUM_AXES 4 /* x, y, hscroll, vscroll */
#define TABLET_NUM_BUTTONS 7 /* we need scroll buttons */
#define TOUCH_MAX_SLOTS 15
@@ -820,13 +808,8 @@
pInfo->fd = libinput_get_fd(libinput);
if (driver_context.device_enabled_count == 0) {
-#if HAVE_THREADED_INPUT
xf86AddEnabledDevice(pInfo);
driver_context.registered_InputInfoPtr = pInfo;
-#else
- /* Can't use xf86AddEnabledDevice on an epollfd */
- AddEnabledDevice(pInfo->fd);
-#endif
}
driver_context.device_enabled_count++;
@@ -845,11 +828,7 @@
struct xf86libinput_device *shared_device = driver_data->shared_device;
if (--driver_context.device_enabled_count == 0) {
-#if HAVE_THREADED_INPUT
xf86RemoveEnabledDevice(pInfo);
-#else
- RemoveEnabledDevice(pInfo->fd);
-#endif
}
if (use_server_fd(pInfo)) {
@@ -1075,13 +1054,11 @@
struct xf86libinput *driver_data = pInfo->private;
struct libinput_device *device = driver_data->shared_device->device;
int min, max, res;
- unsigned char btnmap[MAX_BUTTONS + 1];
Atom btnlabels[MAX_BUTTONS];
Atom axislabels[TOUCHPAD_NUM_AXES];
int nbuttons = 7;
int ntouches = TOUCH_MAX_SLOTS;
- init_button_map(btnmap, ARRAY_SIZE(btnmap));
init_button_labels(btnlabels, ARRAY_SIZE(btnlabels));
init_axis_labels(axislabels, ARRAY_SIZE(axislabels));
@@ -1104,11 +1081,9 @@
XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_Y),
min, max, res * 1000, 0, res * 1000,
Absolute);
-#if HAVE_LIBINPUT_TOUCH_COUNT
ntouches = libinput_device_touch_get_touch_count(device);
if (ntouches == 0) /* unknown - mtdev */
ntouches = TOUCH_MAX_SLOTS;
-#endif
InitTouchClassDeviceStruct(dev, ntouches, XIDirectTouch, 2);
}
@@ -1218,7 +1193,6 @@
struct xf86libinput *driver_data = pInfo->private;
struct libinput_tablet_tool *tool;
int min, max, res;
- unsigned char btnmap[TABLET_NUM_BUTTONS];
Atom btnlabels[TABLET_NUM_BUTTONS] = {0};
Atom axislabels[TOUCHPAD_NUM_AXES] = {0};
int nbuttons = TABLET_NUM_BUTTONS;
@@ -1228,8 +1202,6 @@
tool = driver_data->tablet_tool;
- init_button_map(btnmap, ARRAY_SIZE(btnmap));
-
if (libinput_tablet_tool_has_pressure(tool))
naxes++;
if (libinput_tablet_tool_has_tilt(tool))
@@ -1285,14 +1257,12 @@
struct xf86libinput *driver_data = pInfo->private;
struct libinput_device *device = driver_data->shared_device->device;
int min, max, res;
- unsigned char btnmap[MAX_BUTTONS];
Atom btnlabels[MAX_BUTTONS] = {0};
Atom axislabels[TOUCHPAD_NUM_AXES] = {0};
int nbuttons;
int naxes = 7;
nbuttons = libinput_device_tablet_pad_get_num_buttons(device) + 4;
- init_button_map(btnmap, nbuttons);
InitPointerDeviceStruct((DevicePtr)dev,
driver_data->options.btnmap,
@@ -1407,19 +1377,11 @@
while (next == pInfo || !is_libinput_device(next))
next = next->next;
-#if HAVE_THREADED_INPUT
input_lock();
-#else
- int sigstate = xf86BlockSIGIO();
-#endif
xf86RemoveEnabledDevice(pInfo);
xf86AddEnabledDevice(next);
driver_context.registered_InputInfoPtr = next;
-#if HAVE_THREADED_INPUT
input_unlock();
-#else
- xf86UnblockSIGIO(sigstate);
-#endif
}
static void
@@ -1488,7 +1450,6 @@
valuator_mask_zero(mask);
-#if HAVE_VMASK_UNACCEL
{
double ux, uy;
@@ -1498,10 +1459,6 @@
valuator_mask_set_unaccelerated(mask, 0, x, ux);
valuator_mask_set_unaccelerated(mask, 1, y, uy);
}
-#else
- valuator_mask_set_double(mask, 0, x);
- valuator_mask_set_double(mask, 1, y);
-#endif
xf86PostMotionEventM(dev, Relative, mask);
}
@@ -1743,6 +1700,7 @@
touchids[slot] = next_touchid++;
break;
case LIBINPUT_EVENT_TOUCH_UP:
+ case LIBINPUT_EVENT_TOUCH_CANCEL:
type = XI_TouchEnd;
break;
case LIBINPUT_EVENT_TOUCH_MOTION:
@@ -1750,11 +1708,11 @@
break;
default:
return;
- };
+ }
valuator_mask_zero(m);
- if (event_type != LIBINPUT_EVENT_TOUCH_UP) {
+ if (type != XI_TouchEnd) {
val = libinput_event_touch_get_x_transformed(event,
TOUCH_AXIS_MAX);
valuator_mask_set_double(m, 0, val);
@@ -3239,20 +3197,12 @@
{
DeviceIntPtr dev;
-#if HAVE_THREADED_INPUT
input_lock();
-#else
- int sigstate = xf86BlockSIGIO();
-#endif
if (NewInputDeviceRequest(hotplug->input_options,
hotplug->attrs,
&dev) != Success)
dev = NULL;
-#if HAVE_THREADED_INPUT
input_unlock();
-#else
- xf86UnblockSIGIO(sigstate);
-#endif
input_option_free_list(&hotplug->input_options);
FreeInputAttributes(hotplug->attrs);
@@ -3552,9 +3502,7 @@
.UnInit = xf86libinput_uninit,
.module = NULL,
.default_options= NULL,
-#ifdef XI86_DRV_CAP_SERVER_FD
.capabilities = XI86_DRV_CAP_SERVER_FD
-#endif
};
static XF86ModuleVersionInfo xf86libinput_version_info = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/test/Makefile.in
new/xf86-input-libinput-1.0.0/test/Makefile.in
--- old/xf86-input-libinput-0.30.0/test/Makefile.in 2020-05-19
08:23:10.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/test/Makefile.in 2021-04-06
08:10:26.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -516,6 +516,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sdkdir = @sdkdir@
sharedstatedir = @sharedstatedir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/test/test-bezier.c
new/xf86-input-libinput-1.0.0/test/test-bezier.c
--- old/xf86-input-libinput-0.30.0/test/test-bezier.c 2020-05-19
08:23:02.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/test/test-bezier.c 2021-04-06
08:10:19.000000000 +0200
@@ -1,24 +1,26 @@
/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright ?? 2016 Red Hat, Inc.
*
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission. Red
- * Hat makes no representations about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied
- * warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
*/
#include "bezier.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/test/test-draglock.c
new/xf86-input-libinput-1.0.0/test/test-draglock.c
--- old/xf86-input-libinput-0.30.0/test/test-draglock.c 2020-05-19
08:23:02.000000000 +0200
+++ new/xf86-input-libinput-1.0.0/test/test-draglock.c 2021-04-06
08:10:19.000000000 +0200
@@ -1,24 +1,26 @@
/*
+ * SPDX-License-Identifier: MIT
+ *
* Copyright ?? 2013-2015 Red Hat, Inc.
*
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Red Hat
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission. Red
- * Hat makes no representations about the suitability of this software
- * for any purpose. It is provided "as is" without express or implied
- * warranty.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
*
- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
*/
#include "draglock.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.30.0/test-driver
new/xf86-input-libinput-1.0.0/test-driver
--- old/xf86-input-libinput-0.30.0/test-driver 2020-05-19 08:23:10.000000000
+0200
+++ new/xf86-input-libinput-1.0.0/test-driver 2021-04-06 08:10:26.000000000
+0200
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2018 Free Software Foundation, Inc.
+# Copyright (C) 2011-2020 Free Software Foundation, Inc.
#
# 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
