Commit 4b8a395f authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

libinput: bump version



And remove upstreamed patches.

Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 40bfd629
Loading
Loading
Loading
Loading
+0 −29
Original line number Diff line number Diff line
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
+0 −34
Original line number Diff line number Diff line
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
+1 −1
Original line number Diff line number Diff line
@@ -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