Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 861daf1

Browse files
tcbernertcberner
committedDec 31, 2018
Import libinput 1.12.4 from
FreeBSDDesktop/freebsd-ports@100511f
1 parent 9b845b9 commit 861daf1

13 files changed

+70
-4404
lines changed
 

‎x11/libinput/Makefile

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# $FreeBSD$
22

33
PORTNAME= libinput
4-
PORTVERSION= 1.11.3
4+
PORTVERSION= 1.12.4
55
CATEGORIES= x11
66
MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/
77

@@ -11,7 +11,6 @@ COMMENT= Generic input library
1111
LICENSE= MIT
1212
LICENSE_FILE= ${WRKSRC}/COPYING
1313

14-
BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
1514
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}evdev>0:devel/py-evdev@${PY_FLAVOR} \
1615
${PYTHON_PKGNAMEPREFIX}pyudev>0:devel/py-pyudev@${PY_FLAVOR}
1716
LIB_DEPENDS= libevdev.so:devel/libevdev \
@@ -20,25 +19,25 @@ LIB_DEPENDS= libevdev.so:devel/libevdev \
2019
libmtdev.so:devel/libmtdev
2120

2221
USES= localbase meson pkgconfig python:3.4+,run shebangfix tar:xz
22+
USE_LDCONFIG= yes
2323

2424
MESON_ARGS+= -Ddocumentation=false -Dtests=false
25-
INSTALL_TARGET= install-strip
2625

2726
python_OLD_CMD= "/usr/bin/env python3"
28-
SHEBANG_FILES= tools/libinput-measure-fuzz \
29-
tools/libinput-measure-touch-size \
30-
tools/libinput-measure-touchpad-pressure \
31-
tools/libinput-measure-touchpad-tap \
32-
tools/libinput-measure-trackpoint-range \
27+
SHEBANG_FILES= tools/libinput-measure-fuzz.py \
28+
tools/libinput-measure-touch-size.py \
29+
tools/libinput-measure-touchpad-pressure.py \
30+
tools/libinput-measure-touchpad-tap.py \
3331
tools/libinput-replay
3432

3533
OPTIONS_DEFINE= DEBUG_GUI LIBWACOM
3634
OPTIONS_DEFAULT=LIBWACOM
3735
OPTIONS_SUB= yes
38-
36+
3937
DEBUG_GUI_DESC= Build the GUI event viewer
4038
LIBWACOM_DESC= Libwacom support
4139

40+
DEBUG_GUI_USES= gnome
4241
DEBUG_GUI_USE= GNOME=gtk30,glib20,cairo
4342
DEBUG_GUI_MESON_TRUE= debug-gui
4443
LIBWACOM_LIB_DEPENDS= libwacom.so:x11/libwacom

‎x11/libinput/distinfo

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1532702018
2-
SHA256 (libinput-1.11.3.tar.xz) = f31191d96e425b4f16319842279d65946d9d983dcd3d9e466ae1206aa10ecb06
3-
SIZE (libinput-1.11.3.tar.xz) = 487408
1+
TIMESTAMP = 1546272208
2+
SHA256 (libinput-1.12.4.tar.xz) = a4f329641c2e2d98199840f99792f646a3041256a380d074e00200991fcb31e6
3+
SIZE (libinput-1.12.4.tar.xz) = 519596

‎x11/libinput/files/patch-0e03784e.c

-35
This file was deleted.

‎x11/libinput/files/patch-4e3ea4b8.c

-73
This file was deleted.

‎x11/libinput/files/patch-61f3e385.c

-4,069
This file was deleted.

‎x11/libinput/files/patch-ef9b7e88.c

-17
This file was deleted.

‎x11/libinput/files/patch-f8b41205.c

-104
This file was deleted.

‎x11/libinput/files/patch-meson.build

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- meson.build.orig 2018-12-31 16:13:39 UTC
2+
+++ meson.build
3+
@@ -145,6 +145,8 @@ endif
4+
5+
############ udev bits ############
6+
7+
+if false
8+
+
9+
executable('libinput-device-group',
10+
'udev/libinput-device-group.c',
11+
dependencies : [dep_udev, dep_libwacom],
12+
@@ -181,6 +183,8 @@ litest_model_quirks_file = configure_file(input : 'ude
13+
output : '90-libinput-model-quirks-litest.rules',
14+
install : false,
15+
configuration : litest_udev_rules_config)
16+
+
17+
+endif
18+
19+
############ libepoll-shim (BSD) ############
20+

‎x11/libinput/files/patch-src_evdev.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ libinput reopens devices just to check path equality.
66
The udev_devices from reopening do have the right properties,
77
so we just use them instead of the original (enumerated) ones.
88

9-
--- src/evdev.c.orig 2018-06-09 12:13:43 UTC
9+
--- src/evdev.c.orig 2018-12-18 05:06:18 UTC
1010
+++ src/evdev.c
11-
@@ -895,7 +895,7 @@ evdev_sync_device(struct evdev_device *device)
11+
@@ -905,7 +905,7 @@ evdev_sync_device(struct evdev_device *device)
1212
evdev_device_dispatch_one(device, &ev);
1313
} while (rc == LIBEVDEV_READ_STATUS_SYNC);
1414

@@ -17,7 +17,7 @@ so we just use them instead of the original (enumerated) ones.
1717
}
1818

1919
static void
20-
@@ -933,6 +933,17 @@ evdev_device_dispatch(void *data)
20+
@@ -943,6 +943,17 @@ evdev_device_dispatch(void *data)
2121

2222
if (rc != -EAGAIN && rc != -EINTR) {
2323
libinput_remove_source(libinput, device->source);
@@ -35,7 +35,7 @@ so we just use them instead of the original (enumerated) ones.
3535
device->source = NULL;
3636
}
3737
}
38-
@@ -1785,9 +1796,9 @@ evdev_notify_added_device(struct evdev_device *device)
38+
@@ -1835,9 +1846,9 @@ evdev_notify_added_device(struct evdev_device *device)
3939
}
4040

4141
static bool
@@ -47,7 +47,7 @@ so we just use them instead of the original (enumerated) ones.
4747
struct udev_device *udev_device_new = NULL;
4848
struct stat st;
4949
bool rc = false;
50-
@@ -1800,10 +1811,16 @@ evdev_device_have_same_syspath(struct udev_device *ude
50+
@@ -1850,10 +1861,16 @@ evdev_device_have_same_syspath(struct udev_device *ude
5151
goto out;
5252

5353
rc = streq(udev_device_get_syspath(udev_device_new),
@@ -67,7 +67,7 @@ so we just use them instead of the original (enumerated) ones.
6767
return rc;
6868
}
6969

70-
@@ -2003,7 +2020,7 @@ evdev_device_create(struct libinput_seat *seat,
70+
@@ -2036,7 +2053,7 @@ evdev_device_create(struct libinput_seat *seat,
7171
return NULL;
7272
}
7373

@@ -76,7 +76,7 @@ so we just use them instead of the original (enumerated) ones.
7676
goto err;
7777

7878
device = zalloc(sizeof *device);
79-
@@ -2559,7 +2576,7 @@ evdev_device_resume(struct evdev_device *device)
79+
@@ -2592,7 +2609,7 @@ evdev_device_resume(struct evdev_device *device)
8080
if (fd < 0)
8181
return -errno;
8282

‎x11/libinput/files/patch-src_evdev.c.fixdrop

-12
This file was deleted.

‎x11/libinput/files/patch-src_evdev.c.reopen

-60
This file was deleted.

‎x11/libinput/files/patch-src_quirks.c

-11
This file was deleted.

‎x11/libinput/pkg-plist

+32-4
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,46 @@ libexec/libinput/libinput-measure-fuzz
1212
libexec/libinput/libinput-measure-touch-size
1313
libexec/libinput/libinput-measure-touchpad-pressure
1414
libexec/libinput/libinput-measure-touchpad-tap
15-
libexec/libinput/libinput-measure-trackpoint-range
15+
libexec/libinput/libinput-quirks
1616
libexec/libinput/libinput-record
1717
libexec/libinput/libinput-replay
18-
man/man1/libinput.1.gz
1918
man/man1/libinput-debug-events.1.gz
2019
%%DEBUG_GUI%%man/man1/libinput-debug-gui.1.gz
2120
man/man1/libinput-list-devices.1.gz
22-
man/man1/libinput-measure.1.gz
2321
man/man1/libinput-measure-fuzz.1.gz
2422
man/man1/libinput-measure-touch-size.1.gz
2523
man/man1/libinput-measure-touchpad-pressure.1.gz
2624
man/man1/libinput-measure-touchpad-tap.1.gz
27-
man/man1/libinput-measure-trackpoint-range.1.gz
25+
man/man1/libinput-measure.1.gz
26+
man/man1/libinput-quirks-list.1.gz
27+
man/man1/libinput-quirks-validate.1.gz
28+
man/man1/libinput-quirks.1.gz
2829
man/man1/libinput-record.1.gz
2930
man/man1/libinput-replay.1.gz
31+
man/man1/libinput.1.gz
32+
%%DATADIR%%/10-generic-keyboard.quirks
33+
%%DATADIR%%/10-generic-lid.quirks
34+
%%DATADIR%%/10-generic-trackball.quirks
35+
%%DATADIR%%/30-vendor-aiptek.quirks
36+
%%DATADIR%%/30-vendor-alps.quirks
37+
%%DATADIR%%/30-vendor-cyapa.quirks
38+
%%DATADIR%%/30-vendor-elantech.quirks
39+
%%DATADIR%%/30-vendor-huion.quirks
40+
%%DATADIR%%/30-vendor-ibm.quirks
41+
%%DATADIR%%/30-vendor-kensington.quirks
42+
%%DATADIR%%/30-vendor-logitech.quirks
43+
%%DATADIR%%/30-vendor-microsoft.quirks
44+
%%DATADIR%%/30-vendor-razer.quirks
45+
%%DATADIR%%/30-vendor-synaptics.quirks
46+
%%DATADIR%%/30-vendor-vmware.quirks
47+
%%DATADIR%%/30-vendor-wacom.quirks
48+
%%DATADIR%%/50-system-acer.quirks
49+
%%DATADIR%%/50-system-apple.quirks
50+
%%DATADIR%%/50-system-asus.quirks
51+
%%DATADIR%%/50-system-chicony.quirks
52+
%%DATADIR%%/50-system-cyborg.quirks
53+
%%DATADIR%%/50-system-dell.quirks
54+
%%DATADIR%%/50-system-google.quirks
55+
%%DATADIR%%/50-system-hp.quirks
56+
%%DATADIR%%/50-system-lenovo.quirks
57+
%%DATADIR%%/50-system-system76.quirks

0 commit comments

Comments
 (0)
Please sign in to comment.