Hello community,
here is the log from the commit of package xf86-input-libinput for
openSUSE:Factory checked in at 2015-08-01 11:37:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-libinput (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-libinput.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-libinput"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-libinput/xf86-input-libinput.changes
2015-06-09 08:50:23.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-input-libinput.new/xf86-input-libinput.changes
2015-08-01 11:37:12.000000000 +0200
@@ -1,0 +2,11 @@
+Sat Jul 25 08:05:49 UTC 2015 - [email protected]
+
+- Update to version 0.12.0:
+ + Support buttons > BTN_BACK on mice.
+ + Add a property for tap drag lock.
+- Drop autoconf, automake and libtool BuildRequires, also stop
+ running autoreconf before configure. They were needed in the past
+ but we do not carry any patches anymore.
+- Remove emtpy post/postun sections.
+
+-------------------------------------------------------------------
Old:
----
xf86-input-libinput-0.11.0.tar.bz2
New:
----
xf86-input-libinput-0.12.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-libinput.spec ++++++
--- /var/tmp/diff_new_pack.KNsPYL/_old 2015-08-01 11:37:13.000000000 +0200
+++ /var/tmp/diff_new_pack.KNsPYL/_new 2015-08-01 11:37:13.000000000 +0200
@@ -17,7 +17,7 @@
Name: xf86-input-libinput
-Version: 0.11.0
+Version: 0.12.0
Release: 0
Summary: Libinput driver for the Xorg X server
License: MIT
@@ -25,12 +25,9 @@
Url: http://xorg.freedesktop.org/
Source0:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
Source1: 90-libinput.conf
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake
-BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: pkgconfig(inputproto)
-BuildRequires: pkgconfig(libinput) >= 0.14.0
+BuildRequires: pkgconfig(libinput) >= 0.19.0
BuildRequires: pkgconfig(xorg-macros) >= 1.13
BuildRequires: pkgconfig(xorg-server) >= 1.7
BuildRequires: pkgconfig(xproto)
@@ -60,7 +57,6 @@
%setup -q
%build
-autoreconf -fi
%configure
make %{?_smp_mflags}
@@ -71,10 +67,6 @@
install -d %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
install -p -m 0644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/X11/xorg.conf.d/90-libinput.conf
-%post
-
-%postun
-
%files
%defattr(-,root,root)
%doc COPYING*
++++++ xf86-input-libinput-0.11.0.tar.bz2 -> xf86-input-libinput-0.12.0.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.11.0/ChangeLog
new/xf86-input-libinput-0.12.0/ChangeLog
--- old/xf86-input-libinput-0.11.0/ChangeLog 2015-06-05 05:41:08.000000000
+0200
+++ new/xf86-input-libinput-0.12.0/ChangeLog 2015-07-14 08:20:59.000000000
+0200
@@ -1,3 +1,30 @@
+commit 254b1f27a07f2372aa0c70674e8be5a02d068feb
+Author: Peter Hutterer <[email protected]>
+Date: Tue Jul 14 16:18:38 2015 +1000
+
+ xf86-input-libinput 0.12.0
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit bfedf7dbac7e92479629713c3f5622e4f19de1f4
+Author: Peter Hutterer <[email protected]>
+Date: Wed Jul 8 10:31:30 2015 +1000
+
+ Add a property for tap drag lock
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+ Reviewed-by: Hans de Goede <[email protected]>
+
+commit 9c5cf971439292661e1f3055ef882526baae6310
+Author: Peter Hutterer <[email protected]>
+Date: Mon Jun 15 10:17:20 2015 +1000
+
+ Support buttons > BTN_BACK on mice
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1230945
+
+ Signed-off-by: Peter Hutterer <[email protected]>
+
commit 449b496a3abd2860ada3a27a4d23efc28b87448d
Author: Peter Hutterer <[email protected]>
Date: Fri Jun 5 13:40:31 2015 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.11.0/configure
new/xf86-input-libinput-0.12.0/configure
--- old/xf86-input-libinput-0.11.0/configure 2015-06-05 05:40:02.000000000
+0200
+++ new/xf86-input-libinput-0.12.0/configure 2015-07-14 08:18:52.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.11.0.
+# Generated by GNU Autoconf 2.69 for xf86-input-libinput 0.12.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-input-libinput'
PACKAGE_TARNAME='xf86-input-libinput'
-PACKAGE_VERSION='0.11.0'
-PACKAGE_STRING='xf86-input-libinput 0.11.0'
+PACKAGE_VERSION='0.12.0'
+PACKAGE_STRING='xf86-input-libinput 0.12.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1351,7 +1351,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.11.0 to adapt to many kinds of
systems.
+\`configure' configures xf86-input-libinput 0.12.0 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1422,7 +1422,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-libinput 0.11.0:";;
+ short | recursive ) echo "Configuration of xf86-input-libinput 0.12.0:";;
esac
cat <<\_ACEOF
@@ -1548,7 +1548,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-libinput configure 0.11.0
+xf86-input-libinput configure 0.12.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1872,7 +1872,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.11.0, which was
+It was created by xf86-input-libinput $as_me 0.12.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2740,7 +2740,7 @@
# Define the identity of the package.
PACKAGE='xf86-input-libinput'
- VERSION='0.11.0'
+ VERSION='0.12.0'
cat >>confdefs.h <<_ACEOF
@@ -17884,12 +17884,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 >= 0.14.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libinput >= 0.14.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libinput >= 0.19.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 0.19.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 >= 0.14.0"
2>/dev/null`
+ pkg_cv_LIBINPUT_CFLAGS=`$PKG_CONFIG --cflags "libinput >= 0.19.0"
2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17901,12 +17901,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 >= 0.14.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libinput >= 0.14.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libinput >= 0.19.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libinput >= 0.19.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 >= 0.14.0" 2>/dev/null`
+ pkg_cv_LIBINPUT_LIBS=`$PKG_CONFIG --libs "libinput >= 0.19.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -17927,14 +17927,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 >= 0.14.0" 2>&1`
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libinput >= 0.19.0" 2>&1`
else
- LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libinput >= 0.14.0" 2>&1`
+ LIBINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libinput >= 0.19.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 >= 0.14.0) were not met:
+ as_fn_error $? "Package requirements (libinput >= 0.19.0) were not met:
$LIBINPUT_PKG_ERRORS
@@ -18527,7 +18527,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.11.0, which was
+This file was extended by xf86-input-libinput $as_me 0.12.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18593,7 +18593,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.11.0
+xf86-input-libinput config.status 0.12.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.11.0/configure.ac
new/xf86-input-libinput-0.12.0/configure.ac
--- old/xf86-input-libinput-0.11.0/configure.ac 2015-06-05 05:39:42.000000000
+0200
+++ new/xf86-input-libinput-0.12.0/configure.ac 2015-07-14 08:18:35.000000000
+0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-libinput],
- [0.11.0],
+ [0.12.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-libinput])
AC_CONFIG_SRCDIR([Makefile.am])
@@ -45,7 +45,7 @@
# 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 >= 0.14.0])
+PKG_CHECK_MODULES(LIBINPUT, [libinput >= 0.19.0])
# Define a configure option for an alternate input module directory
AC_ARG_WITH(xorg-module-dir,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xf86-input-libinput-0.11.0/include/libinput-properties.h
new/xf86-input-libinput-0.12.0/include/libinput-properties.h
--- old/xf86-input-libinput-0.11.0/include/libinput-properties.h
2015-04-23 08:45:34.000000000 +0200
+++ new/xf86-input-libinput-0.12.0/include/libinput-properties.h
2015-07-14 08:18:14.000000000 +0200
@@ -30,6 +30,12 @@
/* Tapping default enabled/disabled: BOOL, 1 value, read-only */
#define LIBINPUT_PROP_TAP_DEFAULT "libinput Tapping Enabled Default"
+/* Tap drag lock enabled/disabled: BOOL, 1 value */
+#define LIBINPUT_PROP_TAP_DRAG_LOCK "libinput Tapping Drag Lock Enabled"
+
+/* Tap drag lock default enabled/disabled: BOOL, 1 value */
+#define LIBINPUT_PROP_TAP_DRAG_LOCK_DEFAULT "libinput Tapping Drag Lock
Enabled Default"
+
/* Calibration matrix: FLOAT, 9 values of a 3x3 matrix, in rows */
#define LIBINPUT_PROP_CALIBRATION "libinput Calibration Matrix"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.11.0/man/libinput.man
new/xf86-input-libinput-0.12.0/man/libinput.man
--- old/xf86-input-libinput-0.11.0/man/libinput.man 2015-04-30
03:34:13.000000000 +0200
+++ new/xf86-input-libinput-0.12.0/man/libinput.man 2015-07-14
08:18:14.000000000 +0200
@@ -109,6 +109,12 @@
.TP 7
.BI "Option \*qTapping\*q \*q" bool \*q
Enables or disables tap-to-click behavior.
+.TP 7
+.BI "Option \*qTappingDragLock\*q \*q" bool \*q
+Enables or disables drag lock during tapping behavior. When enabled, a
+finger up during tap-and-drag will not immediately release the button. If
+the finger is set down again within the timeout, the draging process
+continues.
.PP
For all options, the options are only parsed if the device supports that
configuration option. For all options, the default value is the one used by
@@ -126,6 +132,9 @@
.BI "libinput Tapping Enabled"
1 boolean value (8 bit, 0 or 1). 1 enables tapping
.TP 7
+.BI "libinput Tapping Drag Lock Enabled"
+1 boolean value (8 bit, 0 or 1). 1 enables drag lock during tapping
+.TP 7
.BI "libinput Calibration Matrix"
9 32-bit float values, representing a 3x3 calibration matrix, order is row
1, row 2, row 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-libinput-0.11.0/src/libinput.c
new/xf86-input-libinput-0.12.0/src/libinput.c
--- old/xf86-input-libinput-0.11.0/src/libinput.c 2015-06-04
13:26:09.000000000 +0200
+++ new/xf86-input-libinput-0.12.0/src/libinput.c 2015-07-14
08:18:14.000000000 +0200
@@ -98,6 +98,7 @@
struct options {
BOOL tapping;
+ BOOL tap_drag_lock;
BOOL natural_scrolling;
BOOL left_handed;
BOOL middle_emulation;
@@ -262,6 +263,13 @@
"Failed to set Tapping to %d\n",
driver_data->options.tapping);
+ if (libinput_device_config_tap_get_finger_count(device) > 0 &&
+ libinput_device_config_tap_set_drag_lock_enabled(device,
+
driver_data->options.tap_drag_lock) != LIBINPUT_CONFIG_STATUS_SUCCESS)
+ xf86IDrvMsg(pInfo, X_ERROR,
+ "Failed to set Tapping DragLock to %d\n",
+ driver_data->options.tap_drag_lock);
+
if (libinput_device_config_calibration_has_matrix(device) &&
libinput_device_config_calibration_set_matrix(device,
driver_data->options.matrix) != LIBINPUT_CONFIG_STATUS_SUCCESS)
@@ -456,7 +464,7 @@
Atom btnlabels[MAX_BUTTONS];
Atom axislabels[TOUCHPAD_NUM_AXES];
- for (i = BTN_BACK; i >= BTN_SIDE; i--) {
+ for (i = BTN_JOYSTICK - 1; i >= BTN_SIDE; i--) {
if (libinput_device_pointer_has_button(driver_data->device, i))
{
nbuttons += i - BTN_SIDE + 1;
break;
@@ -1032,6 +1040,30 @@
return tap;
}
+static inline BOOL
+xf86libinput_parse_tap_drag_lock_option(InputInfoPtr pInfo,
+ struct libinput_device *device)
+{
+ BOOL drag_lock;
+
+ if (libinput_device_config_tap_get_finger_count(device) == 0)
+ return FALSE;
+
+ drag_lock = xf86SetBoolOption(pInfo->options,
+ "TappingDragLock",
+
libinput_device_config_tap_get_drag_lock_enabled(device));
+
+ if (libinput_device_config_tap_set_drag_lock_enabled(device, drag_lock)
!=
+ LIBINPUT_CONFIG_STATUS_SUCCESS) {
+ xf86IDrvMsg(pInfo, X_ERROR,
+ "Failed to set Tapping Drag Lock to %d\n",
+ drag_lock);
+ drag_lock =
libinput_device_config_tap_get_drag_lock_enabled(device);
+ }
+
+ return drag_lock;
+}
+
static inline double
xf86libinput_parse_accel_option(InputInfoPtr pInfo,
struct libinput_device *device)
@@ -1342,6 +1374,7 @@
/* libinput options */
options->tapping = xf86libinput_parse_tap_option(pInfo, device);
+ options->tap_drag_lock = xf86libinput_parse_tap_drag_lock_option(pInfo,
device);
options->speed = xf86libinput_parse_accel_option(pInfo, device);
options->natural_scrolling = xf86libinput_parse_natscroll_option(pInfo,
device);
options->sendevents = xf86libinput_parse_sendevents_option(pInfo,
device);
@@ -1523,6 +1556,8 @@
/* libinput-specific properties */
static Atom prop_tap;
static Atom prop_tap_default;
+static Atom prop_tap_drag_lock;
+static Atom prop_tap_drag_lock_default;
static Atom prop_calibration;
static Atom prop_calibration_default;
static Atom prop_accel;
@@ -1602,6 +1637,37 @@
}
static inline int
+LibinputSetPropertyTapDragLock(DeviceIntPtr dev,
+ Atom atom,
+ XIPropertyValuePtr val,
+ BOOL checkonly)
+{
+ InputInfoPtr pInfo = dev->public.devicePrivate;
+ struct xf86libinput *driver_data = pInfo->private;
+ struct libinput_device *device = driver_data->device;
+ BOOL* data;
+
+ if (val->format != 8 || val->size != 1 || val->type != XA_INTEGER)
+ return BadMatch;
+
+ data = (BOOL*)val->data;
+ if (checkonly) {
+ if (*data != 0 && *data != 1)
+ return BadValue;
+
+ if (!xf86libinput_check_device(dev, atom))
+ return BadMatch;
+
+ if (libinput_device_config_tap_get_finger_count(device) == 0)
+ return BadMatch;
+ } else {
+ driver_data->options.tap_drag_lock = *data;
+ }
+
+ return Success;
+}
+
+static inline int
LibinputSetPropertyCalibration(DeviceIntPtr dev,
Atom atom,
XIPropertyValuePtr val,
@@ -1930,6 +1996,8 @@
if (atom == prop_tap)
rc = LibinputSetPropertyTap(dev, atom, val, checkonly);
+ else if (atom == prop_tap_drag_lock)
+ rc = LibinputSetPropertyTapDragLock(dev, atom, val, checkonly);
else if (atom == prop_calibration)
rc = LibinputSetPropertyCalibration(dev, atom, val,
checkonly);
@@ -1957,6 +2025,7 @@
rc = LibinputSetPropertyMiddleEmulation(dev, atom, val,
checkonly);
else if (atom == prop_device || atom == prop_product_id ||
atom == prop_tap_default ||
+ atom == prop_tap_drag_lock_default ||
atom == prop_calibration_default ||
atom == prop_accel_default ||
atom == prop_natural_scroll_default ||
@@ -2025,6 +2094,30 @@
}
static void
+LibinputInitTapDragLockProperty(DeviceIntPtr dev,
+ struct xf86libinput *driver_data,
+ struct libinput_device *device)
+{
+ BOOL drag_lock = driver_data->options.tap_drag_lock;
+
+ if (libinput_device_config_tap_get_finger_count(device) == 0)
+ return;
+
+ prop_tap_drag_lock = LibinputMakeProperty(dev,
+ LIBINPUT_PROP_TAP_DRAG_LOCK,
+ XA_INTEGER, 8,
+ 1, &drag_lock);
+ if (!prop_tap_drag_lock)
+ return;
+
+ drag_lock = libinput_device_config_tap_get_default_enabled(device);
+ prop_tap_drag_lock_default = LibinputMakeProperty(dev,
+
LIBINPUT_PROP_TAP_DRAG_LOCK_DEFAULT,
+ XA_INTEGER, 8,
+ 1, &drag_lock);
+}
+
+static void
LibinputInitCalibrationProperty(DeviceIntPtr dev,
struct xf86libinput *driver_data,
struct libinput_device *device)
@@ -2383,6 +2476,7 @@
prop_float = XIGetKnownProperty("FLOAT");
LibinputInitTapProperty(dev, driver_data, device);
+ LibinputInitTapDragLockProperty(dev, driver_data, device);
LibinputInitCalibrationProperty(dev, driver_data, device);
LibinputInitAccelProperty(dev, driver_data, device);
LibinputInitNaturalScrollProperty(dev, driver_data, device);
