libopeninput: update, remove merged patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libopeninput: update, remove merged patches
From: kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 21 Sep 2025 15:54:32 +0000
Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Sun Sep 21 17:52:57 2025 +0200
Changeset:	a80331b23a8e7cd8e9e108c775bcad6c47648360

Modified Files:
	libopeninput/Makefile
	libopeninput/distinfo
Removed Files:
	libopeninput/patches/patch-include_linux_input-event-codes.h
	libopeninput/patches/patch-include_linux_input.h
	libopeninput/patches/patch-meson.build
	libopeninput/patches/patch-src_libinput-private.h
	libopeninput/patches/patch-src_libinput-util.h
	libopeninput/patches/patch-src_util-strings.h
	libopeninput/patches/patch-src_wscons.c

Log Message:
libopeninput: update, remove merged patches

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

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

diffstat:
 libopeninput/Makefile                              |  2 +-
 libopeninput/distinfo                              | 13 +--
 .../patch-include_linux_input-event-codes.h        | 15 ----
 libopeninput/patches/patch-include_linux_input.h   | 15 ----
 libopeninput/patches/patch-meson.build             | 96 ----------------------
 libopeninput/patches/patch-src_libinput-private.h  | 15 ----
 libopeninput/patches/patch-src_libinput-util.h     | 15 ----
 libopeninput/patches/patch-src_util-strings.h      | 15 ----
 libopeninput/patches/patch-src_wscons.c            | 24 ------
 9 files changed, 4 insertions(+), 206 deletions(-)

diffs:
diff --git a/libopeninput/Makefile b/libopeninput/Makefile
index d8bd1aa294..caf9bf678e 100644
--- a/libopeninput/Makefile
+++ b/libopeninput/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	libopeninput-1.26.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sizeofvoid/}
-GITHUB_TAG=	cf9699e76e41bf1b824c3820d06d36a2b0fbb8c1
+GITHUB_TAG=	5e93d5c82d455c3901c2cb9b40dbbe5358a88e30
 
 MAINTAINER=	kikadf.01%gmail.com@localhost
 HOMEPAGE=	https://github.com/sizeofvoid/libopeninput/tree/build-on-openbsd/
diff --git a/libopeninput/distinfo b/libopeninput/distinfo
index 9607114f06..6b05aa2499 100644
--- a/libopeninput/distinfo
+++ b/libopeninput/distinfo
@@ -1,12 +1,5 @@
 $NetBSD$
 
-BLAKE2s (libopeninput-1.26.2-cf9699e76e41bf1b824c3820d06d36a2b0fbb8c1.tar.gz) = 1f6036108dd3f9d1179b7db3332d31221c37be2d38dd311ca1ba0478c4f2f29d
-SHA512 (libopeninput-1.26.2-cf9699e76e41bf1b824c3820d06d36a2b0fbb8c1.tar.gz) = 197402a36b9536823fd8c47ce328187503cfc45a6a850b823aedb28e0fae57d1f85952c35c5c6de59c7084c28f2a6a601385b55c1192c52b859736b54a331ed3
-Size (libopeninput-1.26.2-cf9699e76e41bf1b824c3820d06d36a2b0fbb8c1.tar.gz) = 1057791 bytes
-SHA1 (patch-include_linux_input-event-codes.h) = 57a4efc3892638eeb7d15a7a03c686d4e602f938
-SHA1 (patch-include_linux_input.h) = 70b682671da5947e10411ebf5a0ffcd9b638e15a
-SHA1 (patch-meson.build) = d02d88b9e001070eaf561390ed717db36c37faf0
-SHA1 (patch-src_libinput-private.h) = 5cd7e90b189d8e774e4d468261a0d1fdd3c6a831
-SHA1 (patch-src_libinput-util.h) = 26270e454c77a7299dafc441a5ffefee7aa6e57c
-SHA1 (patch-src_util-strings.h) = 569b41c73aa0ed03167c863bbe6c24889476bc6a
-SHA1 (patch-src_wscons.c) = 450658edab97988699169573f5c74afa00894166
+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
diff --git a/libopeninput/patches/patch-include_linux_input-event-codes.h b/libopeninput/patches/patch-include_linux_input-event-codes.h
deleted file mode 100644
index 944399fc89..0000000000
--- a/libopeninput/patches/patch-include_linux_input-event-codes.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-* Add NetBSD support
-
---- include/linux/input-event-codes.h.orig	2025-08-17 15:49:37.000000000 +0000
-+++ include/linux/input-event-codes.h
-@@ -1,7 +1,5 @@
- #ifdef __linux__
- #include "linux/input-event-codes.h"
--#elif __OpenBSD__
--#include "freebsd/input-event-codes.h"
--#elif __FreeBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
- #include "freebsd/input-event-codes.h"
- #endif
diff --git a/libopeninput/patches/patch-include_linux_input.h b/libopeninput/patches/patch-include_linux_input.h
deleted file mode 100644
index d47be18096..0000000000
--- a/libopeninput/patches/patch-include_linux_input.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-* Add NetBSD support
-
---- include/linux/input.h.orig	2025-08-17 15:49:37.000000000 +0000
-+++ include/linux/input.h
-@@ -1,7 +1,5 @@
- #ifdef __linux__
- #include "linux/input.h"
--#elif __OpenBSD__
--#include "freebsd/input.h"
--#elif __FreeBSD__
-+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
- #include "freebsd/input.h"
- #endif
diff --git a/libopeninput/patches/patch-meson.build b/libopeninput/patches/patch-meson.build
deleted file mode 100644
index b206c9d07a..0000000000
--- a/libopeninput/patches/patch-meson.build
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD$
-
-* Add NetBSD support
-
---- meson.build.orig	2025-08-17 15:49:37.000000000 +0000
-+++ meson.build
-@@ -143,7 +143,7 @@ config_h.set10('HAVE_INSTALLED_TESTS', g
- 
- # Dependencies
- pkgconfig = import('pkgconfig')
--if host_machine.system() == 'openbsd'
-+if host_machine.system() == 'openbsd' or host_machine.system() == 'netbsd'
- 	dep_udev = dependency('libudev')
- 	dep_mtdev = []
- 	dep_libevdev = []
-@@ -164,7 +164,7 @@ includes_src = include_directories('src'
- 
- ############ libwacom configuration ############
- 
--if host_machine.system() == 'openbsd'
-+if host_machine.system() == 'openbsd' or host_machine.system() == 'netbsd'
- have_libwacom = false
- else
- have_libwacom = get_option('libwacom')
-@@ -177,7 +177,7 @@ else
- endif
- 
- ############ udev bits ############
--if host_machine.system() != 'openbsd'
-+if host_machine.system() != 'openbsd' and host_machine.system() != 'netbsd'
- executable('libinput-device-group',
- 	   'udev/libinput-device-group.c',
- 	   dependencies : [dep_udev, dep_libwacom],
-@@ -314,7 +314,7 @@ src_libfilter = [
- 		'src/filter-trackpoint.c',
- 		'src/filter-trackpoint-flat.c',
- ]
--if host_machine.system() == 'openbsd'
-+if host_machine.system() == 'openbsd' or host_machine.system() == 'netbsd'
- 	dep_libfilter = []
- else
- libfilter = static_library('filter', src_libfilter,
-@@ -345,7 +345,7 @@ libquirks = static_library('quirks', src
- dep_libquirks = declare_dependency(link_with : libquirks)
- 
- # Create /etc/libinput
--if host_machine.system() != 'openbsd'
-+if host_machine.system() != 'openbsd' and host_machine.system() != 'netbsd'
- if meson.version().version_compare('>= 0.60')
- 	install_emptydir(dir_etc / 'libinput')
- else
-@@ -355,7 +355,7 @@ endif
- 
- ############ libinput.so ############
- install_headers('src/libinput.h')
--if host_machine.system() == 'openbsd'
-+if host_machine.system() == 'openbsd' or host_machine.system() == 'netbsd'
- src_libinput = src_libfilter + [
- 	'src/libinput_openbsd.c',
- 	'src/libinput-private-config.c',
-@@ -470,7 +470,7 @@ endif
- subdir('completion/zsh')
- 
- ############ tools ############
--if host_machine.system() != 'openbsd'
-+if host_machine.system() != 'openbsd' and host_machine.system() != 'netbsd'
- 
- libinput_tool_path = dir_libexec
- config_h.set_quoted('LIBINPUT_TOOL_PATH', libinput_tool_path)
-@@ -717,7 +717,7 @@ test('tools-builddir-lookup-installed',
- 
- endif
- ############ tests ############
--if host_machine.system() != 'openbsd'
-+if host_machine.system() != 'openbsd' and host_machine.system() != 'netbsd'
- 
- test('symbols-leak-test',
-      find_program('test/symbols-leak-test'),
-@@ -771,7 +771,7 @@ if get_option('tests')
- 	config_h.set10('HAVE_GSTACK', gstack.found())
- 
- 	# for inhibit support during test run
--if host_machine.system() != 'openbsd'
-+if host_machine.system() != 'openbsd' and host_machine.system() != 'netbsd'
- 	dep_libsystemd = dependency('libsystemd', version : '>= 221', required : false)
- 	config_h.set10('HAVE_LIBSYSTEMD', dep_libsystemd.found())
- endif
-@@ -883,7 +883,7 @@ endif
- 		'test/litest.c',
- 	]
- 
--if host_machine.system() != 'openbsd'
-+if host_machine.system() != 'openbsd' and host_machine.system() != 'netbsd'
- 	dep_dl = cc.find_library('dl')
- 	deps_litest = [
- 		dep_libinput,
diff --git a/libopeninput/patches/patch-src_libinput-private.h b/libopeninput/patches/patch-src_libinput-private.h
deleted file mode 100644
index dfc0d6fd17..0000000000
--- a/libopeninput/patches/patch-src_libinput-private.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-* Add NetBSD support
-
---- src/libinput-private.h.orig	2025-08-17 15:49:37.000000000 +0000
-+++ src/libinput-private.h
-@@ -1015,7 +1015,7 @@ static inline void libinput_libwacom_unr
- #endif
- 
- 
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- void
- axis_notify_event(struct libinput_device *device,
-     uint64_t time,
diff --git a/libopeninput/patches/patch-src_libinput-util.h b/libopeninput/patches/patch-src_libinput-util.h
deleted file mode 100644
index 9c62441ce1..0000000000
--- a/libopeninput/patches/patch-src_libinput-util.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-* Add NetBSD support
-
---- src/libinput-util.h.orig	2025-08-17 15:49:37.000000000 +0000
-+++ src/libinput-util.h
-@@ -66,7 +66,7 @@
- #define LIBINPUT_EXPORT __attribute__ ((visibility("default")))
- #define LIBINPUT_UNUSED __attribute__ ((unused))
- 
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #define bit(x_) (1UL << (x_))
- #define NBITS(b) (b * 8)
- #endif
diff --git a/libopeninput/patches/patch-src_util-strings.h b/libopeninput/patches/patch-src_util-strings.h
deleted file mode 100644
index f3500285c8..0000000000
--- a/libopeninput/patches/patch-src_util-strings.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-* Add NetBSD support
-
---- src/util-strings.h.orig	2025-08-17 15:49:37.000000000 +0000
-+++ src/util-strings.h
-@@ -242,7 +242,7 @@ safe_atod(const char *str, double *val)
- 		return false;
- 
- 	errno = 0;
--#ifndef __OpenBSD__
-+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
- 	v = strtod_l(str, &endptr, c_locale);
- #else
- 	v = strtod(str, &endptr);
diff --git a/libopeninput/patches/patch-src_wscons.c b/libopeninput/patches/patch-src_wscons.c
deleted file mode 100644
index 1e4d587ea4..0000000000
--- a/libopeninput/patches/patch-src_wscons.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Hide unsupported events on NetBSD
-
---- src/wscons.c.orig	2025-09-09 13:28:44.467395163 +0000
-+++ src/wscons.c
-@@ -209,13 +209,17 @@ wscons_process(struct libinput_device *d
- 		axis_notify_event(device, time, &accel, &raw);
- 		break;
- 
-+#ifndef __NetBSD__
- 	case WSCONS_EVENT_SYNC:
- 		break;
-+#endif
- 
- 	case WSCONS_EVENT_MOUSE_ABSOLUTE_Z:
- 	case WSCONS_EVENT_MOUSE_ABSOLUTE_W:
-+#ifndef __NetBSD__
- 	case WSCONS_EVENT_TOUCH_WIDTH:
- 	case WSCONS_EVENT_TOUCH_RESET:
-+#endif
- 		/* ignore those */
- 		break;
- 	default:
Prev by Date: py-docutils: remove, used for updating pkgsrc
Next by Date: TODO: - py-typer, done
Previous by Thread: py-docutils: remove, used for updating pkgsrc
Next by Thread: py-typer: update to 0.19.1.
Indexes:
Home | Main Index | Thread Index | Old Index