diff options
-rw-r--r-- | meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch | 40 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..0e38f7d8ec --- /dev/null +++ b/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 50a48a7bd8d65a165ce2aac4ba0c1e02bded04aa Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 30 Nov 2019 12:21:31 -0800 | ||
4 | Subject: [PATCH] Fix build on 32bit arches with 64bit time_t | ||
5 | |||
6 | time element is deprecated on new input_event structure in kernel's | ||
7 | input.h [1] | ||
8 | |||
9 | [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | plugins/devinput.c | 7 ++++++- | ||
14 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/plugins/devinput.c b/plugins/devinput.c | ||
17 | index d4d733a..feb4a61 100644 | ||
18 | --- a/plugins/devinput.c | ||
19 | +++ b/plugins/devinput.c | ||
20 | @@ -34,6 +34,11 @@ | ||
21 | #include <linux/uinput.h> | ||
22 | #include <sys/stat.h> | ||
23 | |||
24 | +#ifndef input_event_sec | ||
25 | +#define input_event_sec time.tv_sec | ||
26 | +#define input_event_usec time.tv_usec | ||
27 | +#endif | ||
28 | + | ||
29 | #ifndef EV_SYN | ||
30 | /* previous name */ | ||
31 | #define EV_SYN EV_RST | ||
32 | @@ -459,7 +464,7 @@ char* devinput_rec(struct ir_remote* remotes) | ||
33 | return 0; | ||
34 | } | ||
35 | |||
36 | - log_trace("time %ld.%06ld type %d code %d value %d", event.time.tv_sec, event.time.tv_usec, event.type, | ||
37 | + log_trace("time %ld.%06ld type %d code %d value %d", event.input_event_sec, event.input_event_usec, event.type, | ||
38 | event.code, event.value); | ||
39 | |||
40 | value = (unsigned)event.value; | ||
diff --git a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb index b13163debb..606caee892 100644 --- a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb +++ b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb | |||
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
13 | 13 | ||
14 | SRC_URI = "http://prdownloads.sourceforge.net/lirc/lirc-${PV}.tar.bz2 \ | 14 | SRC_URI = "http://prdownloads.sourceforge.net/lirc/lirc-${PV}.tar.bz2 \ |
15 | file://pollfd.patch \ | 15 | file://pollfd.patch \ |
16 | file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ | ||
16 | file://lircd.service \ | 17 | file://lircd.service \ |
17 | file://lircd.init \ | 18 | file://lircd.init \ |
18 | file://lircexec.init \ | 19 | file://lircexec.init \ |