[packages/xorg-driver-input-multitouch] Rel 7

[arekm]

commit 69341e21256df5d0aa9a60bd8eee697b5224a8ef
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Mar 15 12:46:40 2026 +0100

    Rel 7

 ...ders-to-fix-implicit-function-declaration.patch | 46 ++++++++++++++++++++++
 ...age-of-struct-input_event-to-input_event_.patch | 40 +++++++++++++++++++
 xorg-driver-input-multitouch.spec                  |  6 ++-
 3 files changed, 91 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-input-multitouch.spec b/xorg-driver-input-multitouch.spec
index 1bb2faa..b8f5980 100644
--- a/xorg-driver-input-multitouch.spec
+++ b/xorg-driver-input-multitouch.spec
@@ -1,5 +1,5 @@
 %define		subver 20110303
-%define		rel		6
+%define		rel		7
 Summary:	Multitouch X input driver
 Name:		xorg-driver-input-multitouch
 Version:	1.0
@@ -10,6 +10,8 @@ Source0:	xf86-input-multitouch-%{subver}.tar.bz2
 # Source0-md5:	994e19532eb5561779cfa4f63dc0b077
 Source1:	xf86-input-multitouch.conf
 Patch0:		libdir.patch
+Patch1:		Include-headers-to-fix-implicit-function-declaration.patch
+Patch2:		Port-usage-of-struct-input_event-to-input_event_.patch
 URL:		http://bitmath.org/code/multitouch/
 BuildRequires:	mtdev-devel >= 1.1.0
 BuildRequires:	pixman-devel
@@ -25,6 +27,8 @@ touchpads, in particular those with integrated button.
 %prep
 %setup -q -n xf86-input-multitouch-%{subver}
 %patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
 
 %{__sed} -i -e 's,gcc,$(CC),g' Makefile
 
diff --git a/Include-headers-to-fix-implicit-function-declaration.patch b/Include-headers-to-fix-implicit-function-declaration.patch
new file mode 100644
index 0000000..ef93ae1
--- /dev/null
+++ b/Include-headers-to-fix-implicit-function-declaration.patch
@@ -0,0 +1,46 @@
+From: Benjamin Drung <benjamin.drung at canonical.com>
+Date: Mon, 15 Apr 2024 20:11:11 +0200
+Subject: Include headers to fix implicit function declaration
+
+---
+ driver/multitouch.c | 1 +
+ src/mtouch.c        | 1 +
+ src/test.c          | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/driver/multitouch.c b/driver/multitouch.c
+index a083adc..0c4615c 100644
+--- a/driver/multitouch.c
++++ b/driver/multitouch.c
+@@ -22,6 +22,7 @@
+ #include "gestures.h"
+ 
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++#include <exevents.h>
+ #include <X11/Xatom.h>
+ #include <xserver-properties.h>
+ #endif
+diff --git a/src/mtouch.c b/src/mtouch.c
+index a6b96b8..335c61e 100644
+--- a/src/mtouch.c
++++ b/src/mtouch.c
+@@ -20,6 +20,7 @@
+  **************************************************************************/
+ 
+ #include "mtouch.h"
++#include <mtdev-plumbing.h>
+ 
+ static const int use_grab = 0;
+ 
+diff --git a/src/test.c b/src/test.c
+index 1b67986..77b723e 100644
+--- a/src/test.c
++++ b/src/test.c
+@@ -22,6 +22,7 @@
+ #include <gestures.h>
+ #include <fcntl.h>
+ #include <xbypass.h>
++#include <unistd.h>
+ 
+ static void loop_device(int fd)
+ {
diff --git a/Port-usage-of-struct-input_event-to-input_event_.patch b/Port-usage-of-struct-input_event-to-input_event_.patch
new file mode 100644
index 0000000..4954690
--- /dev/null
+++ b/Port-usage-of-struct-input_event-to-input_event_.patch
@@ -0,0 +1,40 @@
+From: Benjamin Drung <benjamin.drung at canonical.com>
+Date: Mon, 15 Apr 2024 19:56:58 +0200
+Subject: Port usage of struct input_event to input_event_*
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+It fails to build on armhf:
+
+```
+src/hwstate.c: In function ‘finish_packet’:
+src/hwstate.c:43:24: error: ‘const struct input_event’ has no member named
+‘time’
+   43 | s->evtime = syn->time.tv_usec / ms + syn->time.tv_sec * ms;
+      | ^~
+src/hwstate.c:43:49: error: ‘const struct input_event’ has no member named
+‘time’
+   43 | s->evtime = syn->time.tv_usec / ms + syn->time.tv_sec * ms;
+      | ^~
+```
+
+Closes: #1067596
+LP: #2061591
+---
+ src/hwstate.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hwstate.c b/src/hwstate.c
+index 076efa1..ab2ac48 100644
+--- a/src/hwstate.c
++++ b/src/hwstate.c
+@@ -40,7 +40,7 @@ static void finish_packet(struct HWState *s, const struct Capabilities *caps,
+ 		if (!caps->has_abs[MTDEV_WIDTH_MINOR])
+ 			s->data[i].width_minor = s->data[i].width_major;
+ 	}
+-	s->evtime = syn->time.tv_usec / ms + syn->time.tv_sec * ms;
++	s->evtime = syn->input_event_usec / ms + syn->input_event_sec * ms;
+ }
+ 
+ static int read_event(struct HWState *s, const struct Capabilities *caps,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-input-multitouch.git/commitdiff/69341e21256df5d0aa9a60bd8eee697b5224a8ef