Attachment #211544 for bug #240153

Lines 1-8 Link Here

(-)x11/libinput/Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libinput	3	PORTNAME= libinput
4	PORTVERSION= 1.12.6	4	PORTVERSION= 1.15.1
5	PORTREVISION= 1
6	CATEGORIES= x11	5	CATEGORIES= x11
7	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/	6	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/
8		7

Lines 1-3 Link Here

(-)x11/libinput/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1548226824	1	TIMESTAMP = 1581363218
2	SHA256 (libinput-1.12.6.tar.xz) = 12b4023a3fc683d3d8127db573bdf925a2ef366615042f69c87e57c32a50f45d	2	SHA256 (libinput-1.15.1.tar.xz) = 6b2f57495c6f173ecf49ee19d3e10087d9916a52711e1b5eb01e0d9635950c16
3	SIZE (libinput-1.12.6.tar.xz) = 518784	3	SIZE (libinput-1.15.1.tar.xz) = 579236




--- meson.build.orig	2020-02-03 05:25:43 UTC
+++ meson.build
@@ -152,6 +152,8 @@ endif
 
 ############ udev bits ############
 

 executable('libinput-device-group',
 	   'udev/libinput-device-group.c',
 	   dependencies : [dep_udev, dep_libwacom],
@@ -192,6 +194,8 @@ litest_groups_rules_file = configure_file(input : 'ude
 litest_fuzz_override_file = configure_file(input : 'udev/90-libinput-fuzz-override.rules.in',
 					   output : '90-libinput-fuzz-override-litest.rules',
 					   configuration : litest_udev_rules_config)
+
+endif
+
 ############ libepoll-shim (BSD) ############
 
 ############ Check for leftover udev rules ########
 
 	   'test/build-pedantic.c',
 	   dependencies : [dep_udev],
 	   include_directories : [includes_src, includes_include],
-	   c_args : ['-std=gnu90', '-Werror'],
+	   c_args : ['-std=gnu89', '-Werror'],
 	   install : false)
 # test for linking with the minimal linker flags
 executable('test-build-linker',




--- src/evdev.c.orig	2020-02-03 05:25:43 UTC
the udev_device structs do not get udev properties that mark them as inputs, keyboards, etc,
and get rejected as not being input devices.

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	2018-12-18 05:06:18 UTC
+++ src/evdev.c
@@ -1015,7 +1015,7 @@ evdev_sync_device(struct evdev_device *device)
 		evdev_device_dispatch_one(device, &ev);
 	} while (rc == LIBEVDEV_READ_STATUS_SYNC);
 

 }
 
 static void
@@ -1053,6 +1053,17 @@ evdev_device_dispatch(void *data)
 
 	if (rc != -EAGAIN && rc != -EINTR) {
 		libinput_remove_source(libinput, device->source);




libdata/pkgconfig/libinput.pc
libexec/libinput/libinput-debug-events
%%DEBUG_GUI%%libexec/libinput/libinput-debug-gui
libexec/libinput/libinput-debug-tablet
libexec/libinput/libinput-list-devices
libexec/libinput/libinput-measure
libexec/libinput/libinput-measure-fuzz

libexec/libinput/libinput-replay
man/man1/libinput-debug-events.1.gz
%%DEBUG_GUI%%man/man1/libinput-debug-gui.1.gz
man/man1/libinput-debug-tablet.1.gz
man/man1/libinput-list-devices.1.gz
man/man1/libinput-measure-fuzz.1.gz
man/man1/libinput-measure-touch-size.1.gz

%%DATADIR%%/30-vendor-aiptek.quirks
%%DATADIR%%/30-vendor-alps.quirks
%%DATADIR%%/30-vendor-contour.quirks
%%DATADIR%%/30-vendor-cypress.quirks
%%DATADIR%%/30-vendor-elantech.quirks
%%DATADIR%%/30-vendor-huion.quirks
%%DATADIR%%/30-vendor-ibm.quirks
%%DATADIR%%/30-vendor-kensington.quirks
%%DATADIR%%/30-vendor-logitech.quirks
%%DATADIR%%/30-vendor-madcatz.quirks
%%DATADIR%%/30-vendor-microsoft.quirks
%%DATADIR%%/30-vendor-razer.quirks
%%DATADIR%%/30-vendor-synaptics.quirks

%%DATADIR%%/50-system-hp.quirks
%%DATADIR%%/50-system-lenovo.quirks
%%DATADIR%%/50-system-system76.quirks
%%DATADIR%%/50-system-toshiba.quirks
share/zsh/site-functions/_libinput

Return to bug 240153

Lines 1-6 Link Here

(-)x11/libinput/files/patch-meson.build (-18 / +9 lines)
1	--- meson.build.orig 2019-01-21 01:28:48 UTC	1	--- meson.build.orig 2020-02-03 05:25:43 UTC
2	+++ meson.build	2	+++ meson.build
3	@@ -145,6 +145,8 @@ endif	3	@@ -152,6 +152,8 @@ endif
4		4
5	############ udev bits ############	5	############ udev bits ############
6		6
Lines 9-29 Link Here
9	executable('libinput-device-group',	9	executable('libinput-device-group',
10	'udev/libinput-device-group.c',	10	'udev/libinput-device-group.c',
11	dependencies : [dep_udev, dep_libwacom],	11	dependencies : [dep_udev, dep_libwacom],
12	@@ -182,6 +184,8 @@ litest_model_quirks_file = configure_file(input : 'ude	12	@@ -192,6 +194,8 @@ litest_groups_rules_file = configure_file(input : 'ude
13	install : false,	13	litest_fuzz_override_file = configure_file(input : 'udev/90-libinput-fuzz-override.rules.in',
14	configuration : litest_udev_rules_config)	14	output : '90-libinput-fuzz-override-litest.rules',
15		15	configuration : litest_udev_rules_config)
		16	+
16	+endif	17	+endif
17	+
18	############ libepoll-shim (BSD) ############
19		18
20	if cc.has_header_symbol('sys/epoll.h', 'epoll_create1', prefix : prefix)	19	############ Check for leftover udev rules ########
21	@@ -634,7 +638,7 @@ executable('test-build-std-gnuc90',	20
22	'test/build-pedantic.c',
23	dependencies : [dep_udev],
24	include_directories : [includes_src, includes_include],
25	- c_args : ['-std=gnu90', '-Werror'],
26	+ c_args : ['-std=gnu89', '-Werror'],
27	install : false)
28	# test for linking with the minimal linker flags
29	executable('test-build-linker',

Lines 1-14 Link Here

(-)x11/libinput/files/patch-src_evdev.c (-11 / +3 lines)
1	When a process without full /dev/input access enumerates devices via libudev-devd,	1	--- src/evdev.c.orig 2020-02-03 05:25:43 UTC
2	the udev_device structs do not get udev properties that mark them as inputs, keyboards, etc,
3	and get rejected as not being input devices.
4
5	libinput reopens devices just to check path equality.
6	The udev_devices from reopening do have the right properties,
7	so we just use them instead of the original (enumerated) ones.
8
9	--- src/evdev.c.orig 2018-12-18 05:06:18 UTC
10	+++ src/evdev.c	2	+++ src/evdev.c
11	@@ -905,7 +905,7 @@ evdev_sync_device(struct evdev_device *device)	3	@@ -1015,7 +1015,7 @@ evdev_sync_device(struct evdev_device *device)
12	evdev_device_dispatch_one(device, &ev);	4	evdev_device_dispatch_one(device, &ev);
13	} while (rc == LIBEVDEV_READ_STATUS_SYNC);	5	} while (rc == LIBEVDEV_READ_STATUS_SYNC);
14		6
Lines 17-23 Link Here
17	}	9	}
18		10
19	static void	11	static void
20	@@ -943,6 +943,17 @@ evdev_device_dispatch(void *data)	12	@@ -1053,6 +1053,17 @@ evdev_device_dispatch(void *data)
21		13
22	if (rc != -EAGAIN && rc != -EINTR) {	14	if (rc != -EAGAIN && rc != -EINTR) {
23	libinput_remove_source(libinput, device->source);	15	libinput_remove_source(libinput, device->source);

Lines 6-11 Link Here

(-)x11/libinput/pkg-plist (-2 / +6 lines)
6	libdata/pkgconfig/libinput.pc	6	libdata/pkgconfig/libinput.pc
7	libexec/libinput/libinput-debug-events	7	libexec/libinput/libinput-debug-events
8	%%DEBUG_GUI%%libexec/libinput/libinput-debug-gui	8	%%DEBUG_GUI%%libexec/libinput/libinput-debug-gui
		9	libexec/libinput/libinput-debug-tablet
9	libexec/libinput/libinput-list-devices	10	libexec/libinput/libinput-list-devices
10	libexec/libinput/libinput-measure	11	libexec/libinput/libinput-measure
11	libexec/libinput/libinput-measure-fuzz	12	libexec/libinput/libinput-measure-fuzz
Lines 17-22 Link Here
17	libexec/libinput/libinput-replay	18	libexec/libinput/libinput-replay
18	man/man1/libinput-debug-events.1.gz	19	man/man1/libinput-debug-events.1.gz
19	%%DEBUG_GUI%%man/man1/libinput-debug-gui.1.gz	20	%%DEBUG_GUI%%man/man1/libinput-debug-gui.1.gz
		21	man/man1/libinput-debug-tablet.1.gz
20	man/man1/libinput-list-devices.1.gz	22	man/man1/libinput-list-devices.1.gz
21	man/man1/libinput-measure-fuzz.1.gz	23	man/man1/libinput-measure-fuzz.1.gz
22	man/man1/libinput-measure-touch-size.1.gz	24	man/man1/libinput-measure-touch-size.1.gz
Lines 35-46 Link Here
35	%%DATADIR%%/30-vendor-aiptek.quirks	37	%%DATADIR%%/30-vendor-aiptek.quirks
36	%%DATADIR%%/30-vendor-alps.quirks	38	%%DATADIR%%/30-vendor-alps.quirks
37	%%DATADIR%%/30-vendor-contour.quirks	39	%%DATADIR%%/30-vendor-contour.quirks
38	%%DATADIR%%/30-vendor-cyapa.quirks	40	%%DATADIR%%/30-vendor-cypress.quirks
39	%%DATADIR%%/30-vendor-elantech.quirks	41	%%DATADIR%%/30-vendor-elantech.quirks
40	%%DATADIR%%/30-vendor-huion.quirks
41	%%DATADIR%%/30-vendor-ibm.quirks	42	%%DATADIR%%/30-vendor-ibm.quirks
42	%%DATADIR%%/30-vendor-kensington.quirks	43	%%DATADIR%%/30-vendor-kensington.quirks
43	%%DATADIR%%/30-vendor-logitech.quirks	44	%%DATADIR%%/30-vendor-logitech.quirks
		45	%%DATADIR%%/30-vendor-madcatz.quirks
44	%%DATADIR%%/30-vendor-microsoft.quirks	46	%%DATADIR%%/30-vendor-microsoft.quirks
45	%%DATADIR%%/30-vendor-razer.quirks	47	%%DATADIR%%/30-vendor-razer.quirks
46	%%DATADIR%%/30-vendor-synaptics.quirks	48	%%DATADIR%%/30-vendor-synaptics.quirks
Lines 56-58 Link Here
56	%%DATADIR%%/50-system-hp.quirks	58	%%DATADIR%%/50-system-hp.quirks
57	%%DATADIR%%/50-system-lenovo.quirks	59	%%DATADIR%%/50-system-lenovo.quirks
58	%%DATADIR%%/50-system-system76.quirks	60	%%DATADIR%%/50-system-system76.quirks
		61	%%DATADIR%%/50-system-toshiba.quirks
		62	share/zsh/site-functions/_libinput