aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2020-01-15 20:42:36 +0100
committerHanspeter Portner <dev@open-music-kontrollers.ch>2020-01-15 20:42:36 +0100
commit6dc8b138837f6217d898c2d3a4be1b341cb24889 (patch)
tree4ce46cb989815edcdf431b1a391e9b80a957e491
parente7d28dd34687a815e893ae7e0a228f378d4efc86 (diff)
downloadd2tk-6dc8b138837f6217d898c2d3a4be1b341cb24889.tar.xz
meson: add define for libinput >= 1.15.0.
-rw-r--r--VERSION2
-rw-r--r--d2tk/config.h.in1
-rw-r--r--meson.build5
-rw-r--r--src/frontend_fbdev.c3
4 files changed, 10 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index cd63bdd..bfac85b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.949
+0.1.951
diff --git a/d2tk/config.h.in b/d2tk/config.h.in
index 45c087a..0488566 100644
--- a/d2tk/config.h.in
+++ b/d2tk/config.h.in
@@ -1,2 +1,3 @@
#define D2TK_PTY @D2TK_PTY@
#define D2TK_EVDEV @D2TK_EVDEV@
+#define D2TK_INPUT_1_15 @D2TK_INPUT_1_15@
diff --git a/meson.build b/meson.build
index 764516a..cf79757 100644
--- a/meson.build
+++ b/meson.build
@@ -105,6 +105,11 @@ else
conf_data.set('D2TK_EVDEV', 0)
endif
+if input_dep.found() and input_dep.version().version_compare('>=1.15.0')
+ conf_data.set('D2TK_INPUT_1_15', 1)
+else
+ conf_data.set('D2TK_INPUT_1_15', 0)
+endif
bin_srcs = [
join_paths('example', 'example.c')
diff --git a/src/frontend_fbdev.c b/src/frontend_fbdev.c
index e63ecff..e5121ee 100644
--- a/src/frontend_fbdev.c
+++ b/src/frontend_fbdev.c
@@ -574,6 +574,9 @@ d2tk_fbdev_step(d2tk_fbdev_t *fbdev)
case LIBINPUT_EVENT_TABLET_PAD_BUTTON:
case LIBINPUT_EVENT_TABLET_PAD_RING:
case LIBINPUT_EVENT_TABLET_PAD_STRIP:
+#if D2TK_INPUT_1_15
+ case LIBINPUT_EVENT_TABLET_PAD_KEY:
+#endif
{
struct libinput_event_tablet_pad *evtp =
libinput_event_get_tablet_pad_event(ev);