Attachment #190115 for bug #217248

Lines 29-35 Link Here

(-)audio/baresip/Makefile (-1 / +2 lines)
29	L16 OPUS OSS PORTAUDIO SDL SNDFILE SPEEX SRTP STDIO UUID V4L V4L2 X11 \	29	L16 OPUS OSS PORTAUDIO SDL SNDFILE SPEEX SRTP STDIO UUID V4L V4L2 X11 \
30	DTLS_SRTP AUBRIDGE VIDBRIDGE HTTPD DSHOW DIRECTFB ACCOUNT \	30	DTLS_SRTP AUBRIDGE VIDBRIDGE HTTPD DSHOW DIRECTFB ACCOUNT \
31	NATPMP SDL MIW SNAPSHOT SELFVIEW VUMETER AULOOP CONTACT \	31	NATPMP SDL MIW SNAPSHOT SELFVIEW VUMETER AULOOP CONTACT \
32	MENU PRESENCE SYSLOG VIDLOOP	32	MENU PRESENCE SYSLOG VIDLOOP EVDEV
33	OPTIONS_DEFAULT=CONS G711 G722 G726 L16 OSS STDIO	33	OPTIONS_DEFAULT=CONS G711 G722 G726 L16 OSS STDIO
34		34
35	AULOOP_DESC= Audio-loop test module	35	AULOOP_DESC= Audio-loop test module
Lines 37-42 Link Here
37	CONTACT_DESC= Contacts module	37	CONTACT_DESC= Contacts module
38	CONS_DESC= Console input driver	38	CONS_DESC= Console input driver
39	DTLS_SRTP_DESC= DTLS Secure RTP module [broken]	39	DTLS_SRTP_DESC= DTLS Secure RTP module [broken]
		40	EVDEV_DESC= Input event device interface module
40	G711_DESC= G.711 audio codec	41	G711_DESC= G.711 audio codec
41	G722_DESC= G.722 audio codec	42	G722_DESC= G.722 audio codec
42	G722_1_DESC= G.722.1 audio codec	43	G722_1_DESC= G.722.1 audio codec

Lines 4-10 Link Here

(-)audio/baresip/Makefile.depends (-1 / +1 lines)
4	BV32_DEPEND= # nonexistent	4	BV32_DEPEND= # nonexistent
5	CONS_DEPEND= # unnecessary	5	CONS_DEPEND= # unnecessary
6	DTLS_SRTP_DEPEND= # unnecessary	6	DTLS_SRTP_DEPEND= # unnecessary
7	EVDEV_DEPEND=	7	EVDEV_DEPEND= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
8	FFMPEG_DEPEND= ${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg	8	FFMPEG_DEPEND= ${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg
9	G711_DEPEND= ${LOCALBASE}/include/spandsp/g711.h:comms/spandsp	9	G711_DEPEND= ${LOCALBASE}/include/spandsp/g711.h:comms/spandsp
10	G722_DEPEND= ${LOCALBASE}/include/spandsp/g722.h:comms/spandsp	10	G722_DEPEND= ${LOCALBASE}/include/spandsp/g722.h:comms/spandsp

Lines 26-32 Link Here

(-)multimedia/kdenlive/Makefile (-1 / +11 lines)
26	# Keep in sync with multimedia/mlt, possibly.	26	# Keep in sync with multimedia/mlt, possibly.
27	FFMPEG_SUFX= # Currently empty.	27	FFMPEG_SUFX= # Currently empty.
28		28
29	OPTIONS_DEFINE= DOCS DVDWIZARD FREI0R LADSPA NLS SCREENCAST V4L XINE	29	OPTIONS_DEFINE= DOCS DVDWIZARD FREI0R LADSPA NLS SCREENCAST V4L XINE JOGSHUTTLE
30	OPTIONS_DEFAULT=DVDWIZARD FREI0R LADSPA SCREENCAST V4L XINE	30	OPTIONS_DEFAULT=DVDWIZARD FREI0R LADSPA SCREENCAST V4L XINE
31	OPTIONS_SUB= yes	31	OPTIONS_SUB= yes
32		32
Lines 34-39 Link Here
34	SCREENCAST_DESC=Screen capture support via recordMyDesktop	34	SCREENCAST_DESC=Screen capture support via recordMyDesktop
35	V4L_DESC= Webcam support via Video4Linux	35	V4L_DESC= Webcam support via Video4Linux
36	XINE_DESC= DVD preview support via xine	36	XINE_DESC= DVD preview support via xine
		37	JOGSHUTTLE_DESC=Jog/Shuttle support
37		38
38	DOCS_CMAKE_OFF= -DBUILD_doc:BOOL=FALSE	39	DOCS_CMAKE_OFF= -DBUILD_doc:BOOL=FALSE
39		40
Lines 55-63 Link Here
55		56
56	XINE_RUN_DEPENDS= xine:multimedia/xine	57	XINE_RUN_DEPENDS= xine:multimedia/xine
57		58
		59	# XXX: webcamd Jog/Shuttle support is not tested
		60	JOGSHUTTLE_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
		61	JOGSHUTTLE_RUN_DEPENDS= webcamd:multimedia/webcamd
		62	JOGSHUTTLE_CMAKE_OFF= -DWITH_JogShuttle:BOOL=FALSE
		63
58	post-patch:	64	post-patch:
59	@${REINPLACE_CMD} -E -e '/${PORTNAME}.(menu\|xpm)/ d' \	65	@${REINPLACE_CMD} -E -e '/${PORTNAME}.(menu\|xpm)/ d' \
60	-e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \	66	-e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
61	${PATCH_WRKSRC}/data/CMakeLists.txt	67	${PATCH_WRKSRC}/data/CMakeLists.txt
62		68
		69	post-patch-JOGSHUTTLE-on:
		70	@${REINPLACE_CMD} -e '/#include <asm\/types\.h>/d' \
		71	${WRKSRC}/src/lib/external/media_ctrl/mediactrl.c
		72
63	.include <bsd.port.mk>	73	.include <bsd.port.mk>

Lines 14-20 Link Here

(-)multimedia/lives/Makefile (-1 / +1 lines)
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/videodev.h:multimedia/v4l_compat \
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 11-17 Link Here

(-)comms/lirc/Makefile (-1 / +1 lines)
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	INSTALL_TARGET= install-strip	16	INSTALL_TARGET= install-strip
17	USES= alias autoreconf gmake libtool python tar:bzip2	17	USES= alias autoreconf gmake libtool python tar:bzip2




		libpopt.so:devel/popt \
		libopus.so:audio/opus \
		librtlsdr.so:comms/rtl-sdr
BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
		${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat

USE_GITHUB=	yes
GH_ACCOUNT=	sm0svx
GH_PROJECT=	svxlink

USES=		cmake tcl groff pkgconfig
CMAKE_SOURCE_PATH=	${WRKSRC}/src
CMAKE_ARGS+=	-DMAN_INSTALL_DIR:FILEPATH=${MANDIRS} \
		-DLOCAL_STATE_DIR=/var




# $FreeBSD$

PORTNAME=	libevdev
PORTVERSION=	1.5.7
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 pathfix python:build tar:xz localbase
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_LIB_DEPENDS=	libcheck.so: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

(-)devel/libevdev/distinfo (-2 / +3 lines)
1	SHA256 (libevdev-1.4.4.tar.xz) = ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9	1	TIMESTAMP = 1497275877
2	SIZE (libevdev-1.4.4.tar.xz) = 409856	2	SHA256 (libevdev-1.5.7.tar.xz) = a1e59e37a2f0d397ffd7e83b73af0e638db83b8dd08902ef0f651a21cc1dd422
		3	SIZE (libevdev-1.5.7.tar.xz) = 407452




--- 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-int-queue.c.orig	2017-05-04 00:37:30 UTC
+++ test/test-int-queue.c
@@ -33,9 +33,6 @@ START_TEST(test_queue_alloc)
 	rc = queue_alloc(&dev, 0);
 	ck_assert_int_eq(rc, -ENOMEM);
 
-	rc = queue_alloc(&dev, ULONG_MAX);
-	ck_assert_int_eq(rc, -ENOMEM);
-
 	rc = queue_alloc(&dev, 100);
 	ck_assert_int_eq(rc, 0);
 




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

Line 0 Link Here

(-)devel/libevdev/files/patch-test_test-libevdev-init.c (+11 lines)
	1	--- test/test-libevdev-init.c.orig 2017-05-04 00:37:30 UTC
	2	+++ test/test-libevdev-init.c
	3	@@ -490,7 +490,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	2017-05-04 00:37:30 UTC
+++ test/test-main.c
@@ -41,6 +41,7 @@ extern Suite *uinput_suite(void);
 static int
 is_debugger_attached(void)
 {
+#if defined (linux)
 	int status;
 	int rc;
 	int pid = fork();
@@ -64,6 +65,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(int argc, char **argv)

Lines 1-8 Link Here

(-)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.19
7	libdata/pkgconfig/libevdev.pc	10	libdata/pkgconfig/libevdev.pc
8	man/man3/libevdev.3.gz	11	man/man3/libevdev.3.gz




# $FreeBSD$

PORTNAME=	evdev-proto
PORTVERSION=	4.14
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=	wulf@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:]]+/ /' \
		${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>

Line 0 Link Here

(-)devel/evdev-proto/distinfo (+7 lines)
	1	TIMESTAMP = 1512252807
	2	SHA256 (input.h) = 6bdbf3be75ab5d411e4758152d049a40d02b8acbb34d5a76e0c70eaf2341f7ed
	3	SIZE (input.h) = 15502
	4	SHA256 (input-event-codes.h) = e0fc09793c059510d796c078f266f81847e0e86c68f0aa0c103496ddd0854736
	5	SIZE (input-event-codes.h) = 24221
	6	SHA256 (uinput.h) = 9123b078f13047c34797332c4f835e5f1e418387e9a950024920faa5a1186974
	7	SIZE (uinput.h) = 9276

Line 0 Link Here

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

Lines 11-17 Link Here

(-)devel/evemu/Makefile (-1 / +1 lines)
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13		13
14	BUILD_DEPENDS= v4l_compat>=0: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		16
17	USES= tar:xz pathfix libtool pkgconfig localbase	17	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) {

Lines 2-7 Link Here

(-)devel/libmtdev/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= mtdev	3	PORTNAME= mtdev
4	PORTVERSION= 1.1.5	4	PORTVERSION= 1.1.5
		5	PORTREVISION= 1
5	CATEGORIES= devel	6	CATEGORIES= devel
6	MASTER_SITES= http://bitmath.org/code/${PORTNAME}/	7	MASTER_SITES= http://bitmath.org/code/${PORTNAME}/
7	PKGNAMEPREFIX= lib	8	PKGNAMEPREFIX= lib
Lines 12-19 Link Here
12	LICENSE= MIT	13	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
14		15
15	BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	16	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
16	RUN_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat
17		17
18	USES= libtool pathfix tar:bz2	18	USES= libtool pathfix tar:bz2
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes




--- test/mtdev-test.c.orig	2014-02-28 22:48:23.000000000 +0400
+++ test/mtdev-test.c	2015-04-03 02:57:56.890923000 +0300
@@ -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)
 {




# $FreeBSD$

PORTNAME=	evdev
PORTVERSION=	0.7.0
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
	@${REINPLACE_CMD} -e '/header/s,/usr,${LOCALBASE},' \
		${WRKSRC}/${PYSETUP}

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} \
		-name '*.so' -exec ${STRIP_CMD} {} +

Lines 1-2 Link Here

(-)devel/py-evdev/distinfo (-2 / +3 lines)
1	SHA256 (evdev-0.5.0.tar.gz) = 509f0f6ce5a12315fcad0b7f9b41cbdfc5c5f49a7cecdd6a88ce5c1d04f6827c	1	TIMESTAMP = 1507760387
2	SIZE (evdev-0.5.0.tar.gz) = 23931	2	SHA256 (evdev-0.7.0.tar.gz) = 57edafc469a414f58b51af1bfb9ee2babb9f626dd2df530d71c1176871850aa1
		3	SIZE (evdev-0.7.0.tar.gz) = 22623





PORTNAME=	libudev-devd
PORTVERSION=	0.3
PORTREVISION=	1
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

Lines 1-7 Link Here

(-)multimedia/v4l_compat/Makefile (-3 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= v4l_compat	3	PORTNAME= v4l_compat
4	PORTREVISION= 0	4	PORTREVISION= 1
5		5
6	COMMENT= Video4Linux IOCTL header files	6	COMMENT= Video4Linux IOCTL header files
7		7
Lines 14-21 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 v4l2-common.h videodev2.h
18	v4l2-common.h videodev2.h
19	DVB_HEADERS= audio.h dmx.h frontend.h video.h	18	DVB_HEADERS= audio.h dmx.h frontend.h video.h
20	EXTRA_HEADERS= ca.h osd.h version.h	19	EXTRA_HEADERS= ca.h osd.h version.h
21		20

Lines 5-13 Link Here

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





PORTNAME=	xf86-input-evdev
PORTVERSION=	2.10.5
PORTREVISION=	1
CATEGORIES=	x11-drivers

MAINTAINER=	x11@FreeBSD.org

LICENSE=	MIT # various styles
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
LIB_DEPENDS=	libevdev.so:devel/libevdev \
		libmtdev.so:devel/libmtdev
RUN_DEPENDS=	webcamd>=3.1.0.1:multimedia/webcamd

XORG_CAT=	driver
USES=		pathfix

Lines 18-24 Link Here

(-)x11-drivers/xf86-input-synaptics/Makefile (-1 / +1 lines)
18	EVDEV_DESC= Use evdev for input events (requires kernel support)	18	EVDEV_DESC= Use evdev for input events (requires kernel support)
19		19
20	EVDEV_CONFIGURE_ENV= BUILD_EVENTCOMM=yes	20	EVDEV_CONFIGURE_ENV= BUILD_EVENTCOMM=yes
21	EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat	21	EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
22	EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev	22	EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev
23		23
24	.include <bsd.port.mk>	24	.include <bsd.port.mk>

Lines 10-16 Link Here

(-)x11-drivers/xf86-input-wacom/Makefile (-1 / +1 lines)
10		10
11	LICENSE= GPLv2+	11	LICENSE= GPLv2+
12		12
13	BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	13	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
14	RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd	14	RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd
15		15
16	USES= gmake pathfix	16	USES= gmake pathfix

Lines 29-34 Link Here

(-)x11-drivers/xf86-input-wacom/files/patch-src-wcmValidateDevice.c (+9 lines)
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	@@ -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 } },
32	@@ -205,6 +206,10 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo	41	@@ -205,6 +206,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 */





PORTNAME=	libinput
PORTVERSION=	1.6.0
PORTREVISION=	1
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/linux # supplied linux/input.h
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 12-17 Link Here

(-)x11/libwacom/Makefile (+1 lines)
12	LICENSE= MIT	12	LICENSE= MIT
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
		15	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
15	LIB_DEPENDS= libgudev-1.0.so:devel/libgudev	16	LIB_DEPENDS= libgudev-1.0.so:devel/libgudev
16		17
17	USES= gettext-runtime gmake libtool localbase pkgconfig \	18	USES= gettext-runtime gmake libtool localbase pkgconfig \

Lines 10-15 Link Here

(-)x11-drivers/xf86-input-libinput/Makefile (+1 lines)
10	LICENSE= MIT # various styles	10	LICENSE= MIT # various styles
11	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
12		12
		13	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
13	LIB_DEPENDS= libinput.so:x11/libinput	14	LIB_DEPENDS= libinput.so:x11/libinput
14		15
15	XORG_CAT= driver	16	XORG_CAT= driver

Lines 7-13 Link Here

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

Lines 7-13 Link Here

(-)x11-servers/xwayland/Makefile (-1 / +2 lines)
7		7
8	LICENSE= MIT	8	LICENSE= MIT
9		9
10	BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols	10	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
		11	${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols
11	LIB_DEPENDS= libwayland-client.so:graphics/wayland \	12	LIB_DEPENDS= libwayland-client.so:graphics/wayland \
12	libinput.so:x11/libinput	13	libinput.so:x11/libinput
13		14

Return to bug 217248

Lines 19-32 Link Here

(-)comms/svxlink/Makefile (-3 / +2 lines)
19	libpopt.so:devel/popt \	19	libpopt.so:devel/popt \
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= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
23	${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
24		23
25	USE_GITHUB= yes	24	USE_GITHUB= yes
26	GH_ACCOUNT= sm0svx	25	GH_ACCOUNT= sm0svx
27	GH_PROJECT= svxlink	26	GH_PROJECT= svxlink
28		27
29	USES= cmake tcl groff	28	USES= cmake tcl groff pkgconfig
30	CMAKE_SOURCE_PATH= ${WRKSRC}/src	29	CMAKE_SOURCE_PATH= ${WRKSRC}/src
31	CMAKE_ARGS+= -DMAN_INSTALL_DIR:FILEPATH=${MANDIRS} \	30	CMAKE_ARGS+= -DMAN_INSTALL_DIR:FILEPATH=${MANDIRS} \
32	-DLOCAL_STATE_DIR=/var	31	-DLOCAL_STATE_DIR=/var

Lines 1-7 Link Here

(-)devel/libevdev/Makefile (-10 / +21 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= libevdev	3	PORTNAME= libevdev
4	PORTVERSION= 1.4.4	4	PORTVERSION= 1.5.7
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/	6	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/
7		7
Lines 11-32 Link Here
11	LICENSE= MIT # without linux/*.h	11	LICENSE= MIT # without linux/*.h
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	RUN_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	15	LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim
16		16
17	USES= gmake libtool pathfix python:build tar:xz	17	USES= gmake libtool pathfix python:build tar:xz localbase
18	EXTRACT_AFTER_ARGS= --exclude include # v4l_compat	18	EXTRACT_AFTER_ARGS= --exclude include # v4l_compat
19	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
20	CONFIGURE_ENV= ac_cv_path_DOXYGEN=""	20	CONFIGURE_ENV= ac_cv_path_DOXYGEN="" ac_cv_path_VALGRIND=""
21	CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat	21	CPPFLAGS+= -I${LOCALBASE}/include/libepoll-shim
22	INSTALL_TARGET= install-strip	22	INSTALL_TARGET= install-strip
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
24		24
		25	# Test requires /dev/uinput and should be run as root
		26	.if exists(/dev/uinput)
		27	TEST_USES+= pkgconfig
		28	TEST_LIB_DEPENDS= libcheck.so:devel/check
		29	TEST_TARGET= check
		30	TEST_WRKSRC= ${WRKSRC}/test
		31	.endif
		32
25	post-patch:	33	post-patch:
26	@${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,' \	34	@${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,g' \
27	${WRKSRC}/libevdev/Makefile.in	35	${WRKSRC}/libevdev/Makefile.in
28	# XXX tools require signalfd(2), test require /dev/uinput	36	@${REINPLACE_CMD} -e '/^LIBS = /s/$$/ -pthread -lrt -lepoll-shim/' \
29	@${REINPLACE_CMD} -e '/^SUBDIRS/s,tools test,,' \	37	${WRKSRC}/tools/Makefile.in
30	${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
31		42
32	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Line 0 Link Here

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

Line 0 Link Here

(-)devel/libevdev/files/patch-test_test-int-queue.c (+12 lines)
	1	--- test/test-int-queue.c.orig 2017-05-04 00:37:30 UTC
	2	+++ test/test-int-queue.c
	3	@@ -33,9 +33,6 @@ START_TEST(test_queue_alloc)
	4	rc = queue_alloc(&dev, 0);
	5	ck_assert_int_eq(rc, -ENOMEM);
	6
	7	- rc = queue_alloc(&dev, ULONG_MAX);
	8	- ck_assert_int_eq(rc, -ENOMEM);
	9	-
	10	rc = queue_alloc(&dev, 100);
	11	ck_assert_int_eq(rc, 0);
	12

Line 0 Link Here

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

Line 0 Link Here

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

Line 0 Link Here

(-)devel/libevdev/files/patch-test_test-main.c (+26 lines)
	1	--- test/test-main.c.orig 2017-05-04 00:37:30 UTC
	2	+++ test/test-main.c
	3	@@ -41,6 +41,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	@@ -64,6 +65,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(int argc, char **argv)

Line 0 Link Here

(-)devel/evdev-proto/Makefile (+57 lines)
	1	# $FreeBSD$
	2
	3	PORTNAME= evdev-proto
	4	PORTVERSION= 4.14
	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= wulf@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	${WRKSRC}/input.h
	41	@${REINPLACE_CMD} -i '' -E -e \
	42	's/__u([[:digit:]]+)/uint\1_t/g ; \
	43	s/__s([[:digit:]]+)/int\1_t/g ; \
	44	/# *include/s\|<linux/types.h>\|<sys/types.h>\| ; \
	45	/#define/ s/_IOW(.), int/_IOWINT\1/ ; \
	46	/#define/ s/_IOW(.), char\*/_IO\1/ ; \
	47	/#define/ s/_IOC_READ/IOC_OUT/' \
	48	${WRKSRC}/uinput.h
	49
	50	do-install:
	51	@${MKDIR} ${STAGEDIR}${PREFIX}/include/linux/
	52	.for i in ${DISTNAME}
	53	${INSTALL_DATA} ${WRKSRC}/${i} \
	54	${STAGEDIR}${PREFIX}/include/linux/
	55	.endfor
	56
	57	.include <bsd.port.mk>

Lines 1-12 Link Here

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

Line 0 Link Here

(-)devel/libmtdev/files/patch-test-mtdev-test.c (+16 lines)
	1	--- test/mtdev-test.c.orig 2014-02-28 22:48:23.000000000 +0400
	2	+++ test/mtdev-test.c 2015-04-03 02:57:56.890923000 +0300
	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 1-7 Link Here

(-)devel/py-evdev/Makefile (-5 / +12 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= evdev	3	PORTNAME= evdev
4	PORTVERSION= 0.5.0	4	PORTVERSION= 0.7.0
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 12-27 Link Here
12	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
15	BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	15	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
16		16
17	USES= python	17	USES= python
18	USE_PYTHON= autoplist distutils	18	USE_PYTHON= autoplist distutils
19	CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat	19	CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat
20		20
21	post-patch:	21	EVDEV_INCLUDES= ${LOCALBASE}/include
22	@${REINPLACE_CMD} -e '/header/s,/usr,${LOCALBASE},' \
23	${WRKSRC}/${PYSETUP}
24		22
		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
		31
25	post-install:	32	post-install:
26	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \	33	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
27	-name '*.so' -exec ${STRIP_CMD} {} +	34	-name '*.so' -exec ${STRIP_CMD} {} +

Lines 2-7 Link Here

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

Lines 2-7 Link Here

(-)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.5	4	PORTVERSION= 2.10.5
		5	PORTREVISION= 1
5	CATEGORIES= x11-drivers	6	CATEGORIES= x11-drivers
6		7
7	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
Lines 10-19 Link Here
10	LICENSE= MIT # various styles	11	LICENSE= MIT # various styles
11	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
12		13
13	BUILD_DEPENDS= v4l_compat>=1.0.20110603:multimedia/v4l_compat	14	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
14	LIB_DEPENDS= libevdev.so:devel/libevdev \	15	LIB_DEPENDS= libevdev.so:devel/libevdev \
15	libmtdev.so:devel/libmtdev	16	libmtdev.so:devel/libmtdev
16	RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd
17		17
18	XORG_CAT= driver	18	XORG_CAT= driver
19	USES= pathfix	19	USES= pathfix

Lines 2-7 Link Here

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

Lines 1-38 Link Here

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