From b1d6180442412778564f5c7e81ae23c87d19ffa7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 13 Jun 2022 23:21:37 +0200 Subject: [PATCH] package/evtest: bump to version 1.35 - Drop patches (already in version) - host-pkgconf is not needed since https://cgit.freedesktop.org/evtest/commit/?id=2cebc0ab5c36c4f81d35677c46b245de849ed062 - Update indentation in hash file (two spaces) https://lists.freedesktop.org/archives/input-tools/2022-May/001578.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-Add-missing-limits.h-include.patch | 38 --------------- ...ld-on-32bit-arches-with-64bit-time_t.patch | 46 ------------------- package/evtest/evtest.hash | 4 +- package/evtest/evtest.mk | 3 +- 4 files changed, 3 insertions(+), 88 deletions(-) delete mode 100644 package/evtest/0001-Add-missing-limits.h-include.patch delete mode 100644 package/evtest/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch diff --git a/package/evtest/0001-Add-missing-limits.h-include.patch b/package/evtest/0001-Add-missing-limits.h-include.patch deleted file mode 100644 index 6c7fc90482..0000000000 --- a/package/evtest/0001-Add-missing-limits.h-include.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7d7c5a81b0e2f3321d269b7acc450d1eec7a910b Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sun, 18 Aug 2019 09:57:23 +0300 -Subject: [PATCH] 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 ---- -Upstream status: sent to input-tools@lists.freedesktop.org (moderated) - - evtest.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/evtest.c b/evtest.c -index 37d4f8540333..548c203564d3 100644 ---- a/evtest.c -+++ b/evtest.c -@@ -56,6 +56,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.23.0.rc1 - diff --git a/package/evtest/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/package/evtest/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch deleted file mode 100644 index e39ccb641f..0000000000 --- a/package/evtest/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 70c5dd9e858ed577a4bbe7ec8920934c89df08fc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Nov 2019 11:58:58 -0800 -Subject: [PATCH] Fix build on 32bit arches with 64bit time_t - -time element is deprecated on new input_event structure in kernel's -input.h [1] - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f - -Signed-off-by: Khem Raj -Signed-off-by: Baruch Siach ---- -Upstream status: commit 648f5c1a9e0 - - evtest.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/evtest.c b/evtest.c -index 548c203564d3..8d592f42bdca 100644 ---- a/evtest.c -+++ b/evtest.c -@@ -61,6 +61,11 @@ - #include - #include - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - #define BITS_PER_LONG (sizeof(long) * 8) - #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) - #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) --- -2.25.1 - diff --git a/package/evtest/evtest.hash b/package/evtest/evtest.hash index b1ee24371e..0ed51df4e4 100644 --- a/package/evtest/evtest.hash +++ b/package/evtest/evtest.hash @@ -1,5 +1,5 @@ # locally computed -sha256 0e7a2eeff380af796e5e9b21b6f48fd706c58c931162c151c2c1074bdfeb85c6 evtest-evtest-1.34.tar.gz +sha256 06dfe6b9760b78f3f73aca2120cbcb79339b33e59d5c79a49b4bd5d34844b054 evtest-evtest-1.35.tar.gz # License files -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk index 8b8667e045..65897a41e6 100644 --- a/package/evtest/evtest.mk +++ b/package/evtest/evtest.mk @@ -4,12 +4,11 @@ # ################################################################################ -EVTEST_VERSION = 1.34 +EVTEST_VERSION = 1.35 EVTEST_SOURCE = evtest-evtest-$(EVTEST_VERSION).tar.gz EVTEST_SITE = https://gitlab.freedesktop.org/libevdev/evtest/-/archive/evtest-$(EVTEST_VERSION) EVTEST_LICENSE = GPL-2.0+ EVTEST_LICENSE_FILES = COPYING -EVTEST_DEPENDENCIES = host-pkgconf # needed because source package contains no generated files EVTEST_AUTORECONF = YES