diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-06-11 17:24:02 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-11 17:24:02 +0200 |
| commit | 4b8a395fd20c54fbc0983b97854b441b47727864 (patch) | |
| tree | 32bf92efd7cfc0aa57c2698b68e0ce663f18ed6b /package/libinput | |
| parent | 40bfd629cf87c622bc55675d1f1aa47c694cd50e (diff) | |
libinput: bump version
And remove upstreamed patches.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libinput')
3 files changed, 1 insertions, 64 deletions
diff --git a/package/libinput/libinput-0001-libinput-evdev.c-use-correct-fallback-value-for-KEY_.patch b/package/libinput/libinput-0001-libinput-evdev.c-use-correct-fallback-value-for-KEY_.patch deleted file mode 100644 index 6eb9d8dc4..000000000 --- a/package/libinput/libinput-0001-libinput-evdev.c-use-correct-fallback-value-for-KEY_.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d9b39d4e517a08350800cf253f7434cf4b865b81 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <peter@korsgaard.com> -Date: Mon, 2 Jun 2014 23:02:21 +0200 -Subject: [PATCH 1/2] libinput: evdev.c: use correct fallback value for - KEY_LIGHTS_TOGGLE - -The kernel defines KEY_LIGHTS_TOGGLE as 0x21e, not 0x160 (which is KEY_OK). - -Signed-off-by: Peter Korsgaard <peter@korsgaard.com> ---- - src/evdev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/evdev.c b/src/evdev.c -index ed5749e..3053764 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -42,7 +42,7 @@ - #define DEFAULT_AXIS_STEP_DISTANCE li_fixed_from_int(10) - - #ifndef KEY_LIGHTS_TOGGLE --#define KEY_LIGHTS_TOGGLE 0x160 -+#define KEY_LIGHTS_TOGGLE 0x21e - #endif - - void --- -2.0.0.rc2 - diff --git a/package/libinput/libinput-0002-libinput-evdev.c-provide-fallback-definition-for-KEY.patch b/package/libinput/libinput-0002-libinput-evdev.c-provide-fallback-definition-for-KEY.patch deleted file mode 100644 index 094179611..000000000 --- a/package/libinput/libinput-0002-libinput-evdev.c-provide-fallback-definition-for-KEY.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1e2ea4883175fe3eecee95d81d1f94f22299e518 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <peter@korsgaard.com> -Date: Mon, 2 Jun 2014 23:04:33 +0200 -Subject: [PATCH 2/2] libinput: evdev.c: provide fallback definition for - KEY_MICMUTE - -KEY_MICMUTE was added relatively recently (3.1 with 33009557bd: Add -KEY_MICMUTE and enable it on Lenovo X220), so provide a fallback definition -similar to how we do it for KEY_LIGHTS_TOGGLE to fix compilation with older -toolchains. - -Signed-off-by: Peter Korsgaard <peter@korsgaard.com> ---- - src/evdev.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/evdev.c b/src/evdev.c -index 3053764..d32ece3 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -41,6 +41,10 @@ - - #define DEFAULT_AXIS_STEP_DISTANCE li_fixed_from_int(10) - -+#ifndef KEY_MICMUTE -+#define KEY_MICMUTE 0xf8 -+#endif -+ - #ifndef KEY_LIGHTS_TOGGLE - #define KEY_LIGHTS_TOGGLE 0x21e - #endif --- -2.0.0.rc2 - diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 7c3e5e8bf..b52101af9 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 0.2.0 +LIBINPUT_VERSION = 0.3.0 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_LICENSE = MIT |