summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland
diff options
context:
space:
mode:
authorPierre-Jean Texier via Openembedded-core <openembedded-core@lists.openembedded.org>2020-02-10 22:25:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-14 13:07:23 +0000
commit0b24dd23fba3816a69cc2b6ce8a0aeb749e2928b (patch)
treef9235d567ffc3352afd3e2fe4967469b59f26764 /meta/recipes-graphics/wayland
parent2fd5bda2b3780507d91ee392283df55ea918cc7f (diff)
downloadpoky-0b24dd23fba3816a69cc2b6ce8a0aeb749e2928b.tar.gz
mtdev: upgrade 1.1.5 -> 1.1.6
Also remove patch which have been merged upstream (From OE-Core rev: c48e2f4e93a5aae1c4dec1511297c88f494bcc5d) Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r--meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch77
-rw-r--r--meta/recipes-graphics/wayland/mtdev_1.1.6.bb (renamed from meta/recipes-graphics/wayland/mtdev_1.1.5.bb)8
2 files changed, 3 insertions, 82 deletions
diff --git a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch b/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch
deleted file mode 100644
index a0cebe5283..0000000000
--- a/meta/recipes-graphics/wayland/mtdev/0001-adjust-for-64bit-time_t-for-32bit-architectures.patch
+++ /dev/null
@@ -1,77 +0,0 @@
1From af75e8ee3d12a493b758421b2feed0351fdcbbf0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 23 Nov 2019 13:44:32 -0800
4Subject: [PATCH] adjust for 64bit time_t for 32bit architectures
5
6libc that has support for 32 bit applications to use 64 bit
7time_t supplies __USE_TIME_BITS64 define [1]
8
9[1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 src/core.c | 8 +++++++-
16 test/mtdev-test.c | 10 ++++++++--
17 2 files changed, 15 insertions(+), 3 deletions(-)
18
19diff --git a/src/core.c b/src/core.c
20index 87ef420..0d91c0b 100644
21--- a/src/core.c
22+++ b/src/core.c
23@@ -31,6 +31,11 @@
24 #include "evbuf.h"
25 #include "match.h"
26
27+#ifndef input_event_sec
28+#define input_event_sec time.tv_sec
29+#define input_event_usec time.tv_usec
30+#endif
31+
32 static inline int istouch(const struct mtdev_slot *data,
33 const struct mtdev *dev)
34 {
35@@ -251,7 +256,8 @@ static void push_slot_changes(struct mtdev_state *state,
36 count++;
37 if (!count)
38 return;
39- ev.time = syn->time;
40+ ev.input_event_sec = syn->input_event_sec;
41+ ev.input_event_usec = syn->input_event_usec;
42 ev.type = EV_ABS;
43 ev.code = ABS_MT_SLOT;
44 ev.value = slot;
45diff --git a/test/mtdev-test.c b/test/mtdev-test.c
46index 1b3e4f2..773f86a 100644
47--- a/test/mtdev-test.c
48+++ b/test/mtdev-test.c
49@@ -30,9 +30,15 @@
50 #include <stdio.h>
51 #include <unistd.h>
52 #include <fcntl.h>
53+#include <stdint.h>
54+
55+#ifndef input_event_sec
56+#define input_event_sec time.tv_sec
57+#define input_event_usec time.tv_usec
58+#endif
59
60 /* year-proof millisecond event time */
61-typedef __u64 mstime_t;
62+typedef uint64_t mstime_t;
63
64 static int use_event(const struct input_event *ev)
65 {
66@@ -47,7 +53,7 @@ static void print_event(const struct input_event *ev)
67 {
68 static const mstime_t ms = 1000;
69 static int slot;
70- mstime_t evtime = ev->time.tv_usec / ms + ev->time.tv_sec * ms;
71+ mstime_t evtime = ev->input_event_usec / ms + ev->input_event_sec * ms;
72 if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT)
73 slot = ev->value;
74 fprintf(stderr, "%012llx %02d %01d %04x %d\n",
75--
762.24.0
77
diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb
index aa8bb69966..7c1cb5e4ec 100644
--- a/meta/recipes-graphics/wayland/mtdev_1.1.5.bb
+++ b/meta/recipes-graphics/wayland/mtdev_1.1.6.bb
@@ -11,10 +11,8 @@ SECTION = "libs"
11LICENSE = "MIT" 11LICENSE = "MIT"
12LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" 12LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6"
13 13
14SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2 \ 14SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2"
15 file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \ 15SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249"
16" 16SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0"
17SRC_URI[md5sum] = "52c9610b6002f71d1642dc1a1cca5ec1"
18SRC_URI[sha256sum] = "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f"
19 17
20inherit autotools pkgconfig 18inherit autotools pkgconfig