diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-04-27 14:54:03 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-04-27 15:52:58 -0700 |
| commit | 1e65c4b7e3b493bddc19d64ff3d9a73206f69ccb (patch) | |
| tree | ffdb537f063e8027fb623828eb4a0ef2b199c0b0 | |
| parent | 6594961f6376b8d4ff501da3167d66096a722ea4 (diff) | |
libevdev: fix compilation with old kernels
Fixes compilation for 4.14 targets.
Upstream backport.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
| -rw-r--r-- | libs/libevdev/Makefile | 2 | ||||
| -rw-r--r-- | libs/libevdev/patches/010-libevdev-events-fix-compilation-with-older-kernels.patch | 49 |
2 files changed, 50 insertions, 1 deletions
diff --git a/libs/libevdev/Makefile b/libs/libevdev/Makefile index a5f620c51..6014d11d8 100644 --- a/libs/libevdev/Makefile +++ b/libs/libevdev/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libevdev PKG_VERSION:=1.9.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libevdev/ diff --git a/libs/libevdev/patches/010-libevdev-events-fix-compilation-with-older-kernels.patch b/libs/libevdev/patches/010-libevdev-events-fix-compilation-with-older-kernels.patch new file mode 100644 index 000000000..c890936d4 --- /dev/null +++ b/libs/libevdev/patches/010-libevdev-events-fix-compilation-with-older-kernels.patch @@ -0,0 +1,49 @@ +From e7a2927d5e44209ff61405c9beb3d188eeedc3f6 Mon Sep 17 00:00:00 2001 +From: Rosen Penev <rosenp@gmail.com> +Date: Sun, 26 Apr 2020 20:27:58 -0700 +Subject: [PATCH] libevdev-events: fix compilation with older kernels + +input_event_(u)sec was introduced in kernel 4.16. Older kernels do not +have this. + +Signed-off-by: Rosen Penev <rosenp@gmail.com> +--- + tools/libevdev-events.c | 5 +++++ + tools/mouse-dpi-tool.c | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/tools/libevdev-events.c b/tools/libevdev-events.c +index 547513e..e5940c9 100644 +--- a/tools/libevdev-events.c ++++ b/tools/libevdev-events.c +@@ -33,6 +33,11 @@ + + #include "libevdev/libevdev.h" + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + static void + print_abs_bits(struct libevdev *dev, int axis) + { +diff --git a/tools/mouse-dpi-tool.c b/tools/mouse-dpi-tool.c +index 9961f3a..c4830e7 100644 +--- a/tools/mouse-dpi-tool.c ++++ b/tools/mouse-dpi-tool.c +@@ -37,6 +37,11 @@ + + #include "libevdev/libevdev.h" + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #define min(a, b) (((a) < (b)) ? (a) : (b)) + #define max(a, b) (((a) > (b)) ? (a) : (b)) + +-- +2.25.3 + |