[packages/xorg-driver-input-libinput] - up to 0.11.0
arekm
arekm at pld-linux.org
Fri Jun 5 08:51:06 CEST 2015
commit b53ffd4162b9a5d75d510b244db41a3d7d920a17
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Jun 5 08:51:00 2015 +0200
- up to 0.11.0
...-scroll-methods-default-scroll-button-pro.patch | 32 --------
...it-abs-axes-if-we-don-t-have-acceleration.patch | 73 -----------------
...-unaccelerated-valuator-ValuatorMask-feat.patch | 91 ----------------------
xorg-driver-input-libinput.spec | 14 +---
4 files changed, 3 insertions(+), 207 deletions(-)
---
diff --git a/xorg-driver-input-libinput.spec b/xorg-driver-input-libinput.spec
index 4c8666a..ac106a0 100644
--- a/xorg-driver-input-libinput.spec
+++ b/xorg-driver-input-libinput.spec
@@ -1,18 +1,13 @@
Summary: A libinput-based X.org input driver
Summary(pl.UTF-8): Sterownik wejściowy X.org oparty na libinput
Name: xorg-driver-input-libinput
-Version: 0.10.0
-Release: 2
+Version: 0.11.0
+Release: 1
License: MIT
Group: X11/Applications
Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-input-libinput-%{version}.tar.bz2
-# Source0-md5: e0d6fc2aceba154e57501d36e361d3f7
+# Source0-md5: 710f0a2ecb6a3aefee80aba0fbbe6e18
Source1: 90-libinput.conf
-# Source1-md5: xyz
-Patch0: 0001-Only-init-abs-axes-if-we-don-t-have-acceleration.patch
-# fedora Bug 1208992 - Mouse cursor doesn't move when moving the physical mouse slowly
-Patch1: 0001-Use-the-new-unaccelerated-valuator-ValuatorMask-feat.patch
-Patch2: 0001-Fix-missing-scroll-methods-default-scroll-button-pro.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -52,9 +47,6 @@ Plik nagłówkowy sterownika libinput.
%prep
%setup -q -n xf86-input-libinput-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
diff --git a/0001-Fix-missing-scroll-methods-default-scroll-button-pro.patch b/0001-Fix-missing-scroll-methods-default-scroll-button-pro.patch
deleted file mode 100644
index 7cca722..0000000
--- a/0001-Fix-missing-scroll-methods-default-scroll-button-pro.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d4e0b5420ff2af2e790f12d10996f93ec6066b4a Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Mon, 1 Jun 2015 11:41:09 +1000
-Subject: [PATCH xf86-input-libinput] Fix missing scroll methods default/scroll
- button property
-
-Even if no scroll method is enabled by default, we still want those
-properties.
-
-Introduced in 8d4e03570c.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
- src/libinput.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/libinput.c b/src/libinput.c
-index 3cc4426..595b177 100644
---- a/src/libinput.c
-+++ b/src/libinput.c
-@@ -2242,9 +2242,6 @@ LibinputInitScrollMethodsProperty(DeviceIntPtr dev,
- return;
-
- scroll_methods = libinput_device_config_scroll_get_default_method(device);
-- if (scroll_methods == LIBINPUT_CONFIG_SCROLL_NO_SCROLL)
-- return;
--
- if (scroll_methods & LIBINPUT_CONFIG_SCROLL_2FG)
- methods[0] = TRUE;
- if (scroll_methods & LIBINPUT_CONFIG_SCROLL_EDGE)
---
-2.4.1
diff --git a/0001-Only-init-abs-axes-if-we-don-t-have-acceleration.patch b/0001-Only-init-abs-axes-if-we-don-t-have-acceleration.patch
deleted file mode 100644
index e1103d2..0000000
--- a/0001-Only-init-abs-axes-if-we-don-t-have-acceleration.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 3d6afca975e5c54d458974ca2e9ada3df209587c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Wed, 20 May 2015 13:22:45 +1000
-Subject: [PATCH xf86-input-libinput] Only init abs axes if we don't have
- acceleration
-
-A lot of devices (mainly MS input devices) have abs axes on top of the
-relative axes. Those axes are usually mute but with the current code we set up
-absolute axes for those devices. Relative events are then scaled by the server
-which makes the device appear slow.
-
-As an immediate fix always prefer relative axes and only set up absolute axes
-if the device has a calibration matrix but no pointer acceleration.
-This may mess up other devices where the relative axes are dead, we'll deal
-with this when it comes.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=90322
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Reviewed-by: Hans de Goede <hdegoede at redhat.com>
----
- src/libinput.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/src/libinput.c b/src/libinput.c
-index 3e54529..c8669fc 100644
---- a/src/libinput.c
-+++ b/src/libinput.c
-@@ -85,6 +85,8 @@ struct xf86libinput {
- double y_remainder;
- } scale;
-
-+ BOOL has_abs;
-+
- ValuatorMask *valuators;
-
- struct options {
-@@ -526,6 +528,8 @@ xf86libinput_init_pointer_absolute(InputInfoPtr pInfo)
- SetScrollValuator(dev, 2, SCROLL_TYPE_HORIZONTAL, driver_data->scroll.hdist, 0);
- SetScrollValuator(dev, 3, SCROLL_TYPE_VERTICAL, driver_data->scroll.vdist, 0);
-
-+ driver_data->has_abs = TRUE;
-+
- return Success;
- }
- static void
-@@ -636,7 +640,8 @@ xf86libinput_init(DeviceIntPtr dev)
- if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_KEYBOARD))
- xf86libinput_init_keyboard(pInfo);
- if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_POINTER)) {
-- if (libinput_device_config_calibration_has_matrix(device))
-+ if (libinput_device_config_calibration_has_matrix(device) &&
-+ !libinput_device_config_accel_is_available(device))
- xf86libinput_init_pointer_absolute(pInfo);
- else
- xf86libinput_init_pointer(pInfo);
-@@ -709,6 +714,13 @@ xf86libinput_handle_absmotion(InputInfoPtr pInfo, struct libinput_event_pointer
- ValuatorMask *mask = driver_data->valuators;
- double x, y;
-
-+ if (!driver_data->has_abs) {
-+ xf86IDrvMsg(pInfo, X_ERROR,
-+ "Discarding absolute event from relative device. "
-+ "Please file a bug\n");
-+ return;
-+ }
-+
- x = libinput_event_pointer_get_absolute_x_transformed(event, TOUCH_AXIS_MAX);
- y = libinput_event_pointer_get_absolute_y_transformed(event, TOUCH_AXIS_MAX);
-
---
-2.3.5
-
diff --git a/0001-Use-the-new-unaccelerated-valuator-ValuatorMask-feat.patch b/0001-Use-the-new-unaccelerated-valuator-ValuatorMask-feat.patch
deleted file mode 100644
index b2dacb5..0000000
--- a/0001-Use-the-new-unaccelerated-valuator-ValuatorMask-feat.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 19c91044e44dd31deaeb638a919c64e9a9182448 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Tue, 5 May 2015 14:17:10 +1000
-Subject: [PATCH xf86-input-libinput] Use the new unaccelerated valuator
- ValuatorMask features
-
-SDL Games like openarena rely on relative input that's handled by the DGA code
-in the server. That code casts the driver's input data to int and sends it to
-the client. libinput does pointer acceleration for us, so sending any deltas
-of less than 1 (likely for slow movements) ends up being 0.
-
-Use the new ValuatorMask accelerated/unaccelerated values to pass the
-unaccelerated values along, the server can then decide what to do with it.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Reviewed-by: Hans de Goede <hdegoede at redhat.com>
----
- src/libinput.c | 27 ++++++++++++++++++++++++++-
- 1 file changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/src/libinput.c b/src/libinput.c
-index c8669fc..3cc4426 100644
---- a/src/libinput.c
-+++ b/src/libinput.c
-@@ -47,6 +47,12 @@
- #define XI86_SERVER_FD 0x20
- #endif
-
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 1000 + GET_ABI_MINOR(ABI_XINPUT_VERSION) > 21000
-+#define HAVE_VMASK_UNACCEL 1
-+#else
-+#undef HAVE_VMASK_UNACCEL
-+#endif
-+
- #define TOUCHPAD_NUM_AXES 4 /* x, y, hscroll, vscroll */
- #define TOUCH_MAX_SLOTS 15
- #define XORG_KEYCODE_OFFSET 8
-@@ -88,6 +94,7 @@ struct xf86libinput {
- BOOL has_abs;
-
- ValuatorMask *valuators;
-+ ValuatorMask *valuators_unaccelerated;
-
- struct options {
- BOOL tapping;
-@@ -700,9 +707,21 @@ xf86libinput_handle_motion(InputInfoPtr pInfo, struct libinput_event_pointer *ev
- y = libinput_event_pointer_get_dy(event);
-
- valuator_mask_zero(mask);
-+
-+#if HAVE_VMASK_UNACCEL
-+ {
-+ double ux, uy;
-+
-+ ux = libinput_event_pointer_get_dx_unaccelerated(event);
-+ uy = libinput_event_pointer_get_dy_unaccelerated(event);
-+
-+ 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);
- }
-
-@@ -1363,6 +1382,10 @@ xf86libinput_pre_init(InputDriverPtr drv,
- if (!driver_data->valuators)
- goto fail;
-
-+ driver_data->valuators_unaccelerated = valuator_mask_new(2);
-+ if (!driver_data->valuators_unaccelerated)
-+ goto fail;
-+
- driver_data->scroll.vdist = 15;
- driver_data->scroll.hdist = 15;
-
-@@ -1434,6 +1457,8 @@ fail:
- fd_pop(&driver_context, pInfo->fd);
- if (driver_data->valuators)
- valuator_mask_free(&driver_data->valuators);
-+ if (driver_data->valuators_unaccelerated)
-+ valuator_mask_free(&driver_data->valuators_unaccelerated);
- free(path);
- free(driver_data);
- return BadValue;
---
-2.4.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-input-libinput.git/commitdiff/b53ffd4162b9a5d75d510b244db41a3d7d920a17
More information about the pld-cvs-commit
mailing list