pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libopeninput: update to 1.30.2

Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Tue Mar 10 12:42:47 2026 +0100
Changeset:	8e6a39b5f47d22f3c73665dbdcad826d85136e6f

Modified Files:
	libopeninput/Makefile.common
	libopeninput/PLIST
	libopeninput/distinfo
	libopeninput/patches/patch-meson.build
	libopeninput/patches/patch-src_wscons.c
	libopeninput/patches/patch-src_wscons.h

Log Message:
libopeninput: update to 1.30.2

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8e6a39b5f47d22f3c73665dbdcad826d85136e6f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libopeninput/Makefile.common            |  6 +--
 libopeninput/PLIST                      |  6 +++
 libopeninput/distinfo                   | 12 ++---
 libopeninput/patches/patch-meson.build  | 48 +++++++++++++----
 libopeninput/patches/patch-src_wscons.c | 93 ++++++---------------------------
 libopeninput/patches/patch-src_wscons.h | 12 +----
 6 files changed, 71 insertions(+), 106 deletions(-)

diffs:
diff --git a/libopeninput/Makefile.common b/libopeninput/Makefile.common
index d36e86a852..f093b13d22 100644
--- a/libopeninput/Makefile.common
+++ b/libopeninput/Makefile.common
@@ -2,12 +2,12 @@
 # used by devel/libopeninput/Makefile
 # used by devel/input-headers/Makefile
 
-VERSION=	1.26.2
+VERSION=	1.30.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sizeofvoid/}
 GITHUB_PROJECT=	libopeninput
-GITHUB_TAG=	5e93d5c82d455c3901c2cb9b40dbbe5358a88e30
+GITHUB_TAG=	eced8d4e2f2b27ec8e4d3974275bfc87e7db02e2
 
 MAINTAINER=	kikadf.01%gmail.com@localhost
-HOMEPAGE=	https://github.com/sizeofvoid/libopeninput/tree/build-on-openbsd/
+HOMEPAGE=	https://github.com/sizeofvoid/libopeninput/tree/libopeninput/
 LICENSE=	mit
diff --git a/libopeninput/PLIST b/libopeninput/PLIST
index a25f513fc9..101f7b576a 100644
--- a/libopeninput/PLIST
+++ b/libopeninput/PLIST
@@ -10,6 +10,7 @@ man/man1/libinput-analyze-recording.1
 man/man1/libinput-analyze-touch-down-state.1
 man/man1/libinput-analyze.1
 man/man1/libinput-debug-events.1
+man/man1/libinput-debug-tablet-pad.1
 man/man1/libinput-debug-tablet.1
 man/man1/libinput-list-devices.1
 man/man1/libinput-list-kernel-devices.1
@@ -36,6 +37,7 @@ share/libinput/30-vendor-contour.quirks
 share/libinput/30-vendor-cypress.quirks
 share/libinput/30-vendor-elantech.quirks
 share/libinput/30-vendor-glorious.quirks
+share/libinput/30-vendor-goodix.quirks
 share/libinput/30-vendor-huion.quirks
 share/libinput/30-vendor-ibm.quirks
 share/libinput/30-vendor-ite.quirks
@@ -43,6 +45,7 @@ share/libinput/30-vendor-kensington.quirks
 share/libinput/30-vendor-logitech.quirks
 share/libinput/30-vendor-madcatz.quirks
 share/libinput/30-vendor-microsoft.quirks
+share/libinput/30-vendor-nulea.quirks
 share/libinput/30-vendor-oracle.quirks
 share/libinput/30-vendor-qemu.quirks
 share/libinput/30-vendor-razer.quirks
@@ -63,8 +66,10 @@ share/libinput/50-system-gigabyte.quirks
 share/libinput/50-system-google.quirks
 share/libinput/50-system-gpd.quirks
 share/libinput/50-system-graviton.quirks
+share/libinput/50-system-honor.quirks
 share/libinput/50-system-hp.quirks
 share/libinput/50-system-huawei.quirks
+share/libinput/50-system-icl.quirks
 share/libinput/50-system-lenovo.quirks
 share/libinput/50-system-lg.quirks
 share/libinput/50-system-minisforum.quirks
@@ -72,6 +77,7 @@ share/libinput/50-system-pine64.quirks
 share/libinput/50-system-sony.quirks
 share/libinput/50-system-starlabs.quirks
 share/libinput/50-system-system76.quirks
+share/libinput/50-system-tongfang.quirks
 share/libinput/50-system-toshiba.quirks
 share/libinput/50-system-vaio.quirks
 share/zsh/site-functions/_libinput
diff --git a/libopeninput/distinfo b/libopeninput/distinfo
index f9b7093e91..fffce83dd2 100644
--- a/libopeninput/distinfo
+++ b/libopeninput/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-BLAKE2s (libopeninput-1.26.2-5e93d5c82d455c3901c2cb9b40dbbe5358a88e30.tar.gz) = 633e65ec1d232fb9311a2c9651017811c2c394ee66f48ee191879236dfdcc44b
-SHA512 (libopeninput-1.26.2-5e93d5c82d455c3901c2cb9b40dbbe5358a88e30.tar.gz) = 66bc91cc789a7fcd0b7e5c1ef8d35853f5f4c80adae9ca1c3db8984ccaede01757c904ac1a878c34e2eb0cfeff92114040821be6eed6d8874f9ffa2845c697fd
-Size (libopeninput-1.26.2-5e93d5c82d455c3901c2cb9b40dbbe5358a88e30.tar.gz) = 1058625 bytes
-SHA1 (patch-meson.build) = 3add688ac7200ac350c9e48b6e706c86464823d5
+BLAKE2s (libopeninput-1.30.2-eced8d4e2f2b27ec8e4d3974275bfc87e7db02e2.tar.gz) = ecf2b053a105d47b791cd6420b9e8a1a1e78d6a8948efa96373d2c6d1a7dcedf
+SHA512 (libopeninput-1.30.2-eced8d4e2f2b27ec8e4d3974275bfc87e7db02e2.tar.gz) = 173e5fa8d327c26f9ee29dc6d87d99d654702d18efbe75e91f5d13b2dda5bdec8979179c5389aa84ae7464e1a8b0c20f4eb88f4816eec65615cfef4b8f136b73
+Size (libopeninput-1.30.2-eced8d4e2f2b27ec8e4d3974275bfc87e7db02e2.tar.gz) = 1188516 bytes
+SHA1 (patch-meson.build) = b200cc70ed9cd69bf5e7809adf04de5c233b63a7
 SHA1 (patch-src_util-prop-parsers.c) = 9e119446757420e7e8d508b350c8220c8f7742b9
-SHA1 (patch-src_wscons.c) = a8c69a31f222aa4684b3dfac475fba0a002afe82
-SHA1 (patch-src_wscons.h) = 23dfb69f63dab9130337ea5738a99f95be3b0498
+SHA1 (patch-src_wscons.c) = ccec4d8ced02d46525e62f082adc7bb03730c2e8
+SHA1 (patch-src_wscons.h) = 20c749ef79352094e1b646fdbe9566f95d7e0a41
diff --git a/libopeninput/patches/patch-meson.build b/libopeninput/patches/patch-meson.build
index 596a2cc49d..334629c02f 100644
--- a/libopeninput/patches/patch-meson.build
+++ b/libopeninput/patches/patch-meson.build
@@ -1,15 +1,45 @@
 $NetBSD$
 
 * Use external libevdev.h
+* Reenable quirks
 
---- meson.build.orig	2026-02-27 15:47:49.719316226 +0100
+--- meson.build.orig	2026-03-08 12:38:09.000000000 +0000
 +++ meson.build
-@@ -146,7 +146,7 @@ pkgconfig = import('pkgconfig')
- if host_machine.system() == 'openbsd' or host_machine.system() == 'netbsd'
- 	dep_udev = dependency('libudev')
- 	dep_mtdev = []
+@@ -163,11 +163,7 @@ endif
+ # Dependencies
+ pkgconfig = import('pkgconfig')
+ dep_udev = dependency('libudev')
+-if host_machine.system() == 'openbsd' or host_machine.system() == 'netbsd'
 -	dep_libevdev = []
-+	dep_libevdev = dependency('libevdev')
- else
- 	dep_udev = dependency('libudev')
- 	dep_mtdev = dependency('mtdev', version : '>= 1.1.0')
+-else
+-	dep_libevdev = dependency('libevdev', version: '>= 1.10.0')
+-endif
++dep_libevdev = dependency('libevdev', version: '>= 1.10.0')
+ 
+ dep_lm = cc.find_library('m', required : false)
+ dep_rt = cc.find_library('rt', required : false)
+@@ -374,6 +370,7 @@ src_libinput_util = [
+ 	'src/util-list.c',
+ 	'src/util-ratelimit.c',
+ 	'src/util-strings.c',
++	'src/util-prop-parsers.c',
+ ]
+ libinput_util = static_library('libinput-util',
+ 			       src_libinput_util,
+@@ -415,13 +412,9 @@ install_subdir('quirks',
+ 	       install_dir : dir_data,
+ 	       strip_directory : true)
+ 
+-if host_machine.system() != 'openbsd' and host_machine.system() != 'netbsd'
+-	src_libquirks = [
+-		'src/quirks.c',
+-	]
+-else
+-	src_libquirks = []
+-endif
++src_libquirks = [
++	'src/quirks.c',
++]
+ 
+ deps_libquirks = [dep_udev, dep_libwacom, dep_libinput_util]
+ libquirks = static_library('quirks', src_libquirks,
diff --git a/libopeninput/patches/patch-src_wscons.c b/libopeninput/patches/patch-src_wscons.c
index fb7d0302ee..d435e0a720 100644
--- a/libopeninput/patches/patch-src_wscons.c
+++ b/libopeninput/patches/patch-src_wscons.c
@@ -1,16 +1,13 @@
 $NetBSD$
 
 * Handle attached-detached devices with udev monitor
-* Handle auto-repeat per device instead of globally
 
---- src/wscons.c.orig	2026-01-30 14:33:32.122725330 +0000
+--- src/wscons.c.orig	2026-03-08 12:38:09.000000000 +0000
 +++ src/wscons.c
-@@ -45,53 +45,121 @@ static void
+@@ -46,51 +46,121 @@ static void
  wscons_device_init_pointer_acceleration(struct wscons_device *device,
                struct motion_filter *filter);
  
--static int old_value = -1;
--
 -static int
 -udev_input_enable(struct libinput *libinput)
 +static void
@@ -68,6 +65,7 @@ $NetBSD$
 +			}
  		}
  	}
+-	return 0;
 +
 +out:
 +	udev_device_unref(udev_device);
@@ -94,7 +92,7 @@ $NetBSD$
 +	if (udev_monitor_enable_receiving(input->udev_monitor)) {
 +		log_info(libinput, "udev: failed to bind the udev monitor\n");
 +		goto err;
-+	}
++ 	}
 +
 +	fd = udev_monitor_get_fd(input->udev_monitor);
 +	input->udev_monitor_source =
@@ -103,7 +101,7 @@ $NetBSD$
 +		goto err;
 +	}
 +
- 	return 0;
++ 	return 0;
 +
 +err:
 +	if (input->udev_monitor) {
@@ -154,40 +152,9 @@ $NetBSD$
  	}
  }
  
-@@ -128,13 +196,13 @@ wscons_process(struct libinput_device *d
- 		key = wsevent->value;
- 		if (wsevent->type == WSCONS_EVENT_KEY_UP) {
- 			kstate = LIBINPUT_KEY_STATE_RELEASED;
--			old_value = -1;
-+			dev->old_value = -1;
- 		} else {
- 			kstate = LIBINPUT_KEY_STATE_PRESSED;
- 			/* ignore auto-repeat */
--			if (key == old_value)
-+			if (key == dev->old_value)
- 				return;
--			old_value = key;
-+			dev->old_value = key;
- 		}
- 		keyboard_notify_key(device, time,
- 		    wskey_transcode(wscons_device(device)->scanCodeMap, key), kstate);
-@@ -239,7 +307,7 @@ wscons_device_dispatch(void *data)
- 	ssize_t len;
- 	int count, i;
- 
--	len = read(device->fd, wsevents, sizeof(struct wscons_event));
-+	len = read(device->fd, wsevents, sizeof(wsevents));
- 	if (len <= 0 || (len % sizeof(struct wscons_event)) != 0)
- 		return;
- 
-@@ -282,20 +350,27 @@ wscons_seat_get(struct libinput *libinpu
- 
- LIBINPUT_EXPORT struct libinput *
- libinput_udev_create_context(const struct libinput_interface *interface,
--			     void *user_data,
--			     struct udev *udev)
-+				 void *user_data,
-+				 struct udev *udev)
+@@ -295,17 +365,24 @@ libinput_udev_create_context(const struc
+ 			     void *user_data,
+ 			     struct udev *udev)
  {
 -	struct libinput *libinput;
 +	struct udev_input *input;
@@ -195,14 +162,14 @@ $NetBSD$
 -	libinput = calloc(1, sizeof(*libinput));
 -	if (libinput == NULL)
 +	if (!interface || !udev)
++ 		return NULL;
++
++	input = calloc(1, sizeof(*input));
++	if (!input)
  		return NULL;
  
 -	if (libinput_init(libinput, interface, &interface_backend, user_data) != 0) {
 -		free(libinput);
-+	input = calloc(1, sizeof(*input));
-+	if (!input)
-+		return NULL;
-+
 +	if (libinput_init(&input->base, interface, &interface_backend, user_data) != 0) {
 +		libinput_unref(&input->base);
 +		free(input);
@@ -216,7 +183,7 @@ $NetBSD$
  }
  
  LIBINPUT_EXPORT int
-@@ -307,6 +382,7 @@ libinput_udev_assign_seat(struct libinpu
+@@ -317,6 +394,7 @@ libinput_udev_assign_seat(struct libinpu
  	uint64_t time;
  	struct timespec ts;
  	struct libinput_event *event;
@@ -224,7 +191,7 @@ $NetBSD$
  
  	/* Add standard devices */
  	for (int i = 0; i < 10; i++) {
-@@ -332,6 +408,10 @@ libinput_udev_assign_seat(struct libinpu
+@@ -342,6 +420,10 @@ libinput_udev_assign_seat(struct libinpu
  		post_device_event(device, time, LIBINPUT_EVENT_DEVICE_ADDED,
  		    event);
  	}
@@ -235,37 +202,7 @@ $NetBSD$
  	return 0;
  }
  
-@@ -517,6 +597,8 @@ wscons_device_init(struct wscons_device 
- {
- 	struct libinput_device *device = &wscons_device->base;
- 
-+	wscons_device->old_value = -1;
-+
- 	if (strncmp(device->devname, "/dev/wsmouse", 12) == 0) {
- 		/* XXX handle tablets and touchpanel */
- 		wscons_device->capability = LIBINPUT_DEVICE_CAP_POINTER;
-@@ -576,8 +658,18 @@ libinput_path_add_device(struct libinput
- 	return device;
- 
- err:
--	if (device != NULL)
--		close_restricted(libinput, device->fd);
-+	if (device != NULL) {
-+		if (device->source)
-+			libinput_remove_source(libinput, device->source);
-+		if (device->devname) {
-+			free(device->devname);
-+			device->devname = NULL;
-+		}
-+		if (device->fd >= 0)
-+			close_restricted(libinput, device->fd);
-+	} else if (fd >= 0) {
-+		close_restricted(libinput, fd);
-+	}
- 	free(wscons_device);
- 	return NULL;
- }
-@@ -587,6 +679,7 @@ libinput_path_remove_device(struct libin
+@@ -609,6 +691,7 @@ libinput_path_remove_device(struct libin
  {
  	struct libinput *libinput = device->seat->libinput;
  
diff --git a/libopeninput/patches/patch-src_wscons.h b/libopeninput/patches/patch-src_wscons.h
index fd212a31dc..2029fdce8a 100644
--- a/libopeninput/patches/patch-src_wscons.h
+++ b/libopeninput/patches/patch-src_wscons.h
@@ -1,18 +1,10 @@
 $NetBSD$
 
-* Handle auto-repeat per device instead of globally
 * Handle attached-detached devices with udev monitor
 
---- src/wscons.h.orig	2026-01-30 14:33:45.725593515 +0000
+--- src/wscons.h.orig	2026-03-08 12:38:09.000000000 +0000
 +++ src/wscons.h
-@@ -18,12 +18,19 @@ struct wscons_device {
- 	struct libinput_device base;
- 	enum libinput_device_capability capability;
- 	struct TransMapRec *scanCodeMap;
-+	int old_value;
- 	struct {
- 		struct libinput_device_config_accel config;
- 		struct motion_filter *filter;
+@@ -25,6 +25,12 @@ struct wscons_device {
  	} pointer;
  };
Home | Main Index | Thread Index | Old Index