Attachment 211544 Details for Bug 240153 – v3

[patch] v3

ports.x11.libinput.1.15.1.diff (text/plain), 5.14 KB, created by Niclas Zeising on 2020-02-10 20:45:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas Zeising

Created: 2020-02-10 20:45:55 UTC

Size: 5.14 KB

patch

obsolete

>Index: x11/libinput/Makefile
>===================================================================
>--- x11/libinput/Makefile	(revision 525727)
>+++ x11/libinput/Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	libinput
>-PORTVERSION=	1.12.6
>-PORTREVISION=	1
>+PORTVERSION=	1.15.1
> CATEGORIES=	x11
> MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/
> 
>Index: x11/libinput/distinfo
>===================================================================
>--- x11/libinput/distinfo	(revision 525727)
>+++ x11/libinput/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1548226824
>-SHA256 (libinput-1.12.6.tar.xz) = 12b4023a3fc683d3d8127db573bdf925a2ef366615042f69c87e57c32a50f45d
>-SIZE (libinput-1.12.6.tar.xz) = 518784
>+TIMESTAMP = 1581363218
>+SHA256 (libinput-1.15.1.tar.xz) = 6b2f57495c6f173ecf49ee19d3e10087d9916a52711e1b5eb01e0d9635950c16
>+SIZE (libinput-1.15.1.tar.xz) = 579236
>Index: x11/libinput/files/patch-meson.build
>===================================================================
>--- x11/libinput/files/patch-meson.build	(revision 525727)
>+++ x11/libinput/files/patch-meson.build	(working copy)
>@@ -1,6 +1,6 @@
>---- meson.build.orig	2019-01-21 01:28:48 UTC
>+--- meson.build.orig	2020-02-03 05:25:43 UTC
> +++ meson.build
>-@@ -145,6 +145,8 @@ endif
>+@@ -152,6 +152,8 @@ endif
>  
>  ############ udev bits ############
>  
>@@ -9,21 +9,12 @@
>  executable('libinput-device-group',
>  	   'udev/libinput-device-group.c',
>  	   dependencies : [dep_udev, dep_libwacom],
>-@@ -182,6 +184,8 @@ litest_model_quirks_file = configure_file(input : 'ude
>- 					  install : false,
>- 					  configuration : litest_udev_rules_config)
>- 
>+@@ -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) ############
>  
>- if cc.has_header_symbol('sys/epoll.h', 'epoll_create1', prefix : prefix)
>-@@ -634,7 +638,7 @@ executable('test-build-std-gnuc90',
>- 	   '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',
>+ ############ Check for leftover udev rules ########
>+ 
>Index: x11/libinput/files/patch-src_evdev.c
>===================================================================
>--- x11/libinput/files/patch-src_evdev.c	(revision 525727)
>+++ x11/libinput/files/patch-src_evdev.c	(working copy)
>@@ -1,14 +1,6 @@
>-When a process without full /dev/input access enumerates devices via libudev-devd,
>-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.orig	2020-02-03 05:25:43 UTC
> +++ src/evdev.c
>-@@ -905,7 +905,7 @@ evdev_sync_device(struct evdev_device *device)
>+@@ -1015,7 +1015,7 @@ evdev_sync_device(struct evdev_device *device)
>  		evdev_device_dispatch_one(device, &ev);
>  	} while (rc == LIBEVDEV_READ_STATUS_SYNC);
>  
>@@ -17,7 +9,7 @@
>  }
>  
>  static void
>-@@ -943,6 +943,17 @@ evdev_device_dispatch(void *data)
>+@@ -1053,6 +1053,17 @@ evdev_device_dispatch(void *data)
>  
>  	if (rc != -EAGAIN && rc != -EINTR) {
>  		libinput_remove_source(libinput, device->source);
>Index: x11/libinput/pkg-plist
>===================================================================
>--- x11/libinput/pkg-plist	(revision 525727)
>+++ x11/libinput/pkg-plist	(working copy)
>@@ -6,6 +6,7 @@
> 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
>@@ -17,6 +18,7 @@
> 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
>@@ -35,12 +37,12 @@
> %%DATADIR%%/30-vendor-aiptek.quirks
> %%DATADIR%%/30-vendor-alps.quirks
> %%DATADIR%%/30-vendor-contour.quirks
>-%%DATADIR%%/30-vendor-cyapa.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
>@@ -56,3 +58,5 @@
> %%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

Actions: View | Diff

Attachments on bug 240153: 206960 | 210455 | 211544