xf86-input-synaptics: update 1.9.1 -> 1.9.2

Changes:

Convert remaining source files from ISO-8859-1 to UTF-8
gitlab CI: add a basic build test
Fix spelling/wording issues
Build xz tarballs instead of bzip2
synclient: allow negative/large values for AreaLeftEdge etc.
eventcomm: fix compile with pre-time64 kernels
eventcomm: use 64-bit time safe accessors instead of timeval directly
Use fabs() instead of abs() on double values.
Update configure.ac bug URL for gitlab migration
Update README for gitlab migration

Drop 64bit_time_t_support.patch as issue fixed upstream:
073b1b40bd

(From OE-Core rev: d083da164ddd8ebe73db5b97e4e4b8b7078ba21a)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9d4d2c176cf33ced4d7d5c20178066abe1e9c4d3)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-07-20 10:44:02 +02:00
committed by Richard Purdie
parent 4c0dae9d22
commit f51f73db49
2 changed files with 3 additions and 55 deletions

View File

@@ -1,51 +0,0 @@
This patch avoids using time field of input_event structure which is not available
on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new
and keeps old input.h implementation functional as well.
See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -575,10 +575,12 @@ SynapticsReadEvent(InputInfoPtr pInfo, s
ev->type = EV_SYN;
ev->code = SYN_REPORT;
ev->value = 0;
- ev->time = last_event_time;
- } else if (ev->type == EV_SYN)
- last_event_time = ev->time;
-
+ ev->input_event_sec = last_event_time.tv_sec;
+ ev->input_event_usec = last_event_time.tv_usec;
+ } else if (ev->type == EV_SYN) {
+ last_event_time.tv_sec = ev->input_event_sec;
+ last_event_time.tv_usec = ev->input_event_usec;
+ }
return TRUE;
}
@@ -725,7 +727,7 @@ EventReadHwState(InputInfoPtr pInfo,
case SYN_REPORT:
hw->numFingers = count_fingers(pInfo, comm);
if (proto_data->have_monotonic_clock)
- hw->millis = 1000 * ev.time.tv_sec + ev.time.tv_usec / 1000;
+ hw->millis = 1000 * ev.input_event_sec + ev.input_event_usec / 1000;
else
hw->millis = GetTimeInMillis();
SynapticsCopyHwState(hwRet, hw);
--- a/src/eventcomm.h
+++ b/src/eventcomm.h
@@ -34,6 +34,11 @@
#include <xf86Xinput.h>
#include "synproto.h"
+#ifndef input_event_sec
+#define input_event_sec time.tv_sec
+#define input_event_usec time.tv_usec
+#endif
+
/* for auto-dev: */
#define DEV_INPUT_EVENT "/dev/input"
#define EVENT_DEV_NAME "event"

View File

@@ -10,9 +10,8 @@ advanced features of the touchpad to become available."
LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398"
SRC_URI += "file://64bit_time_t_support.patch"
SRC_URI[md5sum] = "cfb79d3c975151f9bbf30b727c260cb9"
SRC_URI[sha256sum] = "7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576"
SRC_URI[sha256sum] = "b8fa4aab913fc63754bbd6439e020658c412743a055201ddf212760593962c38"
DEPENDS += "libxi mtdev libxtst libevdev"
XORG_DRIVER_COMPRESSOR = ".tar.xz"