pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
libopeninput: remove, imported to pkgsrc
Module Name: pkgsrc-wip
Committed By: kikadf <kikadf.01%gmail.com@localhost>
Pushed By: kikadf
Date: Mon Apr 13 17:52:58 2026 +0200
Changeset: 1e0e0eff7f12dcb593c3b8b4829500cc7e49722f
Modified Files:
Makefile
Removed Files:
libopeninput/COMMIT_MSG
libopeninput/DESCR
libopeninput/Makefile
libopeninput/Makefile.common
libopeninput/PLIST
libopeninput/buildlink3.mk
libopeninput/distinfo
libopeninput/patches/patch-src_wscons.c
libopeninput/patches/patch-src_wscons.h
Log Message:
libopeninput: remove, imported to pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1e0e0eff7f12dcb593c3b8b4829500cc7e49722f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
libopeninput/COMMIT_MSG | 6 -
libopeninput/DESCR | 4 -
libopeninput/Makefile | 24 ----
libopeninput/Makefile.common | 17 ---
libopeninput/PLIST | 83 -------------
libopeninput/buildlink3.mk | 16 ---
libopeninput/distinfo | 7 --
libopeninput/patches/patch-src_wscons.c | 212 --------------------------------
libopeninput/patches/patch-src_wscons.h | 19 ---
10 files changed, 389 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 3d00e89d38..2236d44a2f 100644
--- a/Makefile
+++ b/Makefile
@@ -2138,7 +2138,6 @@ SUBDIR+= libnsl
SUBDIR+= libntfs
SUBDIR+= libode
SUBDIR+= liboglappth
-SUBDIR+= libopeninput
SUBDIR+= libopenmodeller
SUBDIR+= libopenshot
SUBDIR+= libopenshot-audio
diff --git a/libopeninput/COMMIT_MSG b/libopeninput/COMMIT_MSG
deleted file mode 100644
index 7d60f6d94a..0000000000
--- a/libopeninput/COMMIT_MSG
+++ /dev/null
@@ -1,6 +0,0 @@
-Add devel/libopeninput
-
-The libinput is an input device management and event
-handling library to linux.
-The libopeninput is a wscons(4) and kqueue(2) based
-reimplementation of libinput, originally to OpenBSD.
diff --git a/libopeninput/DESCR b/libopeninput/DESCR
deleted file mode 100644
index d5da285300..0000000000
--- a/libopeninput/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-The libinput is an input device management and event
-handling library to linux.
-The libopeninput is a wscons(4) and kqueue(2) based
-reimplementation of libinput, originally to OpenBSD.
diff --git a/libopeninput/Makefile b/libopeninput/Makefile
deleted file mode 100644
index 72dff73952..0000000000
--- a/libopeninput/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD$
-
-.include "Makefile.common"
-
-COMMENT= Wscons(4) and kqueue(2) based port of libinput
-
-USE_TOOLS+= pkg-config
-
-# wscons
-ONLY_FOR_PLATFORM= NetBSD-*-*
-ONLY_FOR_PLATFORM+= OpenBSD-*-*
-
-MESON_ARGS+= -Dlibwacom=false
-MESON_ARGS+= -Ddocumentation=false
-MESON_ARGS+= -Dtests=false
-
-PKGCONFIG_OVERRIDE+= output/meson-private/libinput.pc
-PKGCONFIG_OVERRIDE_STAGE= post-build
-
-.include "../../devel/meson/build.mk"
-.include "../../devel/libepoll-shim/buildlink3.mk"
-.include "../../devel/libudev-bsd/buildlink3.mk"
-.include "../../wip/input-headers/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libopeninput/Makefile.common b/libopeninput/Makefile.common
deleted file mode 100644
index 6922c832c3..0000000000
--- a/libopeninput/Makefile.common
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD$
-# used by devel/libopeninput/Makefile
-# used by devel/input-headers/Makefile
-
-DISTNAME= libopeninput-${VERSION}
-VERSION= 1.30.2
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GITHUB:=sizeofvoid/}
-GITHUB_PROJECT= libopeninput
-GITHUB_TAG= 1db645a4a690088135ba34a70efd7b764ecd8c0f
-
-MAINTAINER= kikadf.01%gmail.com@localhost
-HOMEPAGE= https://github.com/sizeofvoid/libopeninput/tree/libopeninput/
-LICENSE= mit
-
-DISTINFO_FILE= ${.CURDIR}/../../wip/libopeninput/distinfo
-PATCHDIR= ${.CURDIR}/../../wip/libopeninput/patches
diff --git a/libopeninput/PLIST b/libopeninput/PLIST
deleted file mode 100644
index 101f7b576a..0000000000
--- a/libopeninput/PLIST
+++ /dev/null
@@ -1,83 +0,0 @@
-@comment $NetBSD$
-include/libinput.h
-lib/libinput.so
-lib/libinput.so.10
-lib/libinput.so.10.13.0
-lib/pkgconfig/libinput.pc
-man/man1/libinput-analyze-buttons.1
-man/man1/libinput-analyze-per-slot-delta.1
-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
-man/man1/libinput-measure-fuzz.1
-man/man1/libinput-measure-touch-size.1
-man/man1/libinput-measure-touchpad-pressure.1
-man/man1/libinput-measure-touchpad-size.1
-man/man1/libinput-measure-touchpad-tap.1
-man/man1/libinput-measure.1
-man/man1/libinput-quirks-list.1
-man/man1/libinput-quirks-validate.1
-man/man1/libinput-quirks.1
-man/man1/libinput-record.1
-man/man1/libinput-replay.1
-man/man1/libinput-test.1
-man/man1/libinput.1
-share/libinput/10-generic-keyboard.quirks
-share/libinput/10-generic-mouse.quirks
-share/libinput/10-generic-trackball.quirks
-share/libinput/30-vendor-a4tech.quirks
-share/libinput/30-vendor-aiptek.quirks
-share/libinput/30-vendor-alps.quirks
-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
-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
-share/libinput/30-vendor-synaptics.quirks
-share/libinput/30-vendor-trust.quirks
-share/libinput/30-vendor-uniwill.quirks
-share/libinput/30-vendor-vmware.quirks
-share/libinput/30-vendor-wacom.quirks
-share/libinput/50-system-acer.quirks
-share/libinput/50-system-apple.quirks
-share/libinput/50-system-asus.quirks
-share/libinput/50-system-chicony.quirks
-share/libinput/50-system-chuwi.quirks
-share/libinput/50-system-cyborg.quirks
-share/libinput/50-system-dell.quirks
-share/libinput/50-system-framework.quirks
-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
-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/buildlink3.mk b/libopeninput/buildlink3.mk
deleted file mode 100644
index 284d273cbd..0000000000
--- a/libopeninput/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= libopeninput
-
-.if !defined(LIBOPENINPUT_BUILDLINK3_MK)
-LIBOPENINPUT_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libopeninput+= libopeninput>=1.26.2
-BUILDLINK_ABI_DEPENDS.libopeninput+= libopeninput>=1.26.2
-BUILDLINK_PKGSRCDIR.libopeninput?= ../../wip/libopeninput
-
-.include "../../wip/input-headers/buildlink3.mk"
-
-.endif # LIBOPENINPUT_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -libopeninput
diff --git a/libopeninput/distinfo b/libopeninput/distinfo
deleted file mode 100644
index cb1bfa2ad8..0000000000
--- a/libopeninput/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-BLAKE2s (libopeninput-1.30.2-1db645a4a690088135ba34a70efd7b764ecd8c0f.tar.gz) = dba9c2fcdb4266afb55833bd560a2af3c24d1383e3b46c2f50158d1b2940c932
-SHA512 (libopeninput-1.30.2-1db645a4a690088135ba34a70efd7b764ecd8c0f.tar.gz) = a801125dfd3fafeb360e13ee8ed4ab2835b3a46c4234cfba699a54994f28a4ad46f854ee5465a6e8eb4fa573393e67dcaa0308e1f104026a289417440577fe46
-Size (libopeninput-1.30.2-1db645a4a690088135ba34a70efd7b764ecd8c0f.tar.gz) = 1189202 bytes
-SHA1 (patch-src_wscons.c) = ccec4d8ced02d46525e62f082adc7bb03730c2e8
-SHA1 (patch-src_wscons.h) = 20c749ef79352094e1b646fdbe9566f95d7e0a41
diff --git a/libopeninput/patches/patch-src_wscons.c b/libopeninput/patches/patch-src_wscons.c
deleted file mode 100644
index d435e0a720..0000000000
--- a/libopeninput/patches/patch-src_wscons.c
+++ /dev/null
@@ -1,212 +0,0 @@
-$NetBSD$
-
-* Handle attached-detached devices with udev monitor
-
---- src/wscons.c.orig 2026-03-08 12:38:09.000000000 +0000
-+++ src/wscons.c
-@@ -46,51 +46,121 @@ static void
- wscons_device_init_pointer_acceleration(struct wscons_device *device,
- struct motion_filter *filter);
-
--static int
--udev_input_enable(struct libinput *libinput)
-+static void
-+wscons_udev_handler(void *data)
- {
-+ struct udev_input *input = data;
-+ struct udev_device *udev_device;
- struct libinput_seat *seat;
- struct libinput_device *device;
-+ uint64_t time;
-+ struct timespec ts;
-+ struct libinput_event *event;
-+ const char *action, *devnode, *sysname;
-
-- seat = wscons_seat_get(libinput, default_seat, default_seat_name);
-- list_for_each(device, &seat->devices_list, link) {
-- device->fd = open_restricted(libinput, device->devname, O_RDWR);
-- device->source =
-- libinput_add_fd(libinput, device->fd,
-- wscons_device_dispatch, device);
-- if (!device->source) {
-- return -ENOMEM;
-+ udev_device = udev_monitor_receive_device(input->udev_monitor);
-+ if (!udev_device)
-+ return;
-+
-+ action = udev_device_get_action(udev_device);
-+ devnode = udev_device_get_devnode(udev_device);
-+ sysname = udev_device_get_sysname(udev_device);
-+ if (!action || !devnode || !sysname)
-+ goto out;
-+
-+ if (!(strneq(sysname, "wskbd", 5) || strneq(sysname, "wsmouse", 7)))
-+ goto out;
-+
-+ if (streq(action, "add")) {
-+ device = libinput_path_add_device(&input->base, devnode);
-+ if (!device)
-+ goto out;
-+ clock_gettime(CLOCK_REALTIME, &ts);
-+ time = s2us(ts.tv_sec) + ns2us(ts.tv_nsec);
-+ event = calloc(1, sizeof(*event));
-+ post_device_event(device, time, LIBINPUT_EVENT_DEVICE_ADDED, event);
-+ }
-+ else if (streq(action, "remove")) {
-+ seat = wscons_seat_get(&input->base, default_seat, default_seat_name);
-+ list_for_each(device, &seat->devices_list, link) {
-+ if (device->devname && strcmp(device->devname, devnode) == 0) {
-+ clock_gettime(CLOCK_REALTIME, &ts);
-+ time = s2us(ts.tv_sec) + ns2us(ts.tv_nsec);
-+ event = calloc(1, sizeof(*event));
-+ post_device_event(device, time, LIBINPUT_EVENT_DEVICE_REMOVED, event);
-+ libinput_path_remove_device(device);
-+ break;
-+ }
- }
- }
-- return 0;
-+
-+out:
-+ udev_device_unref(udev_device);
-+}
-+
-+static int
-+udev_input_enable(struct libinput *libinput)
-+{
-+ struct udev_input *input = (struct udev_input *)libinput;
-+ struct udev *udev = input->udev;
-+ int fd;
-+
-+ input->udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
-+ if (!input->udev_monitor) {
-+ log_info(libinput, "udev: failed to create the udev monitor\n");
-+ return -1;
-+ }
-+
-+ if (udev_monitor_filter_add_match_subsystem_devtype(input->udev_monitor, "input", NULL)) {
-+ log_info(libinput, "udev: failed to set up filter\n");
-+ goto err;
-+ }
-+
-+ 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 =
-+ libinput_add_fd(&input->base, fd, wscons_udev_handler, input);
-+ if (!input->udev_monitor_source) {
-+ goto err;
-+ }
-+
-+ return 0;
-+
-+err:
-+ if (input->udev_monitor) {
-+ udev_monitor_unref(input->udev_monitor);
-+ input->udev_monitor = NULL;
-+ }
-+ return -1;
- }
-
- static void
- udev_input_disable(struct libinput *libinput)
- {
-- struct libinput_seat *seat;
-- struct libinput_device *device;
-+ struct udev_input *input = (struct udev_input*)libinput;
-
-- seat = wscons_seat_get(libinput, default_seat, default_seat_name);
-- list_for_each(device, &seat->devices_list, link) {
-- if (device->source) {
-- libinput_remove_source(libinput, device->source);
-- device->source = NULL;
-- }
-- close_restricted(libinput, device->fd);
-+ if (input->udev_monitor_source) {
-+ libinput_remove_source(&input->base, input->udev_monitor_source);
-+ input->udev_monitor_source = NULL;
-+ }
-+ if (input->udev_monitor) {
-+ udev_monitor_unref(input->udev_monitor);
-+ input->udev_monitor = NULL;
- }
- }
-
- static void
- udev_input_destroy(struct libinput *libinput)
- {
-- struct libinput_seat *seat;
-- struct libinput_device *device;
-+ struct udev_input *input = (struct udev_input*)libinput;
-
-- fprintf(stderr, "%s", __func__);
-- seat = wscons_seat_get(libinput, default_seat, default_seat_name);
-- list_for_each(device, &seat->devices_list, link) {
-- close_restricted(libinput, device->fd);
-+ if (input->udev) {
-+ udev_unref(input->udev);
-+ input->udev = NULL;
- }
- }
-
-@@ -295,17 +365,24 @@ libinput_udev_create_context(const struc
- void *user_data,
- struct udev *udev)
- {
-- struct libinput *libinput;
-+ struct udev_input *input;
-
-- 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);
-+ if (libinput_init(&input->base, interface, &interface_backend, user_data) != 0) {
-+ libinput_unref(&input->base);
-+ free(input);
- return NULL;
- }
-- return libinput;
-+
-+ input->udev = udev_ref(udev);
-+
-+ return &input->base;
- }
-
- LIBINPUT_EXPORT int
-@@ -317,6 +394,7 @@ libinput_udev_assign_seat(struct libinpu
- uint64_t time;
- struct timespec ts;
- struct libinput_event *event;
-+ struct udev_input *input = (struct udev_input*)libinput;
-
- /* Add standard devices */
- for (int i = 0; i < 10; i++) {
-@@ -342,6 +420,10 @@ libinput_udev_assign_seat(struct libinpu
- post_device_event(device, time, LIBINPUT_EVENT_DEVICE_ADDED,
- event);
- }
-+
-+ if (udev_input_enable(&input->base) < 0)
-+ return -1;
-+
- return 0;
- }
-
-@@ -609,6 +691,7 @@ libinput_path_remove_device(struct libin
- {
- struct libinput *libinput = device->seat->libinput;
-
-+ list_remove(&device->link);
- libinput_remove_source(libinput, device->source);
- device->source = NULL;
-
diff --git a/libopeninput/patches/patch-src_wscons.h b/libopeninput/patches/patch-src_wscons.h
deleted file mode 100644
index 2029fdce8a..0000000000
--- a/libopeninput/patches/patch-src_wscons.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-* Handle attached-detached devices with udev monitor
-
---- src/wscons.h.orig 2026-03-08 12:38:09.000000000 +0000
-+++ src/wscons.h
-@@ -25,6 +25,12 @@ struct wscons_device {
- } pointer;
- };
-
-+struct udev_input {
-+ struct libinput base;
-+ struct udev *udev;
-+ struct udev_monitor *udev_monitor;
-+ struct libinput_source *udev_monitor_source;
-+};
-
- static inline struct wscons_device *
- wscons_device(struct libinput_device *device)
Home |
Main Index |
Thread Index |
Old Index