From f51f73db49f0b39ddb7209948b2b304fac6de018 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 20 Jul 2022 10:44:02 +0200 Subject: 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: https://github.com/freedesktop/xorg-xf86-input-synaptics/commit/073b1b40bde9935928758c3452176c0d8dc67370 (From OE-Core rev: d083da164ddd8ebe73db5b97e4e4b8b7078ba21a) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 9d4d2c176cf33ced4d7d5c20178066abe1e9c4d3) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- .../64bit_time_t_support.patch | 51 ---------------------- .../xorg-driver/xf86-input-synaptics_1.9.1.bb | 18 -------- .../xorg-driver/xf86-input-synaptics_1.9.2.bb | 17 ++++++++ 3 files changed, 17 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics/64bit_time_t_support.patch delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb create mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.2.bb diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/64bit_time_t_support.patch b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/64bit_time_t_support.patch deleted file mode 100644 index 4bb7fb3e23..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/64bit_time_t_support.patch +++ /dev/null @@ -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 - ---- 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 - #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" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb deleted file mode 100644 index 388350c96e..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-driver-input.inc - -SUMMARY = "X.Org X server -- synaptics touchpad input driver" - -DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ -Synaptics Incorporated. Even though these touchpads (by default, \ -operating in a compatibility mode emulating a standard mouse) can be \ -handled by the normal evdev or mouse drivers, this driver allows more \ -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" - -DEPENDS += "libxi mtdev libxtst libevdev" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.2.bb new file mode 100644 index 0000000000..8e446290b2 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.2.bb @@ -0,0 +1,17 @@ +require xorg-driver-input.inc + +SUMMARY = "X.Org X server -- synaptics touchpad input driver" + +DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ +Synaptics Incorporated. Even though these touchpads (by default, \ +operating in a compatibility mode emulating a standard mouse) can be \ +handled by the normal evdev or mouse drivers, this driver allows more \ +advanced features of the touchpad to become available." + +LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" + +SRC_URI[sha256sum] = "b8fa4aab913fc63754bbd6439e020658c412743a055201ddf212760593962c38" + +DEPENDS += "libxi mtdev libxtst libevdev" + +XORG_DRIVER_COMPRESSOR = ".tar.xz" -- cgit v1.2.3-54-g00ecf