From 39f7b160aa1d9fe596f6770810cfafd552b42830 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 28 Aug 2019 15:22:41 +0000 Subject: [PATCH] x11/libinput: update to 1.15.0 Changes: https://gitlab.freedesktop.org/libinput/libinput/compare/1.12.6...1.15.0 --- x11/libinput/Makefile | 3 +-- x11/libinput/distinfo | 6 +++--- x11/libinput/files/patch-meson.build | 27 +++++++++------------------ x11/libinput/pkg-plist | 8 ++++++-- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/x11/libinput/Makefile b/x11/libinput/Makefile index 149338d6ea51..49796e91c104 100644 --- a/x11/libinput/Makefile +++ b/x11/libinput/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libinput -PORTVERSION= 1.12.6 -PORTREVISION= 1 +PORTVERSION= 1.15.0 CATEGORIES= x11 MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ diff --git a/x11/libinput/distinfo b/x11/libinput/distinfo index 5a5d44988ab7..6933dacf2622 100644 --- a/x11/libinput/distinfo +++ b/x11/libinput/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548226824 -SHA256 (libinput-1.12.6.tar.xz) = 12b4023a3fc683d3d8127db573bdf925a2ef366615042f69c87e57c32a50f45d -SIZE (libinput-1.12.6.tar.xz) = 518784 +TIMESTAMP = 1578047368 +SHA256 (libinput-1.15.0.tar.xz) = bfbf1fef66bcb2be871a18783dfcfb88ecb431f496bf0a9cf6685fd29c5843e1 +SIZE (libinput-1.15.0.tar.xz) = 573364 diff --git a/x11/libinput/files/patch-meson.build b/x11/libinput/files/patch-meson.build index 7afe5a39aecc..c90f450c9557 100644 --- a/x11/libinput/files/patch-meson.build +++ b/x11/libinput/files/patch-meson.build @@ -1,6 +1,6 @@ ---- meson.build.orig 2019-01-21 01:28:48 UTC +--- meson.build.orig 2020-01-03 10:29:28 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) - -+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 + + ############ Check for leftover udev rules ######## - 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', diff --git a/x11/libinput/pkg-plist b/x11/libinput/pkg-plist index 44e033c8f155..6a93baf73cb2 100644 --- a/x11/libinput/pkg-plist +++ b/x11/libinput/pkg-plist @@ -6,6 +6,7 @@ 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 @@ -17,6 +18,7 @@ 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 @@ -35,12 +37,12 @@ man/man1/libinput.1.gz %%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 @@ man/man1/libinput.1.gz %%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