Attachment #187854 for bug #222905




# $FreeBSD$

PORTNAME=	libinput
PORTVERSION=	1.9.1
CATEGORIES=	x11
MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/

MAINTAINER=	x11@FreeBSD.org
COMMENT=	Generic input library

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
LIB_DEPENDS=	libevdev.so:devel/libevdev \
		libepoll-shim.so:devel/libepoll-shim \

		libudev.so:devel/libudev-devd \
		libmtdev.so:devel/libmtdev

USES=		meson pkgconfig tar:xz
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes

MESON_ARGS+=	-Ddocumentation=false -Dtests=false

OPTIONS_SUB=	yes
OPTIONS_DEFINE=	DEBUGGUI

DEBUGGUI_DESC=		GUI tool for input testing/debugging
DEBUGGUI_USE=		GNOME=gtk30,cairo,glib20
DEBUGGUI_MESON_OFF=	-Ddebug-gui=false

post-patch:
	${REINPLACE_CMD} -e 's|program_invocation_short_name|getprogname()|' \

Lines 1-3 Link Here

(-)b/x11/libinput/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1486789508	1	TIMESTAMP = 1510140359
2	SHA256 (libinput-1.6.0.tar.xz) = b7534f518d735c643aedca2fb4694683dfddc8d0600cfb628c87a18e65255832	2	SHA256 (libinput-1.9.1.tar.xz) = f0780de4211b3d09f86c17f619f936261a213ca532f8c9ec8f8e7e43422a65f8
3	SIZE (libinput-1.6.0.tar.xz) = 927656	3	SIZE (libinput-1.9.1.tar.xz) = 456772

Removed Link Here

(-)a/x11/libinput/files/patch-Makefile.am (-8 lines)
1	--- Makefile.am.orig 2017-02-11 05:10:33 UTC
2	+++ Makefile.am
3	@@ -1,4 +1,4 @@
4	-SUBDIRS = src doc test tools udev
5	+SUBDIRS = src doc tools udev
6
7	ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
8




--- include/linux/input.h.orig	2017-10-30 05:16:22 UTC
+++ include/linux/input.h
@@ -11,7 +11,18 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>

+#define __u8 uint8_t
+#define __u16 uint16_t
+#define __u32 uint32_t
+#define __u64 uint64_t
+#define __s16 int16_t
+#define __s32 int32_t
+#define _IOC_READ IOC_OUT

 #include <linux/types.h>
+#endif
 
 #include "input-event-codes.h"
 
@@ -145,7 +156,7 @@ struct input_mask {
  *
  * If the request code is not an ABS_MT value, -EINVAL is returned.
  */

 
 #define EVIOCGKEY(len)		_IOC(_IOC_READ, 'E', 0x18, len)		/* get global key state */
 #define EVIOCGLED(len)		_IOC(_IOC_READ, 'E', 0x19, len)		/* get all LEDs */
@@ -160,7 +171,7 @@ struct input_mask {
 #define EVIOCRMFF		_IOW('E', 0x81, int)			/* Erase a force effect */
 #define EVIOCGEFFECTS		_IOR('E', 0x84, int)			/* Report number of effects playable at the same time */
 

+#define EVIOCGRAB		_IO('E', 0x90)				/* Grab/Release device */
 #define EVIOCREVOKE		_IOW('E', 0x91, int)			/* Revoke device access */
 
 /**




--- meson.build.orig	2017-10-30 05:16:22 UTC
+++ meson.build
@@ -44,6 +44,8 @@ pkgconfig = import('pkgconfig')
 dep_udev = dependency('libudev')
 dep_mtdev = dependency('mtdev', version : '>= 1.1.0')
 dep_libevdev = dependency('libevdev', version : '>= 0.4')
+dep_libepoll = declare_dependency(link_args : ['-lepoll-shim'], include_directories : [
+     include_directories(join_paths(get_option('prefix'), 'include', 'libepoll-shim')) ])
 dep_lm = cc.find_library('m', required : false)
 dep_rt = cc.find_library('rt', required : false)
 
@@ -145,7 +147,9 @@ src_libfilter = [
 		'src/filter.h',
 		'src/filter-private.h'
 ]
-libfilter = static_library('filter', src_libfilter)
+libfilter = static_library('filter', src_libfilter,
+			   dependencies : dep_udev,
+			   include_directories : includes_include)
 dep_libfilter = declare_dependency(link_with : libfilter)
 
 ############ libinput.so ############
@@ -184,6 +188,7 @@ deps_libinput = [
 	dep_mtdev,
 	dep_udev,
 	dep_libevdev,
+	dep_libepoll,
 	dep_lm,
 	dep_rt,
 	dep_libwacom,




--- src/Makefile.am.orig	2017-02-11 05:10:33 UTC
+++ src/Makefile.am
@@ -38,6 +38,7 @@ libinput_la_LIBADD = $(MTDEV_LIBS) \
 		     $(LIBUDEV_LIBS) \
 		     $(LIBEVDEV_LIBS) \
 		     $(LIBWACOM_LIBS) \
+		     -lepoll-shim \
 		     libinput-util.la
 
 libinput_la_CFLAGS = -I$(top_srcdir)/include \
@@ -61,8 +62,8 @@ libfilter_la_SOURCES = \
 	filter.c \
 	filter.h \
 	filter-private.h
-libfilter_la_LIBADD =
-libfilter_la_CFLAGS =
+libfilter_la_LIBADD = $(LIBUDEV_LIBS)
+libfilter_la_CFLAGS = -I$(top_srcdir)/include $(LIBUDEV_CFLAGS)
 
 libinput_la_LDFLAGS = -version-info $(LIBINPUT_LT_VERSION) -shared \
 		      -Wl,--version-script=$(srcdir)/libinput.sym




--- src/libinput-util.c.orig	2017-01-17 04:53:51 UTC
+++ src/libinput-util.c
@@ -36,6 +36,9 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef __FreeBSD__
+#include <xlocale.h>
+#endif
 
 #include "libinput-util.h"
 #include "libinput-private.h"




--- src/libinput-util.h.orig	2017-10-30 05:16:22 UTC
+++ src/libinput-util.h
@@ -39,6 +39,9 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#ifdef __FreeBSD__
+#include <xlocale.h>
+#endif
 
 #include "libinput.h"
 




--- tools/Makefile.am.orig	2017-02-11 05:10:33 UTC
+++ tools/Makefile.am
@@ -11,8 +11,8 @@ AM_CXXFLAGS = $(GCC_CXXFLAGS)
 libshared_la_SOURCES = \
 		       shared.c \
 		       shared.h
-libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS)
-libshared_la_LIBADD = $(LIBEVDEV_LIBS)
+libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS) $(LIBUDEV_CFLAGS)
+libshared_la_LIBADD = $(LIBEVDEV_LIBS) $(LIBUDEV_LIBS)
 
 event_debug_SOURCES = event-debug.c
 event_debug_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS)
@@ -20,8 +20,9 @@ event_debug_LDFLAGS = -no-install
 event_debug_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS)
 
 ptraccel_debug_SOURCES = ptraccel-debug.c
-ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la
+ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la $(LIBUDEV_LIBS)
 ptraccel_debug_LDFLAGS = -no-install
+ptraccel_debug_CFLAGS = $(LIBUDEV_CFLAGS)
 
 libinput_list_devices_SOURCES = libinput-list-devices.c
 libinput_list_devices_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS)

Removed Link Here

(-)a/x11/libinput/files/patch-udev_Makefile.am (-10 lines)
1	--- udev/Makefile.am.orig 2017-02-11 05:10:33 UTC
2	+++ udev/Makefile.am
3	@@ -19,6 +19,7 @@ endif
4
5	libinput_model_quirks_SOURCES = libinput-model-quirks.c
6	libinput_model_quirks_CFLAGS = \
7	+ -I$(top_srcdir)/include \
8	-I$(top_srcdir)/src \
9	$(LIBUDEV_CFLAGS) \
10	$(GCC_CFLAGS)

Lines 4-7 device handling, input device event processing and abstraction so Link Here

(-)b/x11/libinput/pkg-descr (-1 / +1 lines)
4	minimize the amount of custom input code compositors need to provide	4	minimize the amount of custom input code compositors need to provide
5	the common set of functionality that users expect.	5	the common set of functionality that users expect.
6		6
7	WWW: http://www.freedesktop.org/wiki/Software/libinput/	7	WWW: https://www.freedesktop.org/wiki/Software/libinput/




bin/libinput
bin/libinput-debug-events
bin/libinput-list-devices
include/libinput.h
lib/libinput.so
lib/libinput.so.10
lib/libinput.so.10.13.0
lib/udev/hwdb.d/90-libinput-model-quirks.hwdb
lib/udev/libinput-device-group
lib/udev/libinput-model-quirks
lib/udev/rules.d/80-libinput-device-groups.rules
lib/udev/rules.d/90-libinput-model-quirks.rules
libdata/pkgconfig/libinput.pc
libexec/libinput/libinput-debug-events
%%DEBUGGUI%%libexec/libinput/libinput-debug-gui
libexec/libinput/libinput-list-devices
libexec/libinput/libinput-measure
libexec/libinput/libinput-measure-touch-size
libexec/libinput/libinput-measure-touchpad-pressure
libexec/libinput/libinput-measure-touchpad-tap
libexec/libinput/libinput-measure-trackpoint-range
man/man1/libinput-debug-events.1.gz
%%DEBUGGUI%%man/man1/libinput-debug-gui.1.gz
man/man1/libinput-list-devices.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-trackpoint-range.1.gz
man/man1/libinput-measure.1.gz
man/man1/libinput.1.gz

Return to bug 222905

Lines 1-13 Link Here

(-)b/x11/libinput/Makefile (-5 / +13 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libinput	3	PORTNAME= libinput
4	PORTVERSION= 1.6.0	4	PORTVERSION= 1.9.1
5	CATEGORIES= x11	5	CATEGORIES= x11
6	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/	6	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
9	COMMENT= Generic input library	9	COMMENT= Generic input library
10		10
		11	LICENSE= MIT
		12	LICENSE_FILE= ${WRKSRC}/COPYING
		13
11	BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat	14	BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat
12	LIB_DEPENDS= libevdev.so:devel/libevdev \	15	LIB_DEPENDS= libevdev.so:devel/libevdev \
13	libepoll-shim.so:devel/libepoll-shim \	16	libepoll-shim.so:devel/libepoll-shim \
Lines 15-26 LIB_DEPENDS= libevdev.so:devel/libevdev \ Link Here
15	libudev.so:devel/libudev-devd \	18	libudev.so:devel/libudev-devd \
16	libmtdev.so:devel/libmtdev	19	libmtdev.so:devel/libmtdev
17		20
18	USES= autoreconf gmake libtool pathfix pkgconfig tar:xz	21	USES= meson pkgconfig tar:xz
19	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
20	GNU_CONFIGURE= yes
21		23
22	CPPFLAGS+= -I${LOCALBASE}/include/libepoll-shim	24	MESON_ARGS+= -Ddocumentation=false -Dtests=false
23	INSTALL_TARGET= install-strip	25
		26	OPTIONS_SUB= yes
		27	OPTIONS_DEFINE= DEBUGGUI
		28
		29	DEBUGGUI_DESC= GUI tool for input testing/debugging
		30	DEBUGGUI_USE= GNOME=gtk30,cairo,glib20
		31	DEBUGGUI_MESON_OFF= -Ddebug-gui=false
24		32
25	post-patch:	33	post-patch:
26	${REINPLACE_CMD} -e 's\|program_invocation_short_name\|getprogname()\|' \	34	${REINPLACE_CMD} -e 's\|program_invocation_short_name\|getprogname()\|' \

Lines 1-6 Link Here

(-)b/x11/libinput/files/patch-include_linux_input.h (-7 / +8 lines)
1	--- include/linux/input.h.orig 2016-12-05 05:15:21 UTC	1	--- include/linux/input.h.orig 2017-10-30 05:16:22 UTC
2	+++ include/linux/input.h	2	+++ include/linux/input.h
3	@@ -11,7 +11,17 @@	3	@@ -11,7 +11,18 @@
4	#include <sys/time.h>	4	#include <sys/time.h>
5	#include <sys/ioctl.h>	5	#include <sys/ioctl.h>
6	#include <sys/types.h>	6	#include <sys/types.h>
Lines 8-13 Link Here
8	+#define __u8 uint8_t	8	+#define __u8 uint8_t
9	+#define __u16 uint16_t	9	+#define __u16 uint16_t
10	+#define __u32 uint32_t	10	+#define __u32 uint32_t
		11	+#define __u64 uint64_t
11	+#define __s16 int16_t	12	+#define __s16 int16_t
12	+#define __s32 int32_t	13	+#define __s32 int32_t
13	+#define _IOC_READ IOC_OUT	14	+#define _IOC_READ IOC_OUT
Lines 16-24 Link Here
16	#include <linux/types.h>	17	#include <linux/types.h>
17	+#endif	18	+#endif
18		19
19	/*	20	#include "input-event-codes.h"
20	* The event structure itself	21
21	@@ -132,7 +142,7 @@ struct input_keymap_entry {	22	@@ -145,7 +156,7 @@ struct input_mask {
22	*	23	*
23	* If the request code is not an ABS_MT value, -EINVAL is returned.	24	* If the request code is not an ABS_MT value, -EINVAL is returned.
24	*/	25	*/
Lines 27-33 Link Here
27		28
28	#define EVIOCGKEY(len) _IOC(_IOC_READ, 'E', 0x18, len) /* get global key state */	29	#define EVIOCGKEY(len) _IOC(_IOC_READ, 'E', 0x18, len) /* get global key state */
29	#define EVIOCGLED(len) _IOC(_IOC_READ, 'E', 0x19, len) /* get all LEDs */	30	#define EVIOCGLED(len) _IOC(_IOC_READ, 'E', 0x19, len) /* get all LEDs */
30	@@ -147,7 +157,7 @@ struct input_keymap_entry {	31	@@ -160,7 +171,7 @@ struct input_mask {
31	#define EVIOCRMFF _IOW('E', 0x81, int) /* Erase a force effect */	32	#define EVIOCRMFF _IOW('E', 0x81, int) /* Erase a force effect */
32	#define EVIOCGEFFECTS _IOR('E', 0x84, int) /* Report number of effects playable at the same time */	33	#define EVIOCGEFFECTS _IOR('E', 0x84, int) /* Report number of effects playable at the same time */
33		34
Lines 35-38 Link Here
35	+#define EVIOCGRAB _IO('E', 0x90) /* Grab/Release device */	36	+#define EVIOCGRAB _IO('E', 0x90) /* Grab/Release device */
36	#define EVIOCREVOKE _IOW('E', 0x91, int) /* Revoke device access */	37	#define EVIOCREVOKE _IOW('E', 0x91, int) /* Revoke device access */
37		38
38	#define EVIOCSCLOCKID _IOW('E', 0xa0, int) /* Set clockid to be used for timestamps */	39	/**

Added Link Here

(-)b/x11/libinput/files/patch-meson.build (+30 lines)
1	--- meson.build.orig 2017-10-30 05:16:22 UTC
2	+++ meson.build
3	@@ -44,6 +44,8 @@ pkgconfig = import('pkgconfig')
4	dep_udev = dependency('libudev')
5	dep_mtdev = dependency('mtdev', version : '>= 1.1.0')
6	dep_libevdev = dependency('libevdev', version : '>= 0.4')
7	+dep_libepoll = declare_dependency(link_args : ['-lepoll-shim'], include_directories : [
8	+ include_directories(join_paths(get_option('prefix'), 'include', 'libepoll-shim')) ])
9	dep_lm = cc.find_library('m', required : false)
10	dep_rt = cc.find_library('rt', required : false)
11
12	@@ -145,7 +147,9 @@ src_libfilter = [
13	'src/filter.h',
14	'src/filter-private.h'
15	]
16	-libfilter = static_library('filter', src_libfilter)
17	+libfilter = static_library('filter', src_libfilter,
18	+ dependencies : dep_udev,
19	+ include_directories : includes_include)
20	dep_libfilter = declare_dependency(link_with : libfilter)
21
22	############ libinput.so ############
23	@@ -184,6 +188,7 @@ deps_libinput = [
24	dep_mtdev,
25	dep_udev,
26	dep_libevdev,
27	+ dep_libepoll,
28	dep_lm,
29	dep_rt,
30	dep_libwacom,

Removed Link Here

(-)a/x11/libinput/files/patch-src_Makefile.am (-21 lines)
1	--- src/Makefile.am.orig 2017-02-11 05:10:33 UTC
2	+++ src/Makefile.am
3	@@ -38,6 +38,7 @@ libinput_la_LIBADD = $(MTDEV_LIBS) \
4	$(LIBUDEV_LIBS) \
5	$(LIBEVDEV_LIBS) \
6	$(LIBWACOM_LIBS) \
7	+ -lepoll-shim \
8	libinput-util.la
9
10	libinput_la_CFLAGS = -I$(top_srcdir)/include \
11	@@ -61,8 +62,8 @@ libfilter_la_SOURCES = \
12	filter.c \
13	filter.h \
14	filter-private.h
15	-libfilter_la_LIBADD =
16	-libfilter_la_CFLAGS =
17	+libfilter_la_LIBADD = $(LIBUDEV_LIBS)
18	+libfilter_la_CFLAGS = -I$(top_srcdir)/include $(LIBUDEV_CFLAGS)
19
20	libinput_la_LDFLAGS = -version-info $(LIBINPUT_LT_VERSION) -shared \
21	-Wl,--version-script=$(srcdir)/libinput.sym

Removed Link Here

(-)a/x11/libinput/files/patch-src_libinput-util.c (-12 lines)
1	--- src/libinput-util.c.orig 2017-01-17 04:53:51 UTC
2	+++ src/libinput-util.c
3	@@ -36,6 +36,9 @@
4	#include <stdbool.h>
5	#include <stdio.h>
6	#include <stdlib.h>
7	+#ifdef __FreeBSD__
8	+#include <xlocale.h>
9	+#endif
10
11	#include "libinput-util.h"
12	#include "libinput-private.h"

Added Link Here

(-)b/x11/libinput/files/patch-src_libinput-util.h (+12 lines)
1	--- src/libinput-util.h.orig 2017-10-30 05:16:22 UTC
2	+++ src/libinput-util.h
3	@@ -39,6 +39,9 @@
4	#include <string.h>
5	#include <time.h>
6	#include <unistd.h>
7	+#ifdef __FreeBSD__
8	+#include <xlocale.h>
9	+#endif
10
11	#include "libinput.h"
12

Removed Link Here

(-)a/x11/libinput/files/patch-tools_Makefile.am (-24 lines)
1	--- tools/Makefile.am.orig 2017-02-11 05:10:33 UTC
2	+++ tools/Makefile.am
3	@@ -11,8 +11,8 @@ AM_CXXFLAGS = $(GCC_CXXFLAGS)
4	libshared_la_SOURCES = \
5	shared.c \
6	shared.h
7	-libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS)
8	-libshared_la_LIBADD = $(LIBEVDEV_LIBS)
9	+libshared_la_CFLAGS = $(AM_CFLAGS) $(LIBEVDEV_CFLAGS) $(LIBUDEV_CFLAGS)
10	+libshared_la_LIBADD = $(LIBEVDEV_LIBS) $(LIBUDEV_LIBS)
11
12	event_debug_SOURCES = event-debug.c
13	event_debug_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS)
14	@@ -20,8 +20,9 @@ event_debug_LDFLAGS = -no-install
15	event_debug_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS)
16
17	ptraccel_debug_SOURCES = ptraccel-debug.c
18	-ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la
19	+ptraccel_debug_LDADD = ../src/libfilter.la ../src/libinput.la $(LIBUDEV_LIBS)
20	ptraccel_debug_LDFLAGS = -no-install
21	+ptraccel_debug_CFLAGS = $(LIBUDEV_CFLAGS)
22
23	libinput_list_devices_SOURCES = libinput-list-devices.c
24	libinput_list_devices_LDADD = ../src/libinput.la libshared.la $(LIBUDEV_LIBS)

Lines 1-14 Link Here

(-)b/x11/libinput/pkg-plist (-1 / +17 lines)
		1	bin/libinput
1	bin/libinput-debug-events	2	bin/libinput-debug-events
2	bin/libinput-list-devices	3	bin/libinput-list-devices
3	include/libinput.h	4	include/libinput.h
4	lib/libinput.so	5	lib/libinput.so
5	lib/libinput.so.10	6	lib/libinput.so.10
6	lib/libinput.so.10.11.2	7	lib/libinput.so.10.13.0
7	lib/udev/hwdb.d/90-libinput-model-quirks.hwdb	8	lib/udev/hwdb.d/90-libinput-model-quirks.hwdb
8	lib/udev/libinput-device-group	9	lib/udev/libinput-device-group
9	lib/udev/libinput-model-quirks	10	lib/udev/libinput-model-quirks
10	lib/udev/rules.d/80-libinput-device-groups.rules	11	lib/udev/rules.d/80-libinput-device-groups.rules
11	lib/udev/rules.d/90-libinput-model-quirks.rules	12	lib/udev/rules.d/90-libinput-model-quirks.rules
12	libdata/pkgconfig/libinput.pc	13	libdata/pkgconfig/libinput.pc
		14	libexec/libinput/libinput-debug-events
		15	%%DEBUGGUI%%libexec/libinput/libinput-debug-gui
		16	libexec/libinput/libinput-list-devices
		17	libexec/libinput/libinput-measure
		18	libexec/libinput/libinput-measure-touch-size
		19	libexec/libinput/libinput-measure-touchpad-pressure
		20	libexec/libinput/libinput-measure-touchpad-tap
		21	libexec/libinput/libinput-measure-trackpoint-range
13	man/man1/libinput-debug-events.1.gz	22	man/man1/libinput-debug-events.1.gz
		23	%%DEBUGGUI%%man/man1/libinput-debug-gui.1.gz
14	man/man1/libinput-list-devices.1.gz	24	man/man1/libinput-list-devices.1.gz
		25	man/man1/libinput-measure-touch-size.1.gz
		26	man/man1/libinput-measure-touchpad-pressure.1.gz
		27	man/man1/libinput-measure-touchpad-tap.1.gz
		28	man/man1/libinput-measure-trackpoint-range.1.gz
		29	man/man1/libinput-measure.1.gz
		30	man/man1/libinput.1.gz