rpms/libinput
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix patches from -3, they got corrupted somehow

Browse Source
This commit is contained in:
Peter Hutterer 2016-02-04 14:54:39 +10:00
parent 6fadeedb9e
commit 601a3b6f50
3 changed files with 91 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
0001-evdev-disable-the-mode-button-on-the-Cyborg-RAT-5.patch
View File

@ -306,3 +306,4 @@ index 5b07726..8bff192 100644
IMPORT{builtin}="hwdb 'libinput:name:$attr{name}:$attr{[dmi/id]modalias}'" IMPORT{builtin}="hwdb 'libinput:name:$attr{name}:$attr{[dmi/id]modalias}'"
-- --
2.5.0 2.5.0

20
0001-touchpad-drop-motion-hysteresis-by-default.patch
View File

@ -1,4 +1,4 @@
From 6e0553ab5553d63fa737c1739cfa86fbeee9f641 Mon Sep 17 00:00:00 2001 From c6381801cf4dcc29ac13b6f52938f9e4a5f0b219 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net> From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 29 Jan 2016 16:25:31 +1000 Date: Fri, 29 Jan 2016 16:25:31 +1000
Subject: [PATCH libinput] touchpad: drop motion hysteresis by default Subject: [PATCH libinput] touchpad: drop motion hysteresis by default
@ -19,6 +19,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=93503
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
(cherry picked from commit 6e0553ab5553d63fa737c1739cfa86fbeee9f641)
--- ---
src/evdev-mt-touchpad.c | 23 ++++++++++++++++++----- src/evdev-mt-touchpad.c | 23 ++++++++++++++++++-----
src/evdev.c | 1 + src/evdev.c | 1 +
@ -27,10 +28,10 @@ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
4 files changed, 23 insertions(+), 5 deletions(-) 4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index f249116..0f72807 100644 index db8aa1d..23b7419 100644
--- a/src/evdev-mt-touchpad.c --- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c
@@ -1951,13 +1951,29 @@ tp_init_default_resolution(struct tp_dispatch *tp, @@ -1940,13 +1940,29 @@ tp_init_default_resolution(struct tp_dispatch *tp,
return 0; return 0;
} }
@ -61,7 +62,7 @@ index f249116..0f72807 100644
tp->base.interface = &tp_interface; tp->base.interface = &tp_interface;
tp->device = device; tp->device = device;
@@ -1971,8 +1987,6 @@ tp_init(struct tp_dispatch *tp, @@ -1960,8 +1976,6 @@ tp_init(struct tp_dispatch *tp,
if (tp_init_slots(tp, device) != 0) if (tp_init_slots(tp, device) != 0)
return -1; return -1;
@ -70,7 +71,7 @@ index f249116..0f72807 100644
width = device->abs.dimensions.x; width = device->abs.dimensions.x;
height = device->abs.dimensions.y; height = device->abs.dimensions.y;
diagonal = sqrt(width*width + height*height); diagonal = sqrt(width*width + height*height);
@@ -1981,8 +1995,7 @@ tp_init(struct tp_dispatch *tp, @@ -1970,8 +1984,7 @@ tp_init(struct tp_dispatch *tp,
EV_ABS, EV_ABS,
ABS_MT_DISTANCE); ABS_MT_DISTANCE);
@ -81,10 +82,10 @@ index f249116..0f72807 100644
if (tp_init_accel(tp, diagonal) != 0) if (tp_init_accel(tp, diagonal) != 0)
return -1; return -1;
diff --git a/src/evdev.c b/src/evdev.c diff --git a/src/evdev.c b/src/evdev.c
index 66673a8..473ff63 100644 index 7448103..281a2a0 100644
--- a/src/evdev.c --- a/src/evdev.c
+++ b/src/evdev.c +++ b/src/evdev.c
@@ -1678,6 +1678,7 @@ evdev_read_model_flags(struct evdev_device *device) @@ -1664,6 +1664,7 @@ evdev_read_model_flags(struct evdev_device *device)
{ "LIBINPUT_MODEL_ELANTECH_TOUCHPAD", EVDEV_MODEL_ELANTECH_TOUCHPAD }, { "LIBINPUT_MODEL_ELANTECH_TOUCHPAD", EVDEV_MODEL_ELANTECH_TOUCHPAD },
{ "LIBINPUT_MODEL_APPLE_INTERNAL_KEYBOARD", EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD }, { "LIBINPUT_MODEL_APPLE_INTERNAL_KEYBOARD", EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD },
{ "LIBINPUT_MODEL_CYBORG_RAT", EVDEV_MODEL_CYBORG_RAT }, { "LIBINPUT_MODEL_CYBORG_RAT", EVDEV_MODEL_CYBORG_RAT },
@ -93,10 +94,10 @@ index 66673a8..473ff63 100644
}; };
const struct model_map *m = model_map; const struct model_map *m = model_map;
diff --git a/src/evdev.h b/src/evdev.h diff --git a/src/evdev.h b/src/evdev.h
index 8b567a8..b164af8 100644 index 560559a..96bf621 100644
--- a/src/evdev.h --- a/src/evdev.h
+++ b/src/evdev.h +++ b/src/evdev.h
@@ -111,6 +111,7 @@ enum evdev_device_model { @@ -110,6 +110,7 @@ enum evdev_device_model {
EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12), EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12),
EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD = (1 << 13), EVDEV_MODEL_APPLE_INTERNAL_KEYBOARD = (1 << 13),
EVDEV_MODEL_CYBORG_RAT = (1 << 14), EVDEV_MODEL_CYBORG_RAT = (1 << 14),
@ -120,3 +121,4 @@ index fa668d6..f23a7f9 100644
########################################## ##########################################
-- --
2.5.0 2.5.0

5
libinput.spec
View File

@ -5,7 +5,7 @@
Name: libinput Name: libinput
Version: 1.1.5 Version: 1.1.5
Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Summary: Input device library Summary: Input device library
License: MIT License: MIT
@ -100,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%changelog %changelog
* Thu Feb 04 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.1.5-4
- Fix patches from -3, they got corrupted somehow
* Thu Feb 04 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.1.5-3 * Thu Feb 04 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.1.5-3
- Disable the mode button on the Cyborg RAT 5 - Disable the mode button on the Cyborg RAT 5
- Drop touchpad motion hysteresis by default - Drop touchpad motion hysteresis by default