Index: head/x11/libinput/Makefile =================================================================== --- head/x11/libinput/Makefile (revision 525885) +++ head/x11/libinput/Makefile (revision 525886) @@ -1,47 +1,46 @@ # $FreeBSD$ PORTNAME= libinput -PORTVERSION= 1.12.6 -PORTREVISION= 1 +PORTVERSION= 1.15.1 CATEGORIES= x11 MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ MAINTAINER= x11@FreeBSD.org COMMENT= Generic input library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}evdev>0:devel/py-evdev@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyudev>0:devel/py-pyudev@${PY_FLAVOR} LIB_DEPENDS= libevdev.so:devel/libevdev \ libepoll-shim.so:devel/libepoll-shim \ libudev.so:devel/libudev-devd \ libmtdev.so:devel/libmtdev USES= localbase meson pkgconfig python:3.4+,run shebangfix tar:xz USE_LDCONFIG= yes MESON_ARGS+= -Ddocumentation=false -Dtests=false python_OLD_CMD= "/usr/bin/env python3" SHEBANG_FILES= tools/libinput-measure-fuzz.py \ tools/libinput-measure-touch-size.py \ tools/libinput-measure-touchpad-pressure.py \ tools/libinput-measure-touchpad-tap.py \ tools/libinput-replay OPTIONS_DEFINE= DEBUG_GUI LIBWACOM OPTIONS_DEFAULT=LIBWACOM OPTIONS_SUB= yes DEBUG_GUI_DESC= Build the GUI event viewer LIBWACOM_DESC= Libwacom support DEBUG_GUI_USES= gnome DEBUG_GUI_USE= GNOME=gtk30,glib20,cairo DEBUG_GUI_MESON_TRUE= debug-gui LIBWACOM_LIB_DEPENDS= libwacom.so:x11/libwacom LIBWACOM_MESON_TRUE= libwacom .include Index: head/x11/libinput/distinfo =================================================================== --- head/x11/libinput/distinfo (revision 525885) +++ head/x11/libinput/distinfo (revision 525886) @@ -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: head/x11/libinput/files/patch-meson.build =================================================================== --- head/x11/libinput/files/patch-meson.build (revision 525885) +++ head/x11/libinput/files/patch-meson.build (revision 525886) @@ -1,29 +1,20 @@ ---- 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 ############ +if false + 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) - -+endif +@@ -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) + - ############ libepoll-shim (BSD) ############ ++endif - 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: head/x11/libinput/pkg-plist =================================================================== --- head/x11/libinput/pkg-plist (revision 525885) +++ head/x11/libinput/pkg-plist (revision 525886) @@ -1,58 +1,62 @@ bin/libinput include/libinput.h lib/libinput.so lib/libinput.so.10 lib/libinput.so.10.13.0 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-measure-touch-size libexec/libinput/libinput-measure-touchpad-pressure libexec/libinput/libinput-measure-touchpad-tap libexec/libinput/libinput-quirks libexec/libinput/libinput-record 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 man/man1/libinput-measure-touchpad-pressure.1.gz man/man1/libinput-measure-touchpad-tap.1.gz man/man1/libinput-measure.1.gz man/man1/libinput-quirks-list.1.gz man/man1/libinput-quirks-validate.1.gz man/man1/libinput-quirks.1.gz man/man1/libinput-record.1.gz man/man1/libinput-replay.1.gz man/man1/libinput.1.gz %%DATADIR%%/10-generic-keyboard.quirks %%DATADIR%%/10-generic-lid.quirks %%DATADIR%%/10-generic-trackball.quirks %%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 %%DATADIR%%/30-vendor-vmware.quirks %%DATADIR%%/30-vendor-wacom.quirks %%DATADIR%%/50-system-acer.quirks %%DATADIR%%/50-system-apple.quirks %%DATADIR%%/50-system-asus.quirks %%DATADIR%%/50-system-chicony.quirks %%DATADIR%%/50-system-cyborg.quirks %%DATADIR%%/50-system-dell.quirks %%DATADIR%%/50-system-google.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