Date: Fri, 15 May 2026 05:43:25 +0000 From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e158e655cff6 - main - x11/libinput: Update to 1.31.1 Message-ID: <6a06b27d.19b88.5f2f1265@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=e158e655cff62b4f69567ad3fa392021d2fa051e commit e158e655cff62b4f69567ad3fa392021d2fa051e Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2026-05-04 20:57:45 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-05-15 05:43:15 +0000 x11/libinput: Update to 1.31.1 PR: 293585 Tested by: alven, kenrap Pull Request: https://github.com/freebsd/freebsd-ports/pull/512 --- x11/libinput/Makefile | 4 +-- x11/libinput/distinfo | 6 ++-- x11/libinput/files/patch-src_evdev.c | 10 +++--- x11/libinput/files/patch-test_litest-main.c | 30 +++++++++++++++++ x11/libinput/files/patch-test_litest-runner.c | 6 ++-- x11/libinput/files/patch-test_litest-runner.h | 8 ++--- x11/libinput/files/patch-test_litest.c | 46 +++++++-------------------- x11/libinput/pkg-plist | 11 ++++--- 8 files changed, 64 insertions(+), 57 deletions(-) diff --git a/x11/libinput/Makefile b/x11/libinput/Makefile index 910bd21b2f69..54ccc291fe83 100644 --- a/x11/libinput/Makefile +++ b/x11/libinput/Makefile @@ -1,5 +1,5 @@ PORTNAME= libinput -DISTVERSION= 1.28.1 +DISTVERSION= 1.31.1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -18,7 +18,7 @@ LIB_DEPENDS= libevdev.so:devel/libevdev \ TEST_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} -USES= cpe localbase meson pkgconfig python:run,test shebangfix +USES= cpe localbase lua meson pkgconfig python:run,test shebangfix USE_LDCONFIG= yes USE_GITLAB= yes diff --git a/x11/libinput/distinfo b/x11/libinput/distinfo index 90849d84dd0b..5787d338a3f6 100644 --- a/x11/libinput/distinfo +++ b/x11/libinput/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753347960 -SHA256 (libinput-1.28.1.tar.bz2) = 19e5337ec10fdf920c8d1f4ece63cd7d1c12279ee26e347e30e98e2942d9e1aa -SIZE (libinput-1.28.1.tar.bz2) = 864820 +TIMESTAMP = 1777924501 +SHA256 (libinput-1.31.1.tar.bz2) = e0bb6537de892ce7c63fc5be9ad373eae894b7655c92220ef00316cc33097356 +SIZE (libinput-1.31.1.tar.bz2) = 934385 diff --git a/x11/libinput/files/patch-src_evdev.c b/x11/libinput/files/patch-src_evdev.c index e27b64542a36..4ee98b0664f7 100644 --- a/x11/libinput/files/patch-src_evdev.c +++ b/x11/libinput/files/patch-src_evdev.c @@ -6,18 +6,18 @@ libinput reopens devices just to check path equality. The udev_devices from reopening do have the right properties, so we just use them instead of the original (enumerated) ones. ---- src/evdev.c.orig 2025-04-01 02:46:07 UTC +--- src/evdev.c.orig 2026-04-02 01:04:12 UTC +++ src/evdev.c -@@ -1104,7 +1104,7 @@ evdev_sync_device(struct evdev_device *device) - evdev_device_dispatch_one(device, &ev); - } while (rc == LIBEVDEV_READ_STATUS_SYNC); +@@ -1007,7 +1007,7 @@ evdev_sync_device(struct libinput *libinput, struct ev + + evdev_device_dispatch_frame(libinput, device, frame); - return rc == -EAGAIN ? 0 : rc; + return (rc == -EAGAIN || rc == -EINVAL)? 0 : rc; } static inline void -@@ -1177,6 +1177,17 @@ evdev_device_dispatch(void *data) +@@ -1105,6 +1105,17 @@ evdev_device_dispatch(void *data) if (rc != -EAGAIN && rc != -EINTR) { libinput_remove_source(libinput, device->source); diff --git a/x11/libinput/files/patch-test_litest-main.c b/x11/libinput/files/patch-test_litest-main.c new file mode 100644 index 000000000000..19acbf3197c5 --- /dev/null +++ b/x11/libinput/files/patch-test_litest-main.c @@ -0,0 +1,30 @@ +--- test/litest-main.c.orig 2026-04-02 01:04:12 UTC ++++ test/litest-main.c +@@ -39,7 +39,6 @@ + #include <sys/ptrace.h> + #include <sys/resource.h> + #include <sys/stat.h> +-#include <sys/sysinfo.h> + #include <sys/timerfd.h> + #include <sys/types.h> + #include <sys/wait.h> +@@ -188,8 +187,8 @@ check_device_access(void) + return 77; + } + +- if (access("/dev/uinput", F_OK) == -1 && +- access("/dev/input/uinput", F_OK) == -1) { ++ if (access("/dev/uinput_skip_our_libudev_isnt_ready", F_OK) == -1 && ++ access("/dev/input/uinput_skip_our_libudev_isnt_ready", F_OK) == -1) { + fprintf(stderr, "uinput device is missing, skipping tests.\n"); + return 77; + } +@@ -230,7 +229,7 @@ main(int argc, char **argv) + if (getenv("NO_COLOR")) + use_colors = false; + +- in_debugger = is_debugger_attached(); ++ in_debugger = false; + if (in_debugger) { + jobs = 0; + } else if ((meson_testthreads = getenv("MESON_TESTTHREADS")) == NULL || diff --git a/x11/libinput/files/patch-test_litest-runner.c b/x11/libinput/files/patch-test_litest-runner.c index 9bcc44c072ba..7402e9f6ca68 100644 --- a/x11/libinput/files/patch-test_litest-runner.c +++ b/x11/libinput/files/patch-test_litest-runner.c @@ -1,10 +1,10 @@ ---- test/litest-runner.c.orig 2025-04-01 02:46:07 UTC +--- test/litest-runner.c.orig 2026-04-02 01:04:12 UTC +++ test/litest-runner.c @@ -26,7 +26,6 @@ #include <errno.h> + #include <inttypes.h> #include <sys/epoll.h> - #include <sys/timerfd.h> -#include <sys/sysinfo.h> + #include <sys/timerfd.h> #include <sys/wait.h> #ifdef HAVE_PIDFD_OPEN - #include <sys/syscall.h> diff --git a/x11/libinput/files/patch-test_litest-runner.h b/x11/libinput/files/patch-test_litest-runner.h index fcd70b576d44..750a6a194186 100644 --- a/x11/libinput/files/patch-test_litest-runner.h +++ b/x11/libinput/files/patch-test_litest-runner.h @@ -1,9 +1,9 @@ ---- test/litest-runner.h.orig 2025-04-01 02:46:07 UTC +--- test/litest-runner.h.orig 2026-04-02 01:04:12 UTC +++ test/litest-runner.h -@@ -180,3 +180,8 @@ void litest_runner_abort(void); +@@ -198,3 +198,8 @@ litest_runner_abort(void); */ - __attribute__((noreturn)) - void litest_runner_abort(void); + __attribute__((noreturn)) void + litest_runner_abort(void); + +static int get_nprocs(void) +{ diff --git a/x11/libinput/files/patch-test_litest.c b/x11/libinput/files/patch-test_litest.c index 81964c72efde..03427b146bc4 100644 --- a/x11/libinput/files/patch-test_litest.c +++ b/x11/libinput/files/patch-test_litest.c @@ -1,46 +1,22 @@ ---- test/litest.c.orig 2025-04-01 02:46:07 UTC +--- test/litest.c.orig 2026-04-02 01:04:12 UTC +++ test/litest.c -@@ -44,13 +44,13 @@ - #include <sys/wait.h> +@@ -39,7 +39,6 @@ + #include <sys/ptrace.h> + #include <sys/resource.h> #include <sys/stat.h> - #include <sys/types.h> -#include <sys/sysinfo.h> - #include <libudev.h> - #if HAVE_LIBSYSTEMD - #include <systemd/sd-bus.h> + #include <sys/timerfd.h> + #include <sys/types.h> + #include <sys/wait.h> +@@ -52,10 +51,10 @@ #endif #ifdef __FreeBSD__ #include <termios.h> +#include <sys/kbio.h> #endif - #include <valgrind/valgrind.h> -@@ -66,8 +66,6 @@ - #include "util-backtrace.h" - #include "util-libinput.h" - + #include <libevdev/libevdev.h> -#include <linux/kd.h> -- - #define evbit(t, c) ((t) << 16U | (c & 0xffff)) - - #define UDEV_RULES_D "/run/udev/rules.d" -@@ -5322,8 +5320,8 @@ check_device_access(void) - return 77; - } - -- if (access("/dev/uinput", F_OK) == -1 && -- access("/dev/input/uinput", F_OK) == -1) { -+ if (access("/dev/uinput_skip_our_libudev_isnt_ready", F_OK) == -1 && -+ access("/dev/input/uinput_skip_our_libudev_isnt_ready", F_OK) == -1) { - fprintf(stderr, - "uinput device is missing, skipping tests.\n"); - return 77; -@@ -5365,7 +5363,7 @@ main(int argc, char **argv) - if (getenv("NO_COLOR")) - use_colors = false; + #include <valgrind/valgrind.h> -- in_debugger = is_debugger_attached(); -+ in_debugger = false; - if (in_debugger) { - jobs = 0; - } else if ((meson_testthreads = getenv("MESON_TESTTHREADS")) == NULL || + #include "util-backtrace.h" diff --git a/x11/libinput/pkg-plist b/x11/libinput/pkg-plist index f97aca9d7d01..fb2e29083946 100644 --- a/x11/libinput/pkg-plist +++ b/x11/libinput/pkg-plist @@ -12,6 +12,7 @@ libexec/libinput/libinput-analyze-touch-down-state libexec/libinput/libinput-debug-events %%DEBUG_GUI%%libexec/libinput/libinput-debug-gui libexec/libinput/libinput-debug-tablet +libexec/libinput/libinput-debug-tablet-pad libexec/libinput/libinput-list-devices libexec/libinput/libinput-list-kernel-devices libexec/libinput/libinput-measure @@ -34,26 +35,26 @@ libexec/libinput/libinput-test %%DATADIR%%/30-vendor-cypress.quirks %%DATADIR%%/30-vendor-elantech.quirks %%DATADIR%%/30-vendor-glorious.quirks +%%DATADIR%%/30-vendor-goodix.quirks +%%DATADIR%%/30-vendor-hantick.quirks %%DATADIR%%/30-vendor-huion.quirks -%%DATADIR%%/30-vendor-ibm.quirks %%DATADIR%%/30-vendor-ite.quirks %%DATADIR%%/30-vendor-kensington.quirks %%DATADIR%%/30-vendor-logitech.quirks %%DATADIR%%/30-vendor-madcatz.quirks %%DATADIR%%/30-vendor-microsoft.quirks +%%DATADIR%%/30-vendor-nulea.quirks %%DATADIR%%/30-vendor-oracle.quirks +%%DATADIR%%/30-vendor-pixart.quirks %%DATADIR%%/30-vendor-qemu.quirks %%DATADIR%%/30-vendor-razer.quirks %%DATADIR%%/30-vendor-synaptics.quirks %%DATADIR%%/30-vendor-trust.quirks -%%DATADIR%%/30-vendor-uniwill.quirks %%DATADIR%%/30-vendor-vmware.quirks %%DATADIR%%/30-vendor-wacom.quirks %%DATADIR%%/50-system-acer.quirks %%DATADIR%%/50-system-apple.quirks %%DATADIR%%/50-system-asus.quirks -%%DATADIR%%/50-system-chicony.quirks -%%DATADIR%%/50-system-chuwi.quirks %%DATADIR%%/50-system-cyborg.quirks %%DATADIR%%/50-system-dell.quirks %%DATADIR%%/50-system-framework.quirks @@ -73,7 +74,6 @@ libexec/libinput/libinput-test %%DATADIR%%/50-system-starlabs.quirks %%DATADIR%%/50-system-system76.quirks %%DATADIR%%/50-system-toshiba.quirks -%%DATADIR%%/50-system-vaio.quirks share/man/man1/libinput-analyze-buttons.1.gz share/man/man1/libinput-analyze-per-slot-delta.1.gz share/man/man1/libinput-analyze-recording.1.gz @@ -82,6 +82,7 @@ share/man/man1/libinput-analyze.1.gz share/man/man1/libinput-debug-events.1.gz %%DEBUG_GUI%%share/man/man1/libinput-debug-gui.1.gz share/man/man1/libinput-debug-tablet.1.gz +share/man/man1/libinput-debug-tablet-pad.1.gz share/man/man1/libinput-list-devices.1.gz share/man/man1/libinput-list-kernel-devices.1.gz share/man/man1/libinput-measure-fuzz.1.gzhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a06b27d.19b88.5f2f1265>