mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 22:35:25 +01:00
evtest: upgrade 1.34 -> 1.35
0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch refreshed for new version. add_missing_limits_h_include.patch removed since it's included in 1.35. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
e73f940f9c
commit
6d9f82e5ab
|
|
@ -1,4 +1,4 @@
|
||||||
From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001
|
From 490f5b6cd788692d989f07180a5714c76872911e Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Sat, 30 Nov 2019 11:58:58 -0800
|
Date: Sat, 30 Nov 2019 11:58:58 -0800
|
||||||
Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
|
Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
|
||||||
|
|
@ -10,17 +10,18 @@ input.h [1]
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6]
|
Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6]
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
evtest.c | 7 ++++++-
|
evtest.c | 5 +++++
|
||||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --git a/evtest.c b/evtest.c
|
diff --git a/evtest.c b/evtest.c
|
||||||
index 548c203..93063cd 100644
|
index ba7a161..8fc2e5a 100644
|
||||||
--- a/evtest.c
|
--- a/evtest.c
|
||||||
+++ b/evtest.c
|
+++ b/evtest.c
|
||||||
@@ -61,6 +61,11 @@
|
@@ -63,6 +63,11 @@
|
||||||
#include <sys/types.h>
|
#define input_event_usec time.tv_usec
|
||||||
#include <unistd.h>
|
#endif
|
||||||
|
|
||||||
+#ifndef input_event_sec
|
+#ifndef input_event_sec
|
||||||
+#define input_event_sec time.tv_sec
|
+#define input_event_sec time.tv_sec
|
||||||
|
|
@ -30,12 +31,3 @@ index 548c203..93063cd 100644
|
||||||
#define BITS_PER_LONG (sizeof(long) * 8)
|
#define BITS_PER_LONG (sizeof(long) * 8)
|
||||||
#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
|
#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
|
||||||
#define OFF(x) ((x)%BITS_PER_LONG)
|
#define OFF(x) ((x)%BITS_PER_LONG)
|
||||||
@@ -1140,7 +1145,7 @@ static int print_events(int fd)
|
|
||||||
type = ev[i].type;
|
|
||||||
code = ev[i].code;
|
|
||||||
|
|
||||||
- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec);
|
|
||||||
+ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_usec);
|
|
||||||
|
|
||||||
if (type == EV_SYN) {
|
|
||||||
if (code == SYN_MT_REPORT)
|
|
||||||
|
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
From 5eb4ab1c139ea38ebe6bb4acba08b09ee7d77d3c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
Date: Sun, 18 Aug 2019 10:01:06 +0300
|
|
||||||
Subject: Add missing limits.h include
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Fixes build with musl libc that does not include limits.h indirectly via
|
|
||||||
other headers.
|
|
||||||
|
|
||||||
evtest.c: In function ‘scan_devices’:
|
|
||||||
evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean INT8_MAX’?
|
|
||||||
char fname[PATH_MAX];
|
|
||||||
^~~~~~~~
|
|
||||||
|
|
||||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
||||||
---
|
|
||||||
evtest.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/evtest.c b/evtest.c
|
|
||||||
index 37d4f85..548c203 100644
|
|
||||||
--- a/evtest.c
|
|
||||||
+++ b/evtest.c
|
|
||||||
@@ -56,6 +56,7 @@
|
|
||||||
#include <getopt.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <signal.h>
|
|
||||||
+#include <limits.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
--
|
|
||||||
cgit v1.1
|
|
||||||
|
|
||||||
|
|
@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||||
|
|
||||||
DEPENDS = "libxml2"
|
DEPENDS = "libxml2"
|
||||||
|
|
||||||
SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69"
|
SRCREV = "da347a8f88d2e5729dd12d61ee9743f902065b55"
|
||||||
SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https;branch=master \
|
SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https;branch=master \
|
||||||
file://add_missing_limits_h_include.patch \
|
|
||||||
file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
|
file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user