Attachment #200088 for bug #233787

Lines 3-9 Link Here

(-)b/audio/ardour/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= ardour	4	PORTNAME= ardour
5	PORTVERSION= 2.8.16	5	PORTVERSION= 2.8.16
6	PORTREVISION= 13	6	PORTREVISION= 14
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= http://freebsd.nsu.ru/distfiles/	8	MASTER_SITES= http://freebsd.nsu.ru/distfiles/
9		9
Lines 15-21 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
15		15
16	BROKEN_powerpc64= Does not build	16	BROKEN_powerpc64= Does not build
17		17
18	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	18	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
19	LIB_DEPENDS= libaubio.so:audio/aubio \	19	LIB_DEPENDS= libaubio.so:audio/aubio \
20	libboost_date_time.so:devel/boost-libs \	20	libboost_date_time.so:devel/boost-libs \
21	libcurl.so:ftp/curl \	21	libcurl.so:ftp/curl \

Lines 3-9 Link Here

(-)b/comms/lirc/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= lirc	4	PORTNAME= lirc
5	PORTVERSION= 0.9.0	5	PORTVERSION= 0.9.0
6	PORTREVISION= 9	6	PORTREVISION= 10
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= comms	8	CATEGORIES= comms
9	MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION}	9	MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION}
Lines 11-17 MASTER_SITES= SF/${PORTNAME}/LIRC/${PORTVERSION} Link Here
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Linux Infrared Remote Control	12	COMMENT= Linux Infrared Remote Control
13		13
14	BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	14	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
15		15
16	USES= alias autoreconf gmake libtool localbase python tar:bzip2	16	USES= alias autoreconf gmake libtool localbase python tar:bzip2
17	USE_XORG= sm x11 ice	17	USE_XORG= sm x11 ice

Lines 3-9 Link Here

(-)b/comms/svxlink/Makefile (-2 / +2 lines)
3		3
4	PORTNAME?= svxlink	4	PORTNAME?= svxlink
5	PORTVERSION= 15.11	5	PORTVERSION= 15.11
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= comms hamradio	7	CATEGORIES= comms hamradio
8		8
9	MAINTAINER= hamradio@FreeBSD.org	9	MAINTAINER= hamradio@FreeBSD.org
Lines 20-26 LIB_DEPENDS?= libgsm.so:audio/gsm \ Link Here
20	libopus.so:audio/opus \	20	libopus.so:audio/opus \
21	librtlsdr.so:comms/rtl-sdr	21	librtlsdr.so:comms/rtl-sdr
22	BUILD_DEPENDS= pkg-config:devel/pkgconf \	22	BUILD_DEPENDS= pkg-config:devel/pkgconf \
23	${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	23	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
24		24
25	USES+= cmake compiler:c++11-lang tcl groff	25	USES+= cmake compiler:c++11-lang tcl groff
26	USE_GITHUB= yes	26	USE_GITHUB= yes

Lines 610-615 Link Here

(-)b/devel/Makefile (+1 lines)
610	SUBDIR += etcd33	610	SUBDIR += etcd33
611	SUBDIR += etl	611	SUBDIR += etl
612	SUBDIR += euca2ools	612	SUBDIR += euca2ools
		613	SUPDIR += evdev-proto
613	SUBDIR += evemu	614	SUBDIR += evemu
614	SUBDIR += eventxx	615	SUBDIR += eventxx
615	SUBDIR += evolution-gconf-tools	616	SUBDIR += evolution-gconf-tools




# $FreeBSD$

PORTNAME=	evdev-proto
PORTVERSION=	4.19
CATEGORIES=	devel
MASTER_SITES=	https://github.com/torvalds/linux/raw/v${PORTVERSION}/include/uapi/linux/
DISTNAME=	input.h input-event-codes.h uinput.h
EXTRACT_SUFX=	# empty

MAINTAINER=	x11@FreeBSD.org
COMMENT=	Input event device header files

LICENSE=	GPLv2

NO_BUILD=	yes
NO_ARCH=	yes
WRKSRC=		${WRKDIR}

PLIST_FILES=	${DISTNAME:S|^|include/linux/|}

do-extract:
	@${MKDIR} ${WRKSRC}
.for i in ${DISTNAME}
	@${CP} ${DISTDIR}/${i} ${WRKSRC}
.endfor

post-patch:
	@${REINPLACE_CMD} -i '' -E -e \
		's/__u([[:digit:]]+)/uint\1_t/g ; \
		s/__s([[:digit:]]+)/int\1_t/g ; \
		/# *include/ s|<sys/ioctl.h>|<sys/ioccom.h>| ; \
		/# *include[[:space:]]+<linux\/types.h>/d ; \
		/EVIOC(RMFF|GRAB|REVOKE)/ s/_IOW(.*), *int/_IOWINT\1/ ; \
		/EVIOCGKEYCODE/ s/_IOR/_IOWR/ ; \
		/EVIOCGMASK/ s/_IOR/_IOW/ ; \
		/EVIOCGMTSLOTS/ s/_IOC_READ/IOC_INOUT/ ; \
		/#define/ s/_IOC_READ/IOC_OUT/ ; \
		/#define/ s/_IOC_WRITE/IOC_IN/ ; \
		s/[[:space:]]+__user[[:space:]]+/ / ; \
		/__USE_TIME_BITS64/ s|^#if (.*)$$|#if 1 /* \1 */|' \
		${WRKSRC}/input.h
	@${REINPLACE_CMD} -i '' -E -e \
		's/__u([[:digit:]]+)/uint\1_t/g ; \
		s/__s([[:digit:]]+)/int\1_t/g ; \
		/# *include/s|<linux/types.h>|<sys/types.h>| ; \
		/#define/ s/_IOW(.*), *int/_IOWINT\1/ ; \
		/#define/ s/_IOW(.*), *char\*/_IO\1/ ; \
		/#define/ s/_IOC_READ/IOC_OUT/' \
		${WRKSRC}/uinput.h

do-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/linux/
.for i in ${DISTNAME}
	${INSTALL_DATA} ${WRKSRC}/${i} \
		${STAGEDIR}${PREFIX}/include/linux/
.endfor

.include <bsd.port.mk>

Added Link Here

(-)b/devel/evdev-proto/distinfo (+7 lines)
1	TIMESTAMP = 1544273147
2	SHA256 (input.h) = 6daff6404fe93484d1c53f8f8bd49d3ae2094f3c1b41871e05a9ba5c8eecc420
3	SIZE (input.h) = 15929
4	SHA256 (input-event-codes.h) = a736ca688b6d5fd5d0f52d77b620387dd1f0d360ebba53106ca7be96a8231249
5	SIZE (input-event-codes.h) = 24313
6	SHA256 (uinput.h) = 9123b078f13047c34797332c4f835e5f1e418387e9a950024920faa5a1186974
7	SIZE (uinput.h) = 9276

Added Link Here

(-)b/devel/evdev-proto/pkg-descr (+1 lines)
1	This port installs the input event device header files.

Lines 3-9 Link Here

(-)b/devel/evemu/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= evemu	4	PORTNAME= evemu
5	PORTVERSION= 2.6.0	5	PORTVERSION= 2.6.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/	8	MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/
9		9
Lines 12-18 COMMENT= Records and replays EVDEV descriptions and events Link Here
12		12
13	LICENSE= GPLv3	13	LICENSE= GPLv3
14		14
15	BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat	15	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
16	LIB_DEPENDS= libevdev.so:devel/libevdev	16	LIB_DEPENDS= libevdev.so:devel/libevdev
17		17
18	USES= tar:xz pathfix libtool pkgconfig localbase	18	USES= tar:xz pathfix libtool pkgconfig localbase




--- tools/evemu-record.c.orig	2016-03-01 14:10:40 UTC
+++ tools/evemu-record.c
@@ -209,6 +209,9 @@ out:
 	return rc;
 }
 
+/* Fix broken linux/input.h ioctl define found in multimedia/v4l_compat as of 2017-04-02 */
+#undef	EVIOCGRAB
+#define	EVIOCGRAB	_IOWINT('E', 0x90)
 static inline bool test_grab_device(int fd)
 {
 	if (ioctl(fd, EVIOCGRAB, (void*)1) < 0) {




# $FreeBSD$

PORTNAME=	libevdev
PORTVERSION=	1.5.9
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/


LICENSE=	MIT # without linux/*.h
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim

USES=		gmake libtool localbase pathfix pkgconfig python:build tar:xz
EXTRACT_AFTER_ARGS=	--exclude include # v4l_compat
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	ac_cv_path_DOXYGEN="" ac_cv_path_VALGRIND=""
CPPFLAGS+=	-I${LOCALBASE}/include/libepoll-shim
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	yes

# Test requires /dev/uinput and should be run as root
.if exists(/dev/uinput)
TEST_USES+=	pkgconfig
TEST_DEPENDS=	checkmk:devel/check
TEST_TARGET=	check
TEST_WRKSRC=	${WRKSRC}/test
.endif

post-patch:
	@${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,g' \
		${WRKSRC}/libevdev/Makefile.in
	@${REINPLACE_CMD} -e '/^LIBS = /s/$$/ -pthread -lrt -lepoll-shim/' \
		${WRKSRC}/tools/Makefile.in
	@${REINPLACE_CMD} -e 's|program_invocation_short_name|getprogname()|' \
		${WRKSRC}/tools/mouse-dpi-tool.c \
		${WRKSRC}/tools/touchpad-edge-detector.c \
		${WRKSRC}/tools/libevdev-tweak-device.c

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/devel/libevdev/distinfo (-2 / +3 lines)
1	SHA256 (libevdev-1.4.4.tar.xz) = ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9	1	TIMESTAMP = 1522696039
2	SIZE (libevdev-1.4.4.tar.xz) = 409856	2	SHA256 (libevdev-1.5.9.tar.xz) = e1663751443bed9d3e76a4fe2caf6fa866a79705d91cacad815c04e706198a75
		3	SIZE (libevdev-1.5.9.tar.xz) = 408200




--- libevdev/libevdev-uinput.c.orig	2017-05-04 00:37:30 UTC
+++ libevdev/libevdev-uinput.c
@@ -182,6 +182,7 @@ libevdev_uinput_get_fd(const struct libevdev_uinput *u
 	return uinput_dev->fd;
 }
 
+#if defined(linux)
 static int is_event_device(const struct dirent *dent) {
 	return strncmp("event", dent->d_name, 5) == 0;
 }
@@ -213,10 +214,12 @@ fetch_device_node(const char *path)
 static int is_input_device(const struct dirent *dent) {
 	return strncmp("input", dent->d_name, 5) == 0;
 }
+#endif
 
 static int
 fetch_syspath_and_devnode(struct libevdev_uinput *uinput_dev)
 {
+#if defined(linux)
 	struct dirent **namelist;
 	int ndev, i;
 	int rc;
@@ -290,6 +293,16 @@ fetch_syspath_and_devnode(struct libevdev_uinput *uinp
 	free(namelist);
 
 	return uinput_dev->devnode ? 0 : -1;
+#elif defined(__FreeBSD__)
+	char devnode[80];
+	if (ioctl(uinput_dev->fd, UI_GET_SYSNAME(sizeof(devnode)), devnode) < 0)
+		return -1;
+	asprintf(&uinput_dev->devnode, "/dev/input/%s", devnode);
+	uinput_dev->syspath = strdup(uinput_dev->devnode);
+	return 0;
+#else
+	return -1;
+#endif
 }
 
 static int




--- test/test-libevdev-events.c.orig	2017-05-04 00:37:30 UTC
+++ test/test-libevdev-events.c
@@ -1057,7 +1057,7 @@ START_TEST(test_syn_delta_late_sync)
 	} while (rc >= 0);
 
 	/* force enough events to trigger a SYN_DROPPED */
-	for (i = 0; i < 100; i++) {
+	for (i = 0; i < 200; i++) {
 		uinput_device_event(uidev, EV_ABS, ABS_X, 100 + i);
 		uinput_device_event(uidev, EV_ABS, ABS_Y, 500 + i);
 		uinput_device_event(uidev, EV_ABS, ABS_MT_POSITION_X, 100 + i);
@@ -1152,7 +1152,7 @@ START_TEST(test_syn_delta_late_sync)
 	} while (rc >= 0);
 
 	/* force enough events to trigger a SYN_DROPPED */
-	for (i = 0; i < 100; i++) {
+	for (i = 0; i < 200; i++) {
 		uinput_device_event(uidev, EV_ABS, ABS_X, 100 + i);
 		uinput_device_event(uidev, EV_ABS, ABS_Y, 500 + i);
 		uinput_device_event(uidev, EV_ABS, ABS_MT_POSITION_X, 100 + i);




--- test/test-libevdev-has-event.c.orig	2017-05-04 00:37:30 UTC
+++ test/test-libevdev-has-event.c
@@ -116,6 +116,13 @@ START_TEST(test_event_codes)
 			evbit++;
 			continue;
 		}
+#ifdef __FreeBSD__
+		/* Force feedback events are not supported by FreeBSD */
+		if (*evbit == EV_FF) {
+			evbit++;
+			continue;
+		}
+#endif
 
 		max = libevdev_event_type_get_max(*evbit);
 

Added Link Here

(-)b/devel/libevdev/files/patch-test_test-libevdev-init.c (+11 lines)
1	--- test/test-libevdev-init.c.orig 2018-03-08 05:27:35 UTC
2	+++ test/test-libevdev-init.c
3	@@ -577,7 +577,7 @@ START_TEST(test_set_clock_id)
4	rc = libevdev_set_clock_id(dev, CLOCK_MONOTONIC);
5	ck_assert_int_eq(rc, 0);
6
7	- rc = libevdev_set_clock_id(dev, CLOCK_MONOTONIC_RAW);
8	+ rc = libevdev_set_clock_id(dev, CLOCK_MONOTONIC_FAST);
9	ck_assert_int_eq(rc, -EINVAL);
10
11	uinput_device_free(uidev);




--- test/test-main.c.orig	2018-03-08 05:27:35 UTC
+++ test/test-main.c
@@ -43,6 +43,7 @@ extern Suite *uinput_suite(void);
 static int
 is_debugger_attached(void)
 {
+#if defined (linux)
 	int status;
 	int rc;
 	int pid = fork();
@@ -66,6 +67,15 @@ is_debugger_attached(void)
 	}
 
 	return rc;
+#else
+	/*
+	 * Skip useless gdb test as setting CK_FORK environment variable in
+	 * absence of attached debugger gives no harm to user.
+	 * Moreover this test is broken on most nonlinux systems, look at
+	 * discussion here: http://stackoverflow.com/questions/3596781/
+	 */
+	return 1;
+#endif
 }
 
 int main(void)

Lines 1-8 Link Here

(-)b/devel/libevdev/pkg-plist (-1 / +4 lines)
		1	bin/libevdev-tweak-device
		2	bin/mouse-dpi-tool
		3	bin/touchpad-edge-detector
1	include/libevdev-1.0/libevdev/libevdev-uinput.h	4	include/libevdev-1.0/libevdev/libevdev-uinput.h
2	include/libevdev-1.0/libevdev/libevdev.h	5	include/libevdev-1.0/libevdev/libevdev.h
3	lib/libevdev.a	6	lib/libevdev.a
4	lib/libevdev.so	7	lib/libevdev.so
5	lib/libevdev.so.2	8	lib/libevdev.so.2
6	lib/libevdev.so.2.1.10	9	lib/libevdev.so.2.1.21
7	libdata/pkgconfig/libevdev.pc	10	libdata/pkgconfig/libevdev.pc
8	man/man3/libevdev.3.gz	11	man/man3/libevdev.3.gz





PORTNAME=	mtdev
PORTVERSION=	1.1.5
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	http://bitmath.org/code/${PORTNAME}/
PKGNAMEPREFIX=	lib

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
RUN_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat

USES=		libtool pathfix tar:bz2
GNU_CONFIGURE=	yes
CPPFLAGS+=	-I${LOCALBASE}/include # evdev-proto
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	yes





--- test/mtdev-test.c.orig	2014-02-28 18:48:23 UTC
+++ test/mtdev-test.c
@@ -28,11 +28,12 @@
 
 #include <mtdev.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
 
 /* year-proof millisecond event time */
-typedef __u64 mstime_t;
+typedef uint64_t mstime_t;
 
 static int use_event(const struct input_event *ev)
 {





PORTNAME=	libudev-devd
PORTVERSION=	0.3
PORTREVISION=	2
CATEGORIES=	devel

MAINTAINER=	x11@FreeBSD.org


LICENSE=	BSD2CLAUSE

BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
LIB_DEPENDS=	libevdev.so:devel/libevdev

USE_GITHUB=	yes
GH_ACCOUNT=	FreeBSDDesktop
GH_TAGNAME=	b7aa09f

USES=		autoreconf gmake libtool localbase pathfix pkgconfig
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
INSTALL_TARGET=	install-strip




# $FreeBSD$

PORTNAME=	evdev
PORTVERSION=	0.8.1
PORTREVISION=	1
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto

USES=		python
USE_PYTHON=	autoplist distutils
CPPFLAGS+=	-I${LOCALBASE}/include # v4l_compat

EVDEV_INCLUDES=	${LOCALBASE}/include

PYDISTUTILS_BUILD_TARGET=	build_ecodes
PYDISTUTILS_BUILDARGS+=		--evdev-headers ${EVDEV_INCLUDES}/linux/input.h:${EVDEV_INCLUDES}/linux/input-event-codes.h
PYDISTUTILS_BUILDARGS+=		build_ext
PYDISTUTILS_BUILDARGS+=		--include-dirs ${EVDEV_INCLUDES}

# Supply install target with evdev headers path
PYDISTUTILS_INSTALL_TARGET=	${PYDISTUTILS_BUILD_TARGET} \
				${PYDISTUTILS_BUILDARGS} install

post-install:
	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \

Lines 1-2 Link Here

(-)b/devel/py-evdev/distinfo (-2 / +3 lines)
1	SHA256 (evdev-0.5.0.tar.gz) = 509f0f6ce5a12315fcad0b7f9b41cbdfc5c5f49a7cecdd6a88ce5c1d04f6827c	1	TIMESTAMP = 1522711809
2	SIZE (evdev-0.5.0.tar.gz) = 23931	2	SHA256 (evdev-0.8.1.tar.gz) = 3f10c22f15ffedb34519e4af2201f1a088a958efedfd50da0da1aa3887283dff
		3	SIZE (evdev-0.8.1.tar.gz) = 22680

Lines 2-8 Link Here

(-)b/devel/sdl20/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= sdl2	3	PORTNAME= sdl2
4	PORTVERSION= 2.0.9	4	PORTVERSION= 2.0.9
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= http://www.libsdl.org/release/	7	MASTER_SITES= http://www.libsdl.org/release/
8	DISTNAME= SDL2-${PORTVERSION}	8	DISTNAME= SDL2-${PORTVERSION}
Lines 260-266 IGNORE= option VIDEO_WAYLAND requires VIDEO_OPENGLES2 Link Here
260	CONFIGURE_ARGS+= --enable-video-wayland \	260	CONFIGURE_ARGS+= --enable-video-wayland \
261	--enable-wayland-shared	261	--enable-wayland-shared
262	BUILD_DEPENDS+= wayland-protocols>0:graphics/wayland-protocols \	262	BUILD_DEPENDS+= wayland-protocols>0:graphics/wayland-protocols \
263	${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	263	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
264	LIB_DEPENDS+= libwayland-egl.so:graphics/wayland \	264	LIB_DEPENDS+= libwayland-egl.so:graphics/wayland \
265	libxkbcommon.so:x11/libxkbcommon	265	libxkbcommon.so:x11/libxkbcommon
266	.else	266	.else

Lines 3-8 Link Here

(-)b/games/flightgear/Makefile (-1 / +3 lines)
3		3
4	PORTNAME= flightgear	4	PORTNAME= flightgear
5	PORTVERSION= 2018.3.1	5	PORTVERSION= 2018.3.1
		6	PORTREVISION= 1
6	CATEGORIES= games	7	CATEGORIES= games
7	MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}	8	MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
8		9
Lines 21-27 LIB_DEPENDS= libpng.so:graphics/png \ Link Here
21	libcurl.so:ftp/curl \	22	libcurl.so:ftp/curl \
22	libudev.so:devel/libudev-devd	23	libudev.so:devel/libudev-devd
23	BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \	24	BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \
24	${LOCALBASE}/lib/libSimGearCore.a:devel/simgear	25	${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \
		26	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
25	RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \	27	RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \
26	${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \	28	${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \
27	${LOCALBASE}/share/flightgear/version:games/flightgear-data	29	${LOCALBASE}/share/flightgear/version:games/flightgear-data

Lines 2-7 Link Here

(-)b/multimedia/dvb-apps/Makefile (-1 / +3 lines)
2		2
3	PORTNAME= dvb-apps	3	PORTNAME= dvb-apps
4	PORTVERSION= 1.1.2.1505	4	PORTVERSION= 1.1.2.1505
		5	PORTREVISION= 1
5	CATEGORIES= multimedia	6	CATEGORIES= multimedia
6	MASTER_SITES= LOCAL/decke	7	MASTER_SITES= LOCAL/decke
7	DISTNAME= ${PORTNAME}-3d43b280298c	8	DISTNAME= ${PORTNAME}-3d43b280298c
Lines 12-18 COMMENT= Linux DVB API applications and utilities Link Here
12	LICENSE= LGPL21	13	LICENSE= LGPL21
13	LICENSE_FILE= ${WRKSRC}/COPYING.LGPL	14	LICENSE_FILE= ${WRKSRC}/COPYING.LGPL
14		15
15	BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/version.h:multimedia/v4l_compat	16	BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/version.h:multimedia/v4l_compat \
		17	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
16		18
17	USES= gmake iconv perl5 tar:bzip2	19	USES= gmake iconv perl5 tar:bzip2
18		20

Lines 273-279 gst_gdk_pixbuf_PLIST_FILES= ${GST_LIB_DIR}/libgstgdkpixbuf.so Link Here

(-)b/multimedia/gstreamer1-plugins/Makefile.common (-1 / +1 lines)
273	# gl	273	# gl
274	gst_gl_USES= gl	274	gst_gl_USES= gl
275	gst_gl_USE_GL= gl glu glesv2 egl	275	gst_gl_USE_GL= gl glu glesv2 egl
276	gst_gl_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	276	gst_gl_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
277	gst_gl_LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene	277	gst_gl_LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene
278	gst_gl_CONFIGURE_ARGS= --enable-gl --enable-glx \	278	gst_gl_CONFIGURE_ARGS= --enable-gl --enable-glx \
279	--enable-egl --enable-gles2	279	--enable-egl --enable-gles2

Lines 2-8 Link Here

(-)b/multimedia/kdenlive/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= kdenlive	3	PORTNAME= kdenlive
4	DISTVERSION= ${KDE_APPLICATIONS_VERSION}	4	DISTVERSION= ${KDE_APPLICATIONS_VERSION}
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= multimedia kde kde-applications	6	CATEGORIES= multimedia kde kde-applications
7		7
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
Lines 11-17 COMMENT= KDE professional quality non-linear video editing suite Link Here
11	LICENSE= GPLv2	11	LICENSE= GPLv2
12		12
13	LIB_DEPENDS= libmlt.so:multimedia/mlt	13	LIB_DEPENDS= libmlt.so:multimedia/mlt
14	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	14	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
15	RUN_DEPENDS= ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX} \	15	RUN_DEPENDS= ffmpeg${FFMPEG_SUFX}:multimedia/ffmpeg${FFMPEG_SUFX} \
16	${LOCALBASE}/lib/mlt/libmltqt.so:multimedia/mlt-qt5	16	${LOCALBASE}/lib/mlt/libmltqt.so:multimedia/mlt-qt5
17		17

Lines 3-9 Link Here

(-)b/multimedia/lives/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= lives	4	PORTNAME= lives
5	PORTVERSION= 2.8.7	5	PORTVERSION= 2.8.7
6	PORTREVISION= 9	6	PORTREVISION= 10
7	CATEGORIES= multimedia	7	CATEGORIES= multimedia
8	MASTER_SITES= http://lives-video.com/releases/	8	MASTER_SITES= http://lives-video.com/releases/
9	DISTNAME= LiVES-${PORTVERSION}	9	DISTNAME= LiVES-${PORTVERSION}
Lines 14-20 COMMENT= Video editing system Link Here
14	LICENSE= GPLv3+	14	LICENSE= GPLv3+
15	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
16		16
17	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat \	17	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
18	${LOCALBASE}/bin/analyseplugin:audio/ladspa	18	${LOCALBASE}/bin/analyseplugin:audio/ladspa
19	LIB_DEPENDS= libasound.so:audio/alsa-lib \	19	LIB_DEPENDS= libasound.so:audio/alsa-lib \
20	libjack.so:audio/jack \	20	libjack.so:audio/jack \

Lines 4-10 Link Here

(-)b/multimedia/mpv/Makefile (-2 / +3 lines)
4	PORTNAME= mpv	4	PORTNAME= mpv
5	PORTVERSION= 0.29.1	5	PORTVERSION= 0.29.1
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 3	7	PORTREVISION= 4
8	PORTEPOCH= 1	8	PORTEPOCH= 1
9	CATEGORIES= multimedia audio	9	CATEGORIES= multimedia audio
10	MASTER_SITES= https://waf.io/:waf	10	MASTER_SITES= https://waf.io/:waf
Lines 143-149 VAAPI_CONFIGURE_OFF= --disable-vaapi Link Here
143	VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau	143	VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau
144	VDPAU_CONFIGURE_OFF= --disable-vdpau	144	VDPAU_CONFIGURE_OFF= --disable-vdpau
145		145
146	WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.14:graphics/wayland-protocols	146	WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.14:graphics/wayland-protocols \
		147	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
147	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \	148	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
148	libwayland-cursor.so:graphics/wayland \	149	libwayland-cursor.so:graphics/wayland \
149	libxkbcommon.so:x11/libxkbcommon	150	libxkbcommon.so:x11/libxkbcommon

Lines 1-7 Link Here

(-)b/multimedia/v4l_compat/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= v4l_compat	3	PORTNAME= v4l_compat
4	PORTREVISION= 2	4	PORTREVISION= 3
5		5
6	COMMENT= Video4Linux IOCTL header files	6	COMMENT= Video4Linux IOCTL header files
7		7
Lines 14-20 DESCR= ${.CURDIR}/pkg-descr Link Here
14	PLIST= ${.CURDIR}/pkg-plist	14	PLIST= ${.CURDIR}/pkg-plist
15	LIBV4L_SLAVE= compat	15	LIBV4L_SLAVE= compat
16		16
17	BASE_HEADERS= input.h uinput.h ivtv.h v4l2-controls.h \	17	BASE_HEADERS= ivtv.h v4l2-controls.h \
18	v4l2-common.h videodev2.h	18	v4l2-common.h videodev2.h
19	DVB_HEADERS= audio.h dmx.h frontend.h video.h	19	DVB_HEADERS= audio.h dmx.h frontend.h video.h
20	EXTRA_HEADERS= ca.h net.h osd.h version.h	20	EXTRA_HEADERS= ca.h net.h osd.h version.h

Lines 6-14 include/linux/dvb/frontend.h Link Here

(-)b/multimedia/v4l_compat/pkg-plist (-2 lines)
6	include/linux/dvb/osd.h	6	include/linux/dvb/osd.h
7	include/linux/dvb/version.h	7	include/linux/dvb/version.h
8	include/linux/dvb/video.h	8	include/linux/dvb/video.h
9	include/linux/input.h
10	include/linux/ivtv.h	9	include/linux/ivtv.h
11	include/linux/uinput.h
12	include/linux/v4l2-common.h	10	include/linux/v4l2-common.h
13	include/linux/v4l2-controls.h	11	include/linux/v4l2-controls.h
14	include/linux/videodev.h	12	include/linux/videodev.h

Lines 3-9 Link Here

(-)b/net/freerdp/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= freerdp	4	PORTNAME= freerdp
5	DISTVERSION= 2.0.0-rc3	5	DISTVERSION= 2.0.0-rc3
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= net comms ipv6	7	CATEGORIES= net comms ipv6
8		8
9	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/	9	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
Lines 75-81 PULSEAUDIO_CMAKE_BOOL= WITH_PULSE Link Here
75	SSE_CMAKE_BOOL= WITH_SSE2	75	SSE_CMAKE_BOOL= WITH_SSE2
76		76
77	WAYLAND_DESC= Build FreeRDP Wayland client	77	WAYLAND_DESC= Build FreeRDP Wayland client
78	WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	78	WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
79	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \	79	WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
80	libwayland-cursor.so:graphics/wayland \	80	libwayland-cursor.so:graphics/wayland \
81	libxkbcommon.so:x11/libxkbcommon	81	libxkbcommon.so:x11/libxkbcommon

Lines 2-8 Link Here

(-)b/x11-drivers/xf86-input-evdev/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= xf86-input-evdev	3	PORTNAME= xf86-input-evdev
4	PORTVERSION= 2.10.6	4	PORTVERSION= 2.10.6
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= x11-drivers	6	CATEGORIES= x11-drivers
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
Lines 11-17 COMMENT= X.Org event device input driver Link Here
11	LICENSE= MIT # various styles	11	LICENSE= MIT # various styles
12	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
13		13
14	BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	14	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
15	LIB_DEPENDS= libevdev.so:devel/libevdev \	15	LIB_DEPENDS= libevdev.so:devel/libevdev \
16	libmtdev.so:devel/libmtdev	16	libmtdev.so:devel/libmtdev
17	RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd	17	RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd

Lines 2-8 Link Here

(-)b/x11-drivers/xf86-input-libinput/Makefile (-1 / +2 lines)
2		2
3	PORTNAME= xf86-input-libinput	3	PORTNAME= xf86-input-libinput
4	PORTVERSION= 0.25.0	4	PORTVERSION= 0.25.0
5	PORTREVISION= 2	5	PORTREVISION= 3
6	CATEGORIES= x11-drivers	6	CATEGORIES= x11-drivers
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
Lines 11-16 COMMENT= X.Org libinput input driver Link Here
11	LICENSE= MIT # various styles	11	LICENSE= MIT # various styles
12	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
13		13
		14	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
14	LIB_DEPENDS= libinput.so:x11/libinput	15	LIB_DEPENDS= libinput.so:x11/libinput
15		16
16	XORG_CAT= driver	17	XORG_CAT= driver

Lines 2-8 Link Here

(-)b/x11-drivers/xf86-input-synaptics/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= xf86-input-synaptics	3	PORTNAME= xf86-input-synaptics
4	PORTVERSION= 1.9.1	4	PORTVERSION= 1.9.1
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= x11-drivers	6	CATEGORIES= x11-drivers
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
Lines 19-25 OPTIONS_DEFINE= EVDEV Link Here
19	EVDEV_DESC= Use evdev for input events (requires kernel support)	19	EVDEV_DESC= Use evdev for input events (requires kernel support)
20		20
21	EVDEV_CONFIGURE_ENV= BUILD_EVENTCOMM=yes	21	EVDEV_CONFIGURE_ENV= BUILD_EVENTCOMM=yes
22	EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	22	EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
23	EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev	23	EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev
24		24
25	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Lines 2-8 Link Here

(-)b/x11-drivers/xf86-input-wacom/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= xf86-input-wacom	3	PORTNAME= xf86-input-wacom
4	PORTVERSION= 0.36.1	4	PORTVERSION= 0.36.1
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= x11-drivers	6	CATEGORIES= x11-drivers
7	MASTER_SITES= https://github.com/linuxwacom/${PORTNAME}/releases/download/${DISTNAME}/	7	MASTER_SITES= https://github.com/linuxwacom/${PORTNAME}/releases/download/${DISTNAME}/
8		8
Lines 11-17 COMMENT= X.Org Wacom tablet driver Link Here
11		11
12	LICENSE= GPLv2+	12	LICENSE= GPLv2+
13		13
14	BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	14	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
15	RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd	15	RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd
16		16
17	USES= gmake pathfix	17	USES= gmake pathfix

Lines 1-6 Link Here

(-)b/x11-drivers/xf86-input-wacom/files/patch-src-wcmConfig.c (-3 / +3 lines)
1	--- src/wcmConfig.c~	1	--- src/wcmConfig.c.orig 2018-02-12 16:43:12 UTC
2	+++ src/wcmConfig.c	2	+++ src/wcmConfig.c
3	@@ -307,7 +307,7 @@ out:	3	@@ -311,7 +311,7 @@ out:
4	*/	4	*/
5	static void wcmSplitName(char* devicename, char basename, char subdevice, char *tool, size_t len)	5	static void wcmSplitName(char* devicename, char basename, char subdevice, char *tool, size_t len)
6	{	6	{
Lines 9-15 Link Here
9	char a, b;	9	char a, b;
10		10
11	basename = subdevice = *tool = '\0';	11	basename = subdevice = *tool = '\0';
12	@@ -325,6 +325,7 @@ static void wcmSplitName(char* devicenam	12	@@ -338,6 +338,7 @@ static void wcmSplitName(char* devicename, char *basen
13	strncat(tool, a+1, len-1);	13	strncat(tool, a+1, len-1);
14	}	14	}
15	strncat(basename, name, len-1);	15	strncat(basename, name, len-1);




--- src/wcmISDV4.c.orig	2017-05-30 18:42:52 UTC
+++ src/wcmISDV4.c
@@ -24,14 +24,19 @@
 #include "xf86Wacom.h"

 #define RESET_RELATIVE(ds) do { (ds).relwheel = 0; } while (0)
 
 /* resolution in points/m */
@@ -195,10 +200,15 @@ static int wcmSerialValidate(InputInfoPtr pInfo, const
 
 static Bool isdv4Detect(InputInfoPtr pInfo)
 {

 	if (rc == -1)
 		return FALSE;
 
@@ -968,6 +978,7 @@ static Bool get_keys_vendor_tablet_id(char *name, Waco
 	return TRUE;
 }
 

 /**
  * Return the content of id file from sysfs:  /sys/.../device/id
  *
@@ -1017,6 +1028,7 @@ out:
 
 	return ret;
 }

 
 /**
  * Query the device's fd for the key bits and the tablet ID. Returns the ID
@@ -1031,11 +1043,16 @@ out:
  */
 static int isdv4ProbeKeys(InputInfoPtr pInfo)
 {

 		return 0;
 
 	common->tablet_id = 0x90;
@@ -1050,9 +1067,11 @@ static int isdv4ProbeKeys(InputInfoPtr pInfo)
 	common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC;
 
 	if (!get_keys_vendor_tablet_id(pInfo->name, common)) {




--- src/wcmUSB.c.orig	2018-03-12 16:31:49 UTC
+++ src/wcmUSB.c
@@ -23,10 +23,17 @@
 

 
 #define MAX_USB_EVENTS 32
 
@@ -280,6 +287,11 @@ static struct WacomModelDesc
 	{ WACOM_VENDOR_ID, 0x314,200000, 200000, &usbIntuosPro,  "Intuos Pro S"		},
 	{ WACOM_VENDOR_ID, 0x315,200000, 200000, &usbIntuosPro,  "Intuos Pro M"		},
 	{ WACOM_VENDOR_ID, 0x317,200000, 200000, &usbIntuosPro,  "Intuos Pro L"		},
+
+	{ WACOM_VENDOR_ID, 0x33B,200000, 200000, &usbIntuos5,    "Intuos Draw small"	},
+	{ WACOM_VENDOR_ID, 0x33C,200000, 200000, &usbIntuos5,    "Intuos Art/Photo/Comic small"},
+	{ WACOM_VENDOR_ID, 0x33D,200000, 200000, &usbIntuos5,    "Intuos Draw medium"	},
+	{ WACOM_VENDOR_ID, 0x33E,200000, 200000, &usbIntuos5,    "Intuos Art medium"	},
 
 	{ WACOM_VENDOR_ID, 0x3F, 200000, 200000, &usbCintiqV5,   "Cintiq 21UX"		},
 	{ WACOM_VENDOR_ID, 0xC5, 200000, 200000, &usbCintiqV5,   "Cintiq 20WSX"		},
 	{ WACOM_VENDOR_ID, 0xC6, 200000, 200000, &usbCintiqV5,   "Cintiq 12WX"		},




--- src/wcmValidateDevice.c.orig	2018-02-13 17:35:29 UTC
+++ src/wcmValidateDevice.c
@@ -34,6 +34,7 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t m
 {
 	int match = 0;
 	InputInfoPtr pDevices = xf86FirstLocalDevice();

 
 	for (; !match && pDevices != NULL; pDevices = pDevices->next)
 	{
@@ -51,7 +52,6 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t m
 		if (pInfo != pDevices)
 		{
 			WacomCommonPtr pCommon = ((WacomDevicePtr)pDevices->private)->common;

 			char* psource = xf86CheckStrOption(pDevices->options, "_source", "");
 
 			if (pCommon->min_maj &&
@@ -62,10 +62,11 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t m
 				if (strcmp(fsource, psource))
 					match = 1;
 			}

 	if (match)
 		xf86Msg(X_WARNING, "%s: device file already in use by %s. "
 			"Ignoring.\n", pInfo->name, pDevices->name);
@@ -123,7 +124,7 @@ ret:
 static struct
 {
 	const char* type;
-	__u16 tool[3]; /* tool array is terminated by 0 */
+	uint16_t tool[3]; /* tool array is terminated by 0 */
 } wcmType [] =
 {
 	{ "stylus", { BTN_TOOL_PEN,       0                  } },
@@ -212,6 +213,10 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
 		case 0x314: /* Intuos Pro S */
 		case 0x315: /* Intuos Pro M */
 		case 0x317: /* Intuos Pro L */

 		case 0x26:  /* I5 */
 		case 0x27:  /* I5 */
 		case 0x28:  /* I5 */
@@ -659,8 +664,10 @@ int wcmNeedAutoHotplug(InputInfoPtr pInfo, char **type
 
 	if (!source) /* xorg.conf device, don't auto-pick type */
 		goto out;

Lines 2-8 Link Here

(-)b/x11-drivers/xf86-video-qxl/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= xf86-video-qxl	3	PORTNAME= xf86-video-qxl
4	DISTVERSION= 0.1.5	4	DISTVERSION= 0.1.5
5	PORTREVISION= 2	5	PORTREVISION= 3
6	CATEGORIES= x11-drivers	6	CATEGORIES= x11-drivers
7		7
8	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
Lines 11-17 COMMENT= X.Org X server -- QXL display driver Link Here
11	LICENSE= MIT	11	LICENSE= MIT
12		12
13	BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol \	13	BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol \
14	${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	14	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
15	LIB_DEPENDS= libspice-server.so:devel/libspice-server	15	LIB_DEPENDS= libspice-server.so:devel/libspice-server
16		16
17	USES= localbase:ldflags pkgconfig python:2.7 shebangfix	17	USES= localbase:ldflags pkgconfig python:2.7 shebangfix





PORTNAME=	xwayland
PORTVERSION=	1.19.1
PORTREVISION=	1

COMMENT=	X Clients under Wayland

LICENSE=	MIT

BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols \
		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
		libinput.so:x11/libinput


Lines 2-8 Link Here

(-)b/x11-toolkits/wlc/Makefile (-2 / +3 lines)
2		2
3	PORTNAME= wlc	3	PORTNAME= wlc
4	PORTVERSION= 0.0.8	4	PORTVERSION= 0.0.8
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= x11-toolkits wayland	6	CATEGORIES= x11-toolkits wayland
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
Lines 14-20 EXPIRATION_DATE= 2018-12-31 Link Here
14	LICENSE= MIT	14	LICENSE= MIT
15	LICENSE_FILES= ${WRKSRC}/LISENSE	15	LICENSE_FILES= ${WRKSRC}/LISENSE
16		16
17	BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols	17	BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \
		18	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
18	LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \	19	LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon \
19	libxcb-ewmh.so:x11/xcb-util-wm \	20	libxcb-ewmh.so:x11/xcb-util-wm \
20	libwayland-server.so:graphics/wayland \	21	libwayland-server.so:graphics/wayland \

Lines 2-8 Link Here

(-)b/x11-wm/plasma5-kwin/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= kwin	3	PORTNAME= kwin
4	DISTVERSION= ${KDE_PLASMA_VERSION}	4	DISTVERSION= ${KDE_PLASMA_VERSION}
5	PORTREVISION= 2	5	PORTREVISION= 3
6	CATEGORIES= x11-wm kde kde-plasma	6	CATEGORIES= x11-wm kde kde-plasma
7		7
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
Lines 24-30 LIB_DEPENDS= libXcursor.so:x11/libXcursor \ Link Here
24	libxcb-image.so:x11/xcb-util-image \	24	libxcb-image.so:x11/xcb-util-image \
25	libxcb-keysyms.so:x11/xcb-util-keysyms \	25	libxcb-keysyms.so:x11/xcb-util-keysyms \
26	libxkbcommon.so:x11/libxkbcommon	26	libxkbcommon.so:x11/libxkbcommon
27	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat \	27	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
28	Xwayland:x11-servers/xwayland	28	Xwayland:x11-servers/xwayland
29	RUN_DEPENDS= Xwayland:x11-servers/xwayland	29	RUN_DEPENDS= Xwayland:x11-servers/xwayland
30		30

Lines 2-8 Link Here

(-)b/x11/kde-workspace-kde4/Makefile (-2 / +3 lines)
2		2
3	PORTNAME= kde-workspace	3	PORTNAME= kde-workspace
4	PORTVERSION= ${KDE4_WORKSPACE_VERSION}	4	PORTVERSION= ${KDE4_WORKSPACE_VERSION}
5	PORTREVISION= 28	5	PORTREVISION= 29
6	CATEGORIES= x11 kde kde-applications	6	CATEGORIES= x11 kde kde-applications
7	PKGNAMESUFFIX= -kde4	7	PKGNAMESUFFIX= -kde4
8		8
Lines 28-34 LIB_DEPENDS= libdbus-1.so:devel/dbus \ Link Here
28	libxcb-render-util.so:x11/xcb-util-renderutil \	28	libxcb-render-util.so:x11/xcb-util-renderutil \
29	libxcb-image.so:x11/xcb-util-image \	29	libxcb-image.so:x11/xcb-util-image \
30	libxcb-keysyms.so:x11/xcb-util-keysyms	30	libxcb-keysyms.so:x11/xcb-util-keysyms
31	BUILD_DEPENDS= xrdb:x11/xrdb	31	BUILD_DEPENDS= xrdb:x11/xrdb \
		32	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
32	RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \	33	RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \
33	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \	34	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
34	xprop:x11/xprop \	35	xprop:x11/xprop \





PORTNAME=	kwayland
DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
PORTREVISION=	2
CATEGORIES=	x11 kde kde-frameworks

MAINTAINER=	kde@FreeBSD.org
COMMENT=	KF5 Client and Server library wrapper for the Wayland libraries

BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
LIB_DEPENDS=	libwayland-client.so:graphics/wayland

LICENSE=	LGPL21 LGPL3





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

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

BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
LIB_DEPENDS=	libevdev.so:devel/libevdev \
		libepoll-shim.so:devel/libepoll-shim \
		libwacom.so:x11/libwacom \

		libmtdev.so:devel/libmtdev

USES=		autoreconf gmake libtool pathfix pkgconfig tar:xz
EXTRACT_AFTER_ARGS=	--exclude include # evdev-proto
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes





--- include/linux/input.h.orig	2016-12-05 05:15:21 UTC
+++ include/linux/input.h
@@ -11,7 +11,17 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
+#ifdef __FreeBSD__
+#define __u8 uint8_t
+#define __u16 uint16_t
+#define __u32 uint32_t
+#define __s16 int16_t
+#define __s32 int32_t
+#define _IOC_READ IOC_OUT
+#define _IOC_WRITE IOC_IN
+#else
 #include <linux/types.h>
+#endif
 
 /*
  * The event structure itself
@@ -132,7 +142,7 @@ struct input_keymap_entry {
  *
  * If the request code is not an ABS_MT value, -EINVAL is returned.
  */
-#define EVIOCGMTSLOTS(len)	_IOC(_IOC_READ, 'E', 0x0a, len)
+#define EVIOCGMTSLOTS(len)	_IOC(IOC_INOUT, 'E', 0x0a, len)
 
 #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 */
@@ -147,7 +157,7 @@ struct input_keymap_entry {
 #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		_IOW('E', 0x90, int)			/* Grab/Release device */
+#define EVIOCGRAB		_IO('E', 0x90)				/* Grab/Release device */
 #define EVIOCREVOKE		_IOW('E', 0x91, int)			/* Revoke device access */
 
 #define EVIOCSCLOCKID		_IOW('E', 0xa0, int)			/* Set clockid to be used for timestamps */

Lines 2-8 Link Here

(-)b/x11/plasma5-kwayland-integration/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= kwayland-integration	3	PORTNAME= kwayland-integration
4	DISTVERSION= ${KDE_PLASMA_VERSION}	4	DISTVERSION= ${KDE_PLASMA_VERSION}
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= x11 kde kde-plasma	6	CATEGORIES= x11 kde kde-plasma
7		7
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
Lines 10-16 COMMENT= Integration plugins for a Wayland-based desktop Link Here
10		10
11	LIB_DEPENDS= libepoxy.so:graphics/libepoxy \	11	LIB_DEPENDS= libepoxy.so:graphics/libepoxy \
12	libwayland-client.so:graphics/wayland	12	libwayland-client.so:graphics/wayland
13	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	13	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
14		14
15	USES= cmake:outsource compiler:c++11-lib cpe kde:5 qt:5 tar:xz	15	USES= cmake:outsource compiler:c++11-lib cpe kde:5 qt:5 tar:xz
16	USE_KDE= ecm idletime wayland windowsystem	16	USE_KDE= ecm idletime wayland windowsystem

Return to bug 233787

Added Link Here

(-)b/devel/evdev-proto/Makefile (+58 lines)
1	# $FreeBSD$
2
3	PORTNAME= evdev-proto
4	PORTVERSION= 4.19
5	CATEGORIES= devel
6	MASTER_SITES= https://github.com/torvalds/linux/raw/v${PORTVERSION}/include/uapi/linux/
7	DISTNAME= input.h input-event-codes.h uinput.h
8	EXTRACT_SUFX= # empty
9
10	MAINTAINER= x11@FreeBSD.org
11	COMMENT= Input event device header files
12
13	LICENSE= GPLv2
14
15	NO_BUILD= yes
16	NO_ARCH= yes
17	WRKSRC= ${WRKDIR}
18
19	PLIST_FILES= ${DISTNAME:S\|^\|include/linux/\|}
20
21	do-extract:
22	@${MKDIR} ${WRKSRC}
23	.for i in ${DISTNAME}
24	@${CP} ${DISTDIR}/${i} ${WRKSRC}
25	.endfor
26
27	post-patch:
28	@${REINPLACE_CMD} -i '' -E -e \
29	's/__u([[:digit:]]+)/uint\1_t/g ; \
30	s/__s([[:digit:]]+)/int\1_t/g ; \
31	/# *include/ s\|<sys/ioctl.h>\|<sys/ioccom.h>\| ; \
32	/# *include[[:space:]]+<linux\/types.h>/d ; \
33	/EVIOC(RMFF\|GRAB\|REVOKE)/ s/_IOW(.), int/_IOWINT\1/ ; \
34	/EVIOCGKEYCODE/ s/_IOR/_IOWR/ ; \
35	/EVIOCGMASK/ s/_IOR/_IOW/ ; \
36	/EVIOCGMTSLOTS/ s/_IOC_READ/IOC_INOUT/ ; \
37	/#define/ s/_IOC_READ/IOC_OUT/ ; \
38	/#define/ s/_IOC_WRITE/IOC_IN/ ; \
39	s/[[:space:]]+__user[[:space:]]+/ / ; \
40	/__USE_TIME_BITS64/ s\|^#if (.)$$\|#if 1 / \1 */\|' \
41	${WRKSRC}/input.h
42	@${REINPLACE_CMD} -i '' -E -e \
43	's/__u([[:digit:]]+)/uint\1_t/g ; \
44	s/__s([[:digit:]]+)/int\1_t/g ; \
45	/# *include/s\|<linux/types.h>\|<sys/types.h>\| ; \
46	/#define/ s/_IOW(.), int/_IOWINT\1/ ; \
47	/#define/ s/_IOW(.), char\*/_IO\1/ ; \
48	/#define/ s/_IOC_READ/IOC_OUT/' \
49	${WRKSRC}/uinput.h
50
51	do-install:
52	@${MKDIR} ${STAGEDIR}${PREFIX}/include/linux/
53	.for i in ${DISTNAME}
54	${INSTALL_DATA} ${WRKSRC}/${i} \
55	${STAGEDIR}${PREFIX}/include/linux/
56	.endfor
57
58	.include <bsd.port.mk>

Removed Link Here

(-)a/devel/evemu/files/patch-tools_evemu-record.c (-12 lines)
1	--- tools/evemu-record.c.orig 2016-03-01 14:10:40 UTC
2	+++ tools/evemu-record.c
3	@@ -209,6 +209,9 @@ out:
4	return rc;
5	}
6
7	+/* Fix broken linux/input.h ioctl define found in multimedia/v4l_compat as of 2017-04-02 */
8	+#undef EVIOCGRAB
9	+#define EVIOCGRAB _IOWINT('E', 0x90)
10	static inline bool test_grab_device(int fd)
11	{
12	if (ioctl(fd, EVIOCGRAB, (void*)1) < 0) {

Lines 1-8 Link Here

(-)b/devel/libevdev/Makefile (-11 / +21 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libevdev	3	PORTNAME= libevdev
4	PORTVERSION= 1.4.4	4	PORTVERSION= 1.5.9
5	PORTREVISION= 1
6	CATEGORIES= devel	5	CATEGORIES= devel
7	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/	6	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/
8		7
Lines 12-33 COMMENT= Linux Event Device library Link Here
12	LICENSE= MIT # without linux/*.h	11	LICENSE= MIT # without linux/*.h
13	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
14		13
15	BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	14	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
16	RUN_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	15	LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim
17		16
18	USES= gmake libtool pathfix python:build tar:xz	17	USES= gmake libtool localbase pathfix pkgconfig python:build tar:xz
19	EXTRACT_AFTER_ARGS= --exclude include # v4l_compat	18	EXTRACT_AFTER_ARGS= --exclude include # v4l_compat
20	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
21	CONFIGURE_ENV= ac_cv_path_DOXYGEN=""	20	CONFIGURE_ENV= ac_cv_path_DOXYGEN="" ac_cv_path_VALGRIND=""
22	CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat	21	CPPFLAGS+= -I${LOCALBASE}/include/libepoll-shim
23	INSTALL_TARGET= install-strip	22	INSTALL_TARGET= install-strip
24	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
25		24
		25	# Test requires /dev/uinput and should be run as root
		26	.if exists(/dev/uinput)
		27	TEST_USES+= pkgconfig
		28	TEST_DEPENDS= checkmk:devel/check
		29	TEST_TARGET= check
		30	TEST_WRKSRC= ${WRKSRC}/test
		31	.endif
		32
26	post-patch:	33	post-patch:
27	@${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,' \	34	@${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,g' \
28	${WRKSRC}/libevdev/Makefile.in	35	${WRKSRC}/libevdev/Makefile.in
29	# XXX tools require signalfd(2), test require /dev/uinput	36	@${REINPLACE_CMD} -e '/^LIBS = /s/$$/ -pthread -lrt -lepoll-shim/' \
30	@${REINPLACE_CMD} -e '/^SUBDIRS/s,tools test,,' \	37	${WRKSRC}/tools/Makefile.in
31	${WRKSRC}/Makefile.in	38	@${REINPLACE_CMD} -e 's\|program_invocation_short_name\|getprogname()\|' \
		39	${WRKSRC}/tools/mouse-dpi-tool.c \
		40	${WRKSRC}/tools/touchpad-edge-detector.c \
		41	${WRKSRC}/tools/libevdev-tweak-device.c
32		42
33	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Added Link Here

(-)b/devel/libevdev/files/patch-libevdev_libevdev-uinput.c (+40 lines)
1	--- libevdev/libevdev-uinput.c.orig 2017-05-04 00:37:30 UTC
2	+++ libevdev/libevdev-uinput.c
3	@@ -182,6 +182,7 @@ libevdev_uinput_get_fd(const struct libevdev_uinput *u
4	return uinput_dev->fd;
5	}
6
7	+#if defined(linux)
8	static int is_event_device(const struct dirent *dent) {
9	return strncmp("event", dent->d_name, 5) == 0;
10	}
11	@@ -213,10 +214,12 @@ fetch_device_node(const char *path)
12	static int is_input_device(const struct dirent *dent) {
13	return strncmp("input", dent->d_name, 5) == 0;
14	}
15	+#endif
16
17	static int
18	fetch_syspath_and_devnode(struct libevdev_uinput *uinput_dev)
19	{
20	+#if defined(linux)
21	struct dirent **namelist;
22	int ndev, i;
23	int rc;
24	@@ -290,6 +293,16 @@ fetch_syspath_and_devnode(struct libevdev_uinput *uinp
25	free(namelist);
26
27	return uinput_dev->devnode ? 0 : -1;
28	+#elif defined(__FreeBSD__)
29	+ char devnode[80];
30	+ if (ioctl(uinput_dev->fd, UI_GET_SYSNAME(sizeof(devnode)), devnode) < 0)
31	+ return -1;
32	+ asprintf(&uinput_dev->devnode, "/dev/input/%s", devnode);
33	+ uinput_dev->syspath = strdup(uinput_dev->devnode);
34	+ return 0;
35	+#else
36	+ return -1;
37	+#endif
38	}
39
40	static int

Added Link Here

(-)b/devel/libevdev/files/patch-test_test-libevdev-events.c (+20 lines)
1	--- test/test-libevdev-events.c.orig 2017-05-04 00:37:30 UTC
2	+++ test/test-libevdev-events.c
3	@@ -1057,7 +1057,7 @@ START_TEST(test_syn_delta_late_sync)
4	} while (rc >= 0);
5
6	/* force enough events to trigger a SYN_DROPPED */
7	- for (i = 0; i < 100; i++) {
8	+ for (i = 0; i < 200; i++) {
9	uinput_device_event(uidev, EV_ABS, ABS_X, 100 + i);
10	uinput_device_event(uidev, EV_ABS, ABS_Y, 500 + i);
11	uinput_device_event(uidev, EV_ABS, ABS_MT_POSITION_X, 100 + i);
12	@@ -1152,7 +1152,7 @@ START_TEST(test_syn_delta_late_sync)
13	} while (rc >= 0);
14
15	/* force enough events to trigger a SYN_DROPPED */
16	- for (i = 0; i < 100; i++) {
17	+ for (i = 0; i < 200; i++) {
18	uinput_device_event(uidev, EV_ABS, ABS_X, 100 + i);
19	uinput_device_event(uidev, EV_ABS, ABS_Y, 500 + i);
20	uinput_device_event(uidev, EV_ABS, ABS_MT_POSITION_X, 100 + i);

Added Link Here

(-)b/devel/libevdev/files/patch-test_test-libevdev-has-event.c (+16 lines)
1	--- test/test-libevdev-has-event.c.orig 2017-05-04 00:37:30 UTC
2	+++ test/test-libevdev-has-event.c
3	@@ -116,6 +116,13 @@ START_TEST(test_event_codes)
4	evbit++;
5	continue;
6	}
7	+#ifdef __FreeBSD__
8	+ /* Force feedback events are not supported by FreeBSD */
9	+ if (*evbit == EV_FF) {
10	+ evbit++;
11	+ continue;
12	+ }
13	+#endif
14
15	max = libevdev_event_type_get_max(*evbit);
16

Added Link Here

(-)b/devel/libevdev/files/patch-test_test-main.c (+26 lines)
1	--- test/test-main.c.orig 2018-03-08 05:27:35 UTC
2	+++ test/test-main.c
3	@@ -43,6 +43,7 @@ extern Suite *uinput_suite(void);
4	static int
5	is_debugger_attached(void)
6	{
7	+#if defined (linux)
8	int status;
9	int rc;
10	int pid = fork();
11	@@ -66,6 +67,15 @@ is_debugger_attached(void)
12	}
13
14	return rc;
15	+#else
16	+ /*
17	+ * Skip useless gdb test as setting CK_FORK environment variable in
18	+ * absence of attached debugger gives no harm to user.
19	+ * Moreover this test is broken on most nonlinux systems, look at
20	+ * discussion here: http://stackoverflow.com/questions/3596781/
21	+ */
22	+ return 1;
23	+#endif
24	}
25
26	int main(void)

Lines 2-8 Link Here

(-)b/devel/libmtdev/Makefile (-4 / +3 lines)
2		2
3	PORTNAME= mtdev	3	PORTNAME= mtdev
4	PORTVERSION= 1.1.5	4	PORTVERSION= 1.1.5
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= http://bitmath.org/code/${PORTNAME}/	7	MASTER_SITES= http://bitmath.org/code/${PORTNAME}/
8	PKGNAMEPREFIX= lib	8	PKGNAMEPREFIX= lib
Lines 13-24 COMMENT= Multitouch Protocol Translation Library Link Here
13	LICENSE= MIT	13	LICENSE= MIT
14	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	16	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
17	RUN_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat
18		17
19	USES= libtool pathfix tar:bz2	18	USES= libtool pathfix tar:bz2
20	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
21	CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat	20	CPPFLAGS+= -I${LOCALBASE}/include # evdev-proto
22	INSTALL_TARGET= install-strip	21	INSTALL_TARGET= install-strip
23	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
24		23

Added Link Here

(-)b/devel/libmtdev/files/patch-test_mtdev-test.c (+16 lines)
1	--- test/mtdev-test.c.orig 2014-02-28 18:48:23 UTC
2	+++ test/mtdev-test.c
3	@@ -28,11 +28,12 @@
4
5	#include <mtdev.h>
6	#include <stdio.h>
7	+#include <stdint.h>
8	#include <unistd.h>
9	#include <fcntl.h>
10
11	/* year-proof millisecond event time */
12	-typedef __u64 mstime_t;
13	+typedef uint64_t mstime_t;
14
15	static int use_event(const struct input_event *ev)
16	{

Lines 2-8 Link Here

(-)b/devel/libudev-devd/Makefile (-4 / +3 lines)
2		2
3	PORTNAME= libudev-devd	3	PORTNAME= libudev-devd
4	PORTVERSION= 0.3	4	PORTVERSION= 0.3
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= devel	6	CATEGORIES= devel
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
Lines 10-23 COMMENT= libudev-compatible interface for devd Link Here
10		10
11	LICENSE= BSD2CLAUSE	11	LICENSE= BSD2CLAUSE
12		12
13	BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat	13	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
14	LIB_DEPENDS= libevdev.so:devel/libevdev
15		14
16	USE_GITHUB= yes	15	USE_GITHUB= yes
17	GH_ACCOUNT= FreeBSDDesktop	16	GH_ACCOUNT= FreeBSDDesktop
18	GH_TAGNAME= b7aa09f	17	GH_TAGNAME= b7aa09f
19		18
20	USES= dos2unix autoreconf gmake libtool localbase pathfix pkgconfig	19	USES= autoreconf gmake libtool localbase pathfix pkgconfig
21	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
23	INSTALL_TARGET= install-strip	22	INSTALL_TARGET= install-strip

Lines 1-8 Link Here

(-)b/devel/py-evdev/Makefile (-6 / +12 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= evdev	3	PORTNAME= evdev
4	PORTVERSION= 0.5.0	4	PORTVERSION= 0.8.1
5	PORTREVISION= 1
6	CATEGORIES= devel python	5	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 13-27 COMMENT= Bindings to the Linux input handling subsystem Link Here
13	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
14	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
15		14
16	BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	15	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
17		16
18	USES= python	17	USES= python
19	USE_PYTHON= autoplist distutils	18	USE_PYTHON= autoplist distutils
20	CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat	19	CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat
21		20
22	post-patch:	21	EVDEV_INCLUDES= ${LOCALBASE}/include
23	@${REINPLACE_CMD} -e '/header/s,/usr,${LOCALBASE},' \	22
24	${WRKSRC}/${PYSETUP}	23	PYDISTUTILS_BUILD_TARGET= build_ecodes
		24	PYDISTUTILS_BUILDARGS+= --evdev-headers ${EVDEV_INCLUDES}/linux/input.h:${EVDEV_INCLUDES}/linux/input-event-codes.h
		25	PYDISTUTILS_BUILDARGS+= build_ext
		26	PYDISTUTILS_BUILDARGS+= --include-dirs ${EVDEV_INCLUDES}
		27
		28	# Supply install target with evdev headers path
		29	PYDISTUTILS_INSTALL_TARGET= ${PYDISTUTILS_BUILD_TARGET} \
		30	${PYDISTUTILS_BUILDARGS} install
25		31
26	post-install:	32	post-install:
27	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \	33	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \

Lines 1-4 Link Here

(-)b/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c (-6 / +6 lines)
1	--- src/wcmISDV4.c~	1	--- src/wcmISDV4.c.orig 2017-05-30 18:42:52 UTC
2	+++ src/wcmISDV4.c	2	+++ src/wcmISDV4.c
3	@@ -24,14 +24,19 @@	3	@@ -24,14 +24,19 @@
4	#include "xf86Wacom.h"	4	#include "xf86Wacom.h"
Lines 22-28 Link Here
22	#define RESET_RELATIVE(ds) do { (ds).relwheel = 0; } while (0)	22	#define RESET_RELATIVE(ds) do { (ds).relwheel = 0; } while (0)
23		23
24	/* resolution in points/m */	24	/* resolution in points/m */
25	@@ -192,10 +197,15 @@ static int wcmSerialValidate(InputInfoPt	25	@@ -195,10 +200,15 @@ static int wcmSerialValidate(InputInfoPtr pInfo, const
26		26
27	static Bool isdv4Detect(InputInfoPtr pInfo)	27	static Bool isdv4Detect(InputInfoPtr pInfo)
28	{	28	{
Lines 39-45 Link Here
39	if (rc == -1)	39	if (rc == -1)
40	return FALSE;	40	return FALSE;
41		41
42	@@ -959,6 +969,7 @@ static Bool get_keys_vendor_tablet_id(ch	42	@@ -968,6 +978,7 @@ static Bool get_keys_vendor_tablet_id(char *name, Waco
43	return TRUE;	43	return TRUE;
44	}	44	}
45		45
Lines 47-53 Link Here
47	/**	47	/**
48	* Return the content of id file from sysfs: /sys/.../device/id	48	* Return the content of id file from sysfs: /sys/.../device/id
49	*	49	*
50	@@ -1004,6 +1015,7 @@ out:	50	@@ -1017,6 +1028,7 @@ out:
51		51
52	return ret;	52	return ret;
53	}	53	}
Lines 55-61 Link Here
55		55
56	/**	56	/**
57	* Query the device's fd for the key bits and the tablet ID. Returns the ID	57	* Query the device's fd for the key bits and the tablet ID. Returns the ID
58	@@ -1018,11 +1030,16 @@ out:	58	@@ -1031,11 +1043,16 @@ out:
59	*/	59	*/
60	static int isdv4ProbeKeys(InputInfoPtr pInfo)	60	static int isdv4ProbeKeys(InputInfoPtr pInfo)
61	{	61	{
Lines 73-79 Link Here
73	return 0;	73	return 0;
74		74
75	common->tablet_id = 0x90;	75	common->tablet_id = 0x90;
76	@@ -1037,9 +1054,11 @@ static int isdv4ProbeKeys(InputInfoPtr p	76	@@ -1050,9 +1067,11 @@ static int isdv4ProbeKeys(InputInfoPtr pInfo)
77	common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC;	77	common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC;
78		78
79	if (!get_keys_vendor_tablet_id(pInfo->name, common)) {	79	if (!get_keys_vendor_tablet_id(pInfo->name, common)) {

Lines 1-4 Link Here

(-)b/x11-drivers/xf86-input-wacom/files/patch-src-wcmUSB.c (-5 / +5 lines)
1	--- src/wcmUSB.c~	1	--- src/wcmUSB.c.orig 2018-03-12 16:31:49 UTC
2	+++ src/wcmUSB.c	2	+++ src/wcmUSB.c
3	@@ -23,10 +23,17 @@	3	@@ -23,10 +23,17 @@
4		4
Lines 18-32 Link Here
18		18
19	#define MAX_USB_EVENTS 32	19	#define MAX_USB_EVENTS 32
20		20
21	@@ -276,6 +283,11 @@ static struct WacomModelDesc	21	@@ -280,6 +287,11 @@ static struct WacomModelDesc
		22	{ WACOM_VENDOR_ID, 0x314,200000, 200000, &usbIntuosPro, "Intuos Pro S" },
22	{ WACOM_VENDOR_ID, 0x315,200000, 200000, &usbIntuosPro, "Intuos Pro M" },	23	{ WACOM_VENDOR_ID, 0x315,200000, 200000, &usbIntuosPro, "Intuos Pro M" },
23	{ WACOM_VENDOR_ID, 0x317,200000, 200000, &usbIntuosPro, "Intuos Pro L" },	24	{ WACOM_VENDOR_ID, 0x317,200000, 200000, &usbIntuosPro, "Intuos Pro L" },
24		25	+
25	+ { WACOM_VENDOR_ID, 0x33B,200000, 200000, &usbIntuos5, "Intuos Draw small" },	26	+ { WACOM_VENDOR_ID, 0x33B,200000, 200000, &usbIntuos5, "Intuos Draw small" },
26	+ { WACOM_VENDOR_ID, 0x33C,200000, 200000, &usbIntuos5, "Intuos Art/Photo/Comic small"},	27	+ { WACOM_VENDOR_ID, 0x33C,200000, 200000, &usbIntuos5, "Intuos Art/Photo/Comic small"},
27	+ { WACOM_VENDOR_ID, 0x33D,200000, 200000, &usbIntuos5, "Intuos Draw medium" },	28	+ { WACOM_VENDOR_ID, 0x33D,200000, 200000, &usbIntuos5, "Intuos Draw medium" },
28	+ { WACOM_VENDOR_ID, 0x33E,200000, 200000, &usbIntuos5, "Intuos Art medium" },	29	+ { WACOM_VENDOR_ID, 0x33E,200000, 200000, &usbIntuos5, "Intuos Art medium" },
29	+	30
30	{ WACOM_VENDOR_ID, 0x3F, 200000, 200000, &usbCintiqV5, "Cintiq 21UX" },	31	{ WACOM_VENDOR_ID, 0x3F, 200000, 200000, &usbCintiqV5, "Cintiq 21UX" },
31	{ WACOM_VENDOR_ID, 0xC5, 200000, 200000, &usbCintiqV5, "Cintiq 20WSX" },	32	{ WACOM_VENDOR_ID, 0xC5, 200000, 200000, &usbCintiqV5, "Cintiq 20WSX" },
32	{ WACOM_VENDOR_ID, 0xC6, 200000, 200000, &usbCintiqV5, "Cintiq 12WX" },

Lines 1-6 Link Here

(-)b/x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c (-6 / +15 lines)
1	--- src/wcmValidateDevice.c.orig 2015-10-23 17:26:33 UTC	1	--- src/wcmValidateDevice.c.orig 2018-02-13 17:35:29 UTC
2	+++ src/wcmValidateDevice.c	2	+++ src/wcmValidateDevice.c
3	@@ -34,6 +34,7 @@ static Bool wcmCheckSource(InputInfoPtr	3	@@ -34,6 +34,7 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t m
4	{	4	{
5	int match = 0;	5	int match = 0;
6	InputInfoPtr pDevices = xf86FirstLocalDevice();	6	InputInfoPtr pDevices = xf86FirstLocalDevice();
Lines 8-14 Link Here
8		8
9	for (; !match && pDevices != NULL; pDevices = pDevices->next)	9	for (; !match && pDevices != NULL; pDevices = pDevices->next)
10	{	10	{
11	@@ -51,7 +52,6 @@ static Bool wcmCheckSource(InputInfoPtr	11	@@ -51,7 +52,6 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t m
12	if (pInfo != pDevices)	12	if (pInfo != pDevices)
13	{	13	{
14	WacomCommonPtr pCommon = ((WacomDevicePtr)pDevices->private)->common;	14	WacomCommonPtr pCommon = ((WacomDevicePtr)pDevices->private)->common;
Lines 16-22 Link Here
16	char* psource = xf86CheckStrOption(pDevices->options, "_source", "");	16	char* psource = xf86CheckStrOption(pDevices->options, "_source", "");
17		17
18	if (pCommon->min_maj &&	18	if (pCommon->min_maj &&
19	@@ -62,10 +62,11 @@ static Bool wcmCheckSource(InputInfoPtr	19	@@ -62,10 +62,11 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t m
20	if (strcmp(fsource, psource))	20	if (strcmp(fsource, psource))
21	match = 1;	21	match = 1;
22	}	22	}
Lines 29-35 Link Here
29	if (match)	29	if (match)
30	xf86Msg(X_WARNING, "%s: device file already in use by %s. "	30	xf86Msg(X_WARNING, "%s: device file already in use by %s. "
31	"Ignoring.\n", pInfo->name, pDevices->name);	31	"Ignoring.\n", pInfo->name, pDevices->name);
32	@@ -205,6 +206,10 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo	32	@@ -123,7 +124,7 @@ ret:
		33	static struct
		34	{
		35	const char* type;
		36	- __u16 tool[3]; /* tool array is terminated by 0 */
		37	+ uint16_t tool[3]; /* tool array is terminated by 0 */
		38	} wcmType [] =
		39	{
		40	{ "stylus", { BTN_TOOL_PEN, 0 } },
		41	@@ -212,6 +213,10 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
33	case 0x314: /* Intuos Pro S */	42	case 0x314: /* Intuos Pro S */
34	case 0x315: /* Intuos Pro M */	43	case 0x315: /* Intuos Pro M */
35	case 0x317: /* Intuos Pro L */	44	case 0x317: /* Intuos Pro L */
Lines 40-46 Link Here
40	case 0x26: /* I5 */	49	case 0x26: /* I5 */
41	case 0x27: /* I5 */	50	case 0x27: /* I5 */
42	case 0x28: /* I5 */	51	case 0x28: /* I5 */
43	@@ -623,8 +628,10 @@ int wcmNeedAutoHotplug(InputInfoPtr pInf	52	@@ -659,8 +664,10 @@ int wcmNeedAutoHotplug(InputInfoPtr pInfo, char **type
44		53
45	if (!source) /* xorg.conf device, don't auto-pick type */	54	if (!source) /* xorg.conf device, don't auto-pick type */
46	goto out;	55	goto out;

Lines 2-13 Link Here

(-)b/x11-servers/xwayland/Makefile (-1 / +3 lines)
2		2
3	PORTNAME= xwayland	3	PORTNAME= xwayland
4	PORTVERSION= 1.19.1	4	PORTVERSION= 1.19.1
		5	PORTREVISION= 1
5		6
6	COMMENT= X Clients under Wayland	7	COMMENT= X Clients under Wayland
7		8
8	LICENSE= MIT	9	LICENSE= MIT
9		10
10	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols	11	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols \
		12	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
11	LIB_DEPENDS= libwayland-client.so:graphics/wayland \	13	LIB_DEPENDS= libwayland-client.so:graphics/wayland \
12	libinput.so:x11/libinput	14	libinput.so:x11/libinput
13		15

Lines 2-14 Link Here

(-)b/x11/kf5-kwayland/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= kwayland	3	PORTNAME= kwayland
4	DISTVERSION= ${KDE_FRAMEWORKS_VERSION}	4	DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= x11 kde kde-frameworks	6	CATEGORIES= x11 kde kde-frameworks
7		7
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= KF5 Client and Server library wrapper for the Wayland libraries	9	COMMENT= KF5 Client and Server library wrapper for the Wayland libraries
10		10
11	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	11	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
12	LIB_DEPENDS= libwayland-client.so:graphics/wayland	12	LIB_DEPENDS= libwayland-client.so:graphics/wayland
13		13
14	LICENSE= LGPL21 LGPL3	14	LICENSE= LGPL21 LGPL3

Lines 2-15 Link Here

(-)b/x11/libinput/Makefile (-2 / +3 lines)
2		2
3	PORTNAME= libinput	3	PORTNAME= libinput
4	PORTVERSION= 1.6.0	4	PORTVERSION= 1.6.0
5	PORTREVISION= 1	5	PORTREVISION= 3
6	CATEGORIES= x11	6	CATEGORIES= x11
7	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/	7	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/
8		8
9	MAINTAINER= x11@FreeBSD.org	9	MAINTAINER= x11@FreeBSD.org
10	COMMENT= Generic input library	10	COMMENT= Generic input library
11		11
12	BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat	12	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
13	LIB_DEPENDS= libevdev.so:devel/libevdev \	13	LIB_DEPENDS= libevdev.so:devel/libevdev \
14	libepoll-shim.so:devel/libepoll-shim \	14	libepoll-shim.so:devel/libepoll-shim \
15	libwacom.so:x11/libwacom \	15	libwacom.so:x11/libwacom \
Lines 17-22 LIB_DEPENDS= libevdev.so:devel/libevdev \ Link Here
17	libmtdev.so:devel/libmtdev	17	libmtdev.so:devel/libmtdev
18		18
19	USES= autoreconf gmake libtool pathfix pkgconfig tar:xz	19	USES= autoreconf gmake libtool pathfix pkgconfig tar:xz
		20	EXTRACT_AFTER_ARGS= --exclude include # evdev-proto
20	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
21	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
22		23

Removed Link Here

(-)a/x11/libinput/files/patch-include_linux_input.h (-38 lines)
1	--- include/linux/input.h.orig 2016-12-05 05:15:21 UTC
2	+++ include/linux/input.h
3	@@ -11,7 +11,17 @@
4	#include <sys/time.h>
5	#include <sys/ioctl.h>
6	#include <sys/types.h>
7	+#ifdef __FreeBSD__
8	+#define __u8 uint8_t
9	+#define __u16 uint16_t
10	+#define __u32 uint32_t
11	+#define __s16 int16_t
12	+#define __s32 int32_t
13	+#define _IOC_READ IOC_OUT
14	+#define _IOC_WRITE IOC_IN
15	+#else
16	#include <linux/types.h>
17	+#endif
18
19	/*
20	* The event structure itself
21	@@ -132,7 +142,7 @@ struct input_keymap_entry {
22	*
23	* If the request code is not an ABS_MT value, -EINVAL is returned.
24	*/
25	-#define EVIOCGMTSLOTS(len) _IOC(_IOC_READ, 'E', 0x0a, len)
26	+#define EVIOCGMTSLOTS(len) _IOC(IOC_INOUT, 'E', 0x0a, len)
27
28	#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	@@ -147,7 +157,7 @@ struct input_keymap_entry {
31	#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
34	-#define EVIOCGRAB _IOW('E', 0x90, int) /* Grab/Release device */
35	+#define EVIOCGRAB _IO('E', 0x90) /* Grab/Release device */
36	#define EVIOCREVOKE _IOW('E', 0x91, int) /* Revoke device access */
37
38	#define EVIOCSCLOCKID _IOW('E', 0xa0, int) /* Set clockid to be used for timestamps */