commit: bb8aa4614832163bec6933d80e8328dd393db7a7
parent 1f4cdecb81dce82187b6b795905e151f7361714c
Author: Michael Forney <mforney@mforney.org>
Date: Fri, 30 Oct 2020 21:09:44 -0700
libevdev: Update to 1.10.0
Diffstat:
3 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/pkg/libevdev/gen.lua b/pkg/libevdev/gen.lua
@@ -14,8 +14,8 @@ pkg.deps = {
rule('eventnames', 'lua $dir/eventnames.lua $in >$out')
build('eventnames', '$outdir/event-names.h', {
- '$srcdir/include/linux/input.h',
- '$srcdir/include/linux/input-event-codes.h',
+ '$srcdir/include/linux/linux/input.h',
+ '$srcdir/include/linux/linux/input-event-codes.h',
'|', '$dir/eventnames.lua',
})
lib('libevdev.a', {'libevdev/libevdev.c', 'libevdev/libevdev-names.c'}, {'$outdir/event-names.h'})
diff --git a/pkg/libevdev/patch/0001-Revert-switch-to-VLAs-for-multitouch-state.patch b/pkg/libevdev/patch/0001-Revert-switch-to-VLAs-for-multitouch-state.patch
@@ -1,4 +1,4 @@
-From 3bf2649a9874b5d63e178d2d61ea822901ff991f Mon Sep 17 00:00:00 2001
+From 13e2996b538601f1e4b0ee74beb74a09e56d0a7a Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 3 Mar 2020 14:17:37 -0800
Subject: [PATCH libevdev] Revert switch to VLAs for multitouch state
@@ -6,8 +6,8 @@ Subject: [PATCH libevdev] Revert switch to VLAs for multitouch state
Signed-off-by: Michael Forney <mforney@mforney.org>
---
libevdev/libevdev-int.h | 28 +++++++++++++
- libevdev/libevdev.c | 88 +++++++++++++++++++----------------------
- 2 files changed, 68 insertions(+), 48 deletions(-)
+ libevdev/libevdev.c | 87 +++++++++++++++++++----------------------
+ 2 files changed, 68 insertions(+), 47 deletions(-)
diff --git a/libevdev/libevdev-int.h b/libevdev/libevdev-int.h
index 7da5cf0..2743e50 100644
@@ -63,18 +63,10 @@ index 7da5cf0..2743e50 100644
};
diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
-index c4729b5..ff967d0 100644
+index 2b90a6c..c06a595 100644
--- a/libevdev/libevdev.c
+++ b/libevdev/libevdev.c
-@@ -28,7 +28,6 @@
- #include <limits.h>
- #include <unistd.h>
- #include <stdarg.h>
--#include <stdint.h>
- #include <stdbool.h>
-
- #include "libevdev.h"
-@@ -44,23 +43,7 @@ enum event_filter_status {
+@@ -45,23 +45,7 @@ enum event_filter_status {
EVENT_FILTER_DISCARD, /**< Discard current event */
};
@@ -99,7 +91,7 @@ index c4729b5..ff967d0 100644
static int
update_key_state(struct libevdev *dev, const struct input_event *e);
-@@ -219,6 +202,8 @@ libevdev_reset(struct libevdev *dev)
+@@ -220,6 +204,8 @@ libevdev_reset(struct libevdev *dev)
free(dev->phys);
free(dev->uniq);
free(dev->mt_slot_vals);
@@ -108,7 +100,7 @@ index c4729b5..ff967d0 100644
memset(dev, 0, sizeof(*dev));
dev->fd = -1;
dev->initialized = false;
-@@ -348,7 +333,11 @@ free_slots(struct libevdev *dev)
+@@ -348,7 +334,11 @@ free_slots(struct libevdev *dev)
{
dev->num_slots = -1;
free(dev->mt_slot_vals);
@@ -120,7 +112,7 @@ index c4729b5..ff967d0 100644
}
static int
-@@ -358,7 +347,11 @@ init_slots(struct libevdev *dev)
+@@ -358,7 +348,11 @@ init_slots(struct libevdev *dev)
int rc = 0;
free(dev->mt_slot_vals);
@@ -132,7 +124,7 @@ index c4729b5..ff967d0 100644
/* devices with ABS_RESERVED aren't MT devices,
see the documentation for multitouch-related
-@@ -382,6 +375,19 @@ init_slots(struct libevdev *dev)
+@@ -382,6 +376,19 @@ init_slots(struct libevdev *dev)
}
dev->current_slot = abs_info->value;
@@ -152,7 +144,7 @@ index c4729b5..ff967d0 100644
reset_tracking_ids(dev);
out:
return rc;
-@@ -538,10 +544,8 @@ libevdev_set_fd(struct libevdev* dev, int fd)
+@@ -540,10 +547,8 @@ libevdev_set_fd(struct libevdev* dev, int fd)
if (rc != 0)
goto out;
@@ -165,7 +157,7 @@ index c4729b5..ff967d0 100644
rc = init_event_queue(dev);
if (rc < 0) {
-@@ -676,33 +680,27 @@ out:
+@@ -678,33 +683,27 @@ out:
}
static int
@@ -208,7 +200,7 @@ index c4729b5..ff967d0 100644
if (axis == ABS_MT_TRACKING_ID) {
if (val_before == -1 && val_after != -1) {
-@@ -731,17 +729,12 @@ sync_mt_state(struct libevdev *dev,
+@@ -733,17 +732,12 @@ sync_mt_state(struct libevdev *dev,
}
}
@@ -226,7 +218,7 @@ index c4729b5..ff967d0 100644
int *last_reported_slot)
{
const unsigned int map[] = {BTN_TOOL_FINGER, BTN_TOOL_DOUBLETAP,
-@@ -749,6 +742,7 @@ terminate_slots(struct libevdev *dev,
+@@ -751,6 +745,7 @@ terminate_slots(struct libevdev *dev,
BTN_TOOL_QUINTTAP};
bool touches_stopped = false;
int ntouches_before = 0, ntouches_after = 0;
@@ -234,7 +226,7 @@ index c4729b5..ff967d0 100644
/* For BTN_TOOL_* emulation, we need to know how many touches we had
* before and how many we have left once we terminate all the ones
-@@ -812,10 +806,10 @@ terminate_slots(struct libevdev *dev,
+@@ -814,10 +809,10 @@ terminate_slots(struct libevdev *dev,
static int
push_mt_sync_events(struct libevdev *dev,
@@ -246,7 +238,7 @@ index c4729b5..ff967d0 100644
int rc;
for (int slot = 0; slot < dev->num_slots; slot++) {
-@@ -922,8 +916,6 @@ sync_state(struct libevdev *dev)
+@@ -926,8 +921,6 @@ sync_state(struct libevdev *dev)
int rc = 0;
bool want_mt_sync = false;
int last_reported_slot = 0;
@@ -255,7 +247,7 @@ index c4729b5..ff967d0 100644
/* see section "Discarding events before synchronizing" in
* libevdev/libevdev.h */
-@@ -941,9 +933,9 @@ sync_state(struct libevdev *dev)
+@@ -945,9 +938,9 @@ sync_state(struct libevdev *dev)
if (dev->num_slots > -1 &&
libevdev_has_event_code(dev, EV_ABS, ABS_MT_SLOT)) {
want_mt_sync = true;
@@ -267,7 +259,7 @@ index c4729b5..ff967d0 100644
else
want_mt_sync = false;
}
-@@ -957,7 +949,7 @@ sync_state(struct libevdev *dev)
+@@ -961,7 +954,7 @@ sync_state(struct libevdev *dev)
if (rc == 0 && libevdev_has_event_type(dev, EV_ABS))
rc = sync_abs_state(dev);
if (rc == 0 && want_mt_sync)
@@ -277,5 +269,5 @@ index c4729b5..ff967d0 100644
dev->queue_nsync = queue_num_elements(dev);
--
-2.27.0
+2.29.0
diff --git a/pkg/libevdev/ver b/pkg/libevdev/ver
@@ -1 +1 @@
-1.9.1 r0
+1.10.0 r0
