evtest: update to 1.35
authorRosen Penev <rosenp@gmail.com>
Sat, 14 Jan 2023 02:33:57 +0000 (18:33 -0800)
committerRosen Penev <rosenp@gmail.com>
Sat, 14 Jan 2023 06:04:52 +0000 (22:04 -0800)
Switch to git tarballs as the old freedesktop cgit doesn't work properly
anymore.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
utils/evtest/Makefile
utils/evtest/patches/010-musl.patch [deleted file]
utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch [deleted file]

index 8f0c51ba47cfe1dfac3ada3b00d16025aab6a77d..86077b5eb7a90bbab48bc16268276410cfd2459b 100644 (file)
@@ -8,12 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=evtest
-PKG_VERSION:=1.34
-PKG_RELEASE:=3
+PKG_VERSION:=1.35
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://cgit.freedesktop.org/evtest/snapshot
-PKG_HASH:=e49f1f160b30c8f7c2a4caef5ab655f1caf816483d19fdedd6db2d251d7ab80e
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://gitlab.freedesktop.org/libevdev/evtest
+PKG_MIRROR_HASH:=0a2599d92a6915ecedf43c341917fb6f332ffd3967352a2458acf5290167813e
 
 PKG_MAINTAINER:=Pushpal Sidhu <psidhu.devel@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
diff --git a/utils/evtest/patches/010-musl.patch b/utils/evtest/patches/010-musl.patch
deleted file mode 100644 (file)
index 647c9dc..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-From 12d5ea5ca2d9a47a1cab06caf2b36967667a3daf Mon Sep 17 00:00:00 2001
-From: Leo <thinkabit.ukim@gmail.com>
-Date: Sun, 24 Nov 2019 20:58:20 +0100
-Subject: [PATCH] Add missing include of limits.h for PATH_MAX
-
----
- evtest.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/evtest.c
-+++ b/evtest.c
-@@ -59,6 +59,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <limits.h> /* PATH_MAX */
- #define BITS_PER_LONG (sizeof(long) * 8)
- #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
diff --git a/utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/utils/evtest/patches/020-Fix-build-on-32bit-arches-with-64bit-time_t.patch
deleted file mode 100644 (file)
index 3fcb252..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From 648f5c1a9e07843e185782d207bc1bcbe6586f6e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- evtest.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/evtest.c
-+++ b/evtest.c
-@@ -61,6 +61,11 @@
- #include <unistd.h>
- #include <limits.h> /* PATH_MAX */
-+#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)