Attachment #187052 for bug #222905




# $FreeBSD$

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


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

USES=		autoreconf gmake libtool pathfix pkgconfig localbase tar:xz
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes

CONFIGURE_ARGS+=	--disable-documentation
CPPFLAGS+=	-I${LOCALBASE}/include/libepoll-shim
INSTALL_TARGET=	install-strip


Lines 1-3 Link Here

(-)i/x11/libinput/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1486789508	1	TIMESTAMP = 1507646518
2	SHA256 (libinput-1.6.0.tar.xz) = b7534f518d735c643aedca2fb4694683dfddc8d0600cfb628c87a18e65255832	2	SHA256 (libinput-1.8.0.tar.xz) = f8c9dbc31bf549008486258ebfa328d3dbc749c0029c6168e46949c24cf19076
3	SIZE (libinput-1.6.0.tar.xz) = 927656	3	SIZE (libinput-1.8.0.tar.xz) = 939708




--- 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)




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
libexec/libinput/libinput-debug-gui
libexec/libinput/libinput-list-devices
libexec/libinput/libinput-measure
libexec/libinput/libinput-measure-touchpad-tap
man/man1/libinput-debug-events.1.gz
man/man1/libinput-list-devices.1.gz

Return to bug 222905

Lines 1-7 Link Here

(-)i/x11/libinput/Makefile (-2 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libinput	3	PORTNAME= libinput
4	PORTVERSION= 1.6.0	4	PORTVERSION= 1.8.0
5	CATEGORIES= x11	5	CATEGORIES= x11
6	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/	6	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/
7		7
Lines 15-24 LIB_DEPENDS= libevdev.so:devel/libevdev \ Link Here
15	libudev.so:devel/libudev-devd \	15	libudev.so:devel/libudev-devd \
16	libmtdev.so:devel/libmtdev	16	libmtdev.so:devel/libmtdev
17		17
18	USES= autoreconf gmake libtool pathfix pkgconfig tar:xz	18	USES= autoreconf gmake libtool pathfix pkgconfig localbase tar:xz
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21		21
		22	CONFIGURE_ARGS+= --disable-documentation
22	CPPFLAGS+= -I${LOCALBASE}/include/libepoll-shim	23	CPPFLAGS+= -I${LOCALBASE}/include/libepoll-shim
23	INSTALL_TARGET= install-strip	24	INSTALL_TARGET= install-strip
24		25

Removed Link Here

(-)c/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

(-)i/x11/libinput/pkg-plist (-1 / +7 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	libexec/libinput/libinput-debug-gui
		16	libexec/libinput/libinput-list-devices
		17	libexec/libinput/libinput-measure
		18	libexec/libinput/libinput-measure-touchpad-tap
13	man/man1/libinput-debug-events.1.gz	19	man/man1/libinput-debug-events.1.gz
14	man/man1/libinput-list-devices.1.gz	20	man/man1/libinput-list-devices.1.gz