Attachment #161107 for bug #196978




# Created by:
# $FreeBSD$

PORTNAME=	libevdev
PORTVERSION=	1.3.2
CATEGORIES=	comms
MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/

MAINTAINER=	hselasky@FreeBSD.org
COMMENT=	Linux Event Device library

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

GNU_CONFIGURE=	yes

USES=		autoreconf gettext gmake libtool pkgconfig python tar:xz

CONFIGURE_ARGS=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"

post-patch:
	${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} -n 10 ${REINPLACE_CMD} \
	    -e 's|linux/types.h|sys/types.h|g; \
		s|_IOC_READ|IOC_OUT|g; \
		s|_IOC_WRITE|IOC_IN|g; \
		s|__u8|uint8_t|g; s|__s8|int8_t|g; \
		s|__u16|uint16_t|g; s|__s16|int16_t|g; \
		s|__u32|uint32_t|g; s|__s32|int32_t|g; \
		s|__u64|uint64_t|g; s|__s64|int64_t|g'

.include <bsd.port.mk>


Lines 1-2 Link Here

(-)comms/libevdev/distinfo (-2 lines)
1	SHA256 (libevdev-1.3.2.tar.xz) = a4317de9e818093dc131cc2bb96cdfc0cebd631e4be5c5244e1e373ce1536eed
2	SIZE (libevdev-1.3.2.tar.xz) = 395324




--- Makefile.am.orig	2013-10-22 03:34:17.000000000 +0200
+++ Makefile.am	2015-01-12 10:13:14.000000000 +0100
@@ -3,9 +3,9 @@
 PRINT_DIRECTORY_FLAGS_0=--no-print-directory
 PRINT_DIRECTORY_FLAGS_=$(PRINT_DIRECTORY_FLAGS_$(AM_DEFAULT_VERBOSITY))
 AM_MAKEFLAGS = $(PRINT_DIRECTORY_FLAGS_$(V))
-SUBDIRS = doc libevdev tools test
+SUBDIRS = doc libevdev
 
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
 pkgconfig_DATA = libevdev.pc
 
 EXTRA_DIST = libevdev.pc.in

Lines 1-4 Link Here

(-)comms/libevdev/pkg-descr (-4 lines)
1	This package contains the Event Device Library.
2
3	WWW: http://www.freedesktop.org/wiki/Software/libevdev
4

Lines 1-9 Link Here

(-)comms/libevdev/pkg-plist (-9 lines)
1	include/libevdev-1.0/libevdev/libevdev.h
2	include/libevdev-1.0/libevdev/libevdev-uinput.h
3	lib/libevdev.so.2.1.5
4	lib/libevdev.so.2
5	lib/libevdev.so
6	lib/libevdev.a
7	libdata/pkgconfig/libevdev.pc
8	man/man3/libevdev.3.gz
9




# Created by:
# $FreeBSD$

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

MAINTAINER=	hselasky@FreeBSD.org
COMMENT=	Linux Event Device library

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

BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
RUN_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat

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

USES=		autoreconf gettext gmake libtool pkgconfig python tar:xz

CONFIGURE_ARGS=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"

post-patch:
	@${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,' \
		${WRKSRC}/libevdev/Makefile.in
# XXX tools require signalfd(2), test require /dev/uinput
	@${REINPLACE_CMD} -e '/^SUBDIRS/s,tools test,,' \
		${WRKSRC}/Makefile.in
		s|__u16|uint16_t|g; s|__s16|int16_t|g; \
		s|__u32|uint32_t|g; s|__s32|int32_t|g; \
		s|__u64|uint64_t|g; s|__s64|int64_t|g'

.include <bsd.port.mk>


Lines 1-2 Link Here

(-)devel/libevdev/distinfo (-2 / +2 lines)
1	SHA256 (libevdev-1.3.2.tar.xz) = a4317de9e818093dc131cc2bb96cdfc0cebd631e4be5c5244e1e373ce1536eed	1	SHA256 (libevdev-1.4.4.tar.xz) = ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9
2	SIZE (libevdev-1.3.2.tar.xz) = 395324	2	SIZE (libevdev-1.4.4.tar.xz) = 409856

Lines 1-4 Link Here

(-)devel/libevdev/pkg-descr (-2 / +6 lines)
1	This package contains the Event Device Library.	1	libevdev is a wrapper library for evdev devices. It moves the common
		2	tasks when dealing with evdev devices into a library and provides a
		3	library interface to the callers, thus avoiding erroneous ioctls, etc.
2		4
		5	The eventual goal is that libevdev wraps all ioctls available to evdev
		6	devices, thus making direct access unnecessary.
		7
3	WWW: http://www.freedesktop.org/wiki/Software/libevdev	8	WWW: http://www.freedesktop.org/wiki/Software/libevdev
4

Lines 1-9 Link Here

(-)devel/libevdev/pkg-plist (-5 / +4 lines)
		1	include/libevdev-1.0/libevdev/libevdev-uinput.h
1	include/libevdev-1.0/libevdev/libevdev.h	2	include/libevdev-1.0/libevdev/libevdev.h
2	include/libevdev-1.0/libevdev/libevdev-uinput.h	3	lib/libevdev.a
3	lib/libevdev.so.2.1.5	4	lib/libevdev.so
4	lib/libevdev.so.2	5	lib/libevdev.so.2
5	lib/libevdev.so	6	lib/libevdev.so.2.1.10
6	lib/libevdev.a
7	libdata/pkgconfig/libevdev.pc	7	libdata/pkgconfig/libevdev.pc
8	man/man3/libevdev.3.gz	8	man/man3/libevdev.3.gz
9




# $FreeBSD$

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

MAINTAINER=	hselasky@FreeBSD.org
COMMENT=	Multitouch Protocol Translation Library

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
RUN_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat

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

.include <bsd.port.mk>

Line 0 Link Here

(-)devel/libmtdev/distinfo (+2 lines)
	1	SHA256 (mtdev-1.1.5.tar.bz2) = 6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f
	2	SIZE (mtdev-1.1.5.tar.bz2) = 274162

Line 0 Link Here

(-)devel/libmtdev/files/patch-src_common.h (+11 lines)
	1	--- src/common.h.orig 2013-07-31 17:25:50 UTC
	2	+++ src/common.h
	3	@@ -33,7 +33,7 @@
	4
	5	#include <mtdev-mapping.h>
	6	#include <mtdev-plumbing.h>
	7	-#include <malloc.h>
	8	+#include <stdlib.h>
	9	#include <string.h>
	10	#include <errno.h>
	11

Line 0 Link Here

(-)devel/libmtdev/pkg-descr (+7 lines)
	1	The mtdev is a stand-alone library which transforms all variants of
	2	kernel MT events to the slotted type B protocol. The events put into
	3	mtdev may be from any MT device, specifically type A without contact
	4	tracking, type A with contact tracking, or type B with contact
	5	tracking. See the kernel documentation for further details.
	6
	7	WWW: http://bitmath.org/code/mtdev/

Line 0 Link Here

(-)devel/libmtdev/pkg-plist (+9 lines)
	1	bin/mtdev-test
	2	include/mtdev-mapping.h
	3	include/mtdev-plumbing.h
	4	include/mtdev.h
	5	lib/libmtdev.a
	6	lib/libmtdev.so
	7	lib/libmtdev.so.1
	8	lib/libmtdev.so.1.0.0
	9	libdata/pkgconfig/mtdev.pc

Lines 1-29 Link Here

(-)x11-drivers/xf86-input-evdev/Makefile (-14 / +17 lines)
1	# $FreeBSD: head/x11-drivers/xf86-input-mouse/Makefile 374982 2014-12-19 23:03:54Z dumbbell $	1	# $FreeBSD: head/x11-drivers/xf86-input-mouse/Makefile 374982 2014-12-19 23:03:54Z dumbbell $
2		2
3	PORTNAME= xf86-input-evdev	3	PORTNAME= xf86-input-evdev
4	PORTVERSION= 2.9.1	4	PORTVERSION= 2.9.2
5	CATEGORIES= x11-drivers	5	CATEGORIES= x11-drivers
6		6
7	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org
8	COMMENT= X.Org event device input driver	8	COMMENT= X.Org event device input driver
9		9
10	LIB_DEPENDS= libevdev.so:${PORTSDIR}/comms/libevdev	10	LICENSE= MIT # various styles
		11	LICENSE_FILE= ${WRKSRC}/COPYING
11		12
		13	BUILD_DEPENDS= v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
		14	LIB_DEPENDS= libevdev.so:${PORTSDIR}/devel/libevdev
		15	RUN_DEPENDS= webcamd>=3.1.0.1:${PORTSDIR}/multimedia/webcamd
		16
12	XORG_CAT= driver	17	XORG_CAT= driver
		18	USES= pathfix
		19	CONFIGURE_ENV= UDEV_CFLAGS=" " UDEV_LIBS=" "
		20	INSTALL_TARGET= install-strip
13		21
14	GNU_CONFIGURE=yes	22	OPTIONS_DEFINE= MULTITOUCH
15		23
16	USES= autoreconf gmake libtool pathfix pkgconfig gettext	24	MULTITOUCH_DESC= XInput 2.2 multitouch support
		25	MULTITOUCH_LIB_DEPENDS= libmtdev.so:${PORTSDIR}/devel/libmtdev
17		26
18	post-patch:	27	post-patch-MULTITOUCH-off:
19	${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} -n 10 ${REINPLACE_CMD} \	28	# XXX Convert to CONFIGURE_ENV
20	-e 's\|linux/types.h\|sys/types.h\|g; \	29	@${REINPLACE_CMD} '/PKG_CONFIG/s/mtdev/nonexistent/' \
21	s\|linux/version.h\|sys/param.h\|g; \	30	${WRKSRC}/configure
22	s\|_IOC_READ\|IOC_OUT\|g; \
23	s\|_IOC_WRITE\|IOC_IN\|g; \
24	s\|__u8\|uint8_t\|g; s\|__s8\|int8_t\|g; \
25	s\|__u16\|uint16_t\|g; s\|__s16\|int16_t\|g; \
26	s\|__u32\|uint32_t\|g; s\|__s32\|int32_t\|g; \
27	s\|__u64\|uint64_t\|g; s\|__s64\|int64_t\|g'
28		31
29	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)x11-drivers/xf86-input-evdev/distinfo (-2 / +2 lines)
1	SHA256 (xorg/driver/xf86-input-evdev-2.9.1.tar.bz2) = 0ce30328adfeac90a6f4b508d992fb834d8e50b484b29d3d58cf6683fa8502f9	1	SHA256 (xorg/driver/xf86-input-evdev-2.9.2.tar.bz2) = 792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec
2	SIZE (xorg/driver/xf86-input-evdev-2.9.1.tar.bz2) = 386505	2	SIZE (xorg/driver/xf86-input-evdev-2.9.2.tar.bz2) = 387095

Lines 1-11 Link Here

(-)x11-drivers/xf86-input-evdev/files/patch-Makefile.am (-11 lines)
1	--- Makefile.am.orig 2015-01-12 10:33:33.000000000 +0100
2	+++ Makefile.am 2015-01-12 10:33:44.000000000 +0100
3	@@ -25,7 +25,7 @@
4	SUBDIRS = src man include
5	MAINTAINERCLEANFILES = ChangeLog INSTALL
6
7	-pkgconfigdir = $(libdir)/pkgconfig
8	+pkgconfigdir = $(prefix)/libdata/pkgconfig
9	pkgconfig_DATA = xorg-evdev.pc
10
11




--- configure.ac.orig	2015-01-12 08:47:13.000000000 +0100
+++ configure.ac	2015-01-12 08:47:52.000000000 +0100
@@ -45,7 +45,8 @@
 
 # Obtain compiler/linker options from server and required extensions
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto)
-PKG_CHECK_MODULES(UDEV, libudev)
+#Linux Only
+#PKG_CHECK_MODULES(UDEV, libudev)
 
 PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3] [xorg-server >= 1.11.99.901], HAVE_XI22="yes", HAVE_XI22="no")
 PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4])




--- src/evdev.c.orig	2015-01-13 14:06:29.000000000 +0100
+++ src/evdev.c	2015-01-13 14:11:54.000000000 +0100
@@ -39,7 +39,9 @@
 
 #include <linux/version.h>
 #include <sys/stat.h>
+#ifdef __linux__
 #include <libudev.h>
+#endif
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -222,6 +224,7 @@
 static BOOL
 EvdevDeviceIsVirtual(const char* devicenode)
 {
+#ifdef __linux__
     struct udev *udev = NULL;
     struct udev_device *device = NULL;
     struct stat st;
@@ -252,6 +255,9 @@
     udev_device_unref(device);
     udev_unref(udev);
     return rc;
+#else
+    return FALSE;
+#endif
 }
 
 #ifndef HAVE_SMOOTH_SCROLLING
@@ -1078,11 +1084,13 @@
     do {
         rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
         if (rc < 0) {
-            if (rc == -ENODEV) /* May happen after resume */
+            if (rc != -EAGAIN && rc != -EINTR && rc != -EWOULDBLOCK) {
+                /* May happen after resume or at device detach */
                 xf86RemoveEnabledDevice(pInfo);
-            else if (rc != -EAGAIN)
+                EvdevCloseDevice(pInfo);
                 LogMessageVerbSigSafe(X_ERROR, 0, "%s: Read error: %s\n", pInfo->name,
                                        strerror(-rc));
+            }
             break;
         } else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {
 #ifdef MULTITOUCH
@@ -1436,10 +1444,15 @@
             continue;
 
         abs = libevdev_get_abs_info(pEvdev->dev, axis);
+#if defined(__linux__)
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 30)
         /* Kernel provides units/mm, X wants units/m */
         resolution = abs->resolution * 1000;
 #endif
+#else
+        /* Kernel provides units/mm, X wants units/m */
+        resolution = abs->resolution * 1000;
+#endif
 
         xf86InitValuatorAxisStruct(device, axnum,
                                    atoms[axnum],




--- src/evdev.c.orig	2015-03-27 01:35:50 UTC
+++ src/evdev.c
@@ -37,9 +37,13 @@
 #include <X11/keysym.h>
 #include <X11/extensions/XI.h>
 
+#ifdef __linux__
 #include <linux/version.h>
+#endif
 #include <sys/stat.h>
+#ifdef HAVE_LIBUDEV
 #include <libudev.h>
+#endif
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -222,6 +226,7 @@ EvdevIsDuplicate(InputInfoPtr pInfo)
 static BOOL
 EvdevDeviceIsVirtual(const char* devicenode)
 {
+#ifdef HAVE_LIBUDEV
     struct udev *udev = NULL;
     struct udev_device *device = NULL;
     struct stat st;
@@ -252,6 +257,9 @@ out:
     udev_device_unref(device);
     udev_unref(udev);
     return rc;

 }
 
 #ifndef HAVE_SMOOTH_SCROLLING
@@ -1086,11 +1094,13 @@ EvdevReadInput(InputInfoPtr pInfo)
     do {
         rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
         if (rc < 0) {

             break;
         } else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {
 #ifdef MULTITOUCH
@@ -1470,10 +1480,15 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de
             continue;
 
         abs = libevdev_get_abs_info(pEvdev->dev, axis);
+#ifdef __linux__
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 30)
         /* Kernel provides units/mm, X wants units/m */
         resolution = abs->resolution * 1000;




--- src/evdev.h.orig	2015-03-27 01:35:50 UTC
+++ src/evdev.h
@@ -36,7 +36,15 @@
 #define EVDEV_H
 
 #include <linux/input.h>
-#include <linux/types.h>
+#include <sys/types.h>
+
+/* XXX Copied from <xf86str.h> for linux */
+/* Tolerate prior #include <linux/input.h> */
+#undef BUS_NONE
+#undef BUS_PCI
+#undef BUS_SBUS
+#undef BUS_PLATFORM
+#undef BUS_last
 
 #include <xorg-server.h>
 #include <xf86Xinput.h>

Lines 1-3 Link Here

(-)x11-drivers/xf86-input-evdev/pkg-descr (-1 / +3 lines)
1	This package contains the X.Org xf86-input-evdev driver.	1	This package contains the X.Org xf86-input-evdev driver. It supports
		2	all input devices that webcamd knows about, including tablets,
		3	touchscreens, joysticks and HIDs.
2		4
3	WWW: http://www.x.org	5	WWW: http://www.x.org

Lines 2-5 include/xorg/evdev-properties.h Link Here

(-)x11-drivers/xf86-input-evdev/pkg-plist (-1 lines)
2	lib/xorg/modules/input/evdev_drv.so	2	lib/xorg/modules/input/evdev_drv.so
3	libdata/pkgconfig/xorg-evdev.pc	3	libdata/pkgconfig/xorg-evdev.pc
4	man/man4/evdev.4x.gz	4	man/man4/evdev.4x.gz
5

Return to bug 196978

Lines 1-32 Link Here

(-)comms/libevdev/Makefile (-32 lines)
1	# Created by:
2	# $FreeBSD$
3
4	PORTNAME= libevdev
5	PORTVERSION= 1.3.2
6	CATEGORIES= comms
7	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/
8
9	MAINTAINER= hselasky@FreeBSD.org
10	COMMENT= Linux Event Device library
11
12	LICENSE= GPLv2
13	LICENSE_FILE= ${WRKSRC}/COPYING
14
15	GNU_CONFIGURE= yes
16
17	USES= autoreconf gettext gmake libtool pkgconfig python tar:xz
18
19	CONFIGURE_ARGS= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
20
21	post-patch:
22	${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} -n 10 ${REINPLACE_CMD} \
23	-e 's\|linux/types.h\|sys/types.h\|g; \
24	s\|_IOC_READ\|IOC_OUT\|g; \
25	s\|_IOC_WRITE\|IOC_IN\|g; \
26	s\|__u8\|uint8_t\|g; s\|__s8\|int8_t\|g; \
27	s\|__u16\|uint16_t\|g; s\|__s16\|int16_t\|g; \
28	s\|__u32\|uint32_t\|g; s\|__s32\|int32_t\|g; \
29	s\|__u64\|uint64_t\|g; s\|__s64\|int64_t\|g'
30
31	.include <bsd.port.mk>
32

Lines 1-14 Link Here

(-)comms/libevdev/files/patch-Makefile.am (-14 lines)
1	--- Makefile.am.orig 2013-10-22 03:34:17.000000000 +0200
2	+++ Makefile.am 2015-01-12 10:13:14.000000000 +0100
3	@@ -3,9 +3,9 @@
4	PRINT_DIRECTORY_FLAGS_0=--no-print-directory
5	PRINT_DIRECTORY_FLAGS_=$(PRINT_DIRECTORY_FLAGS_$(AM_DEFAULT_VERBOSITY))
6	AM_MAKEFLAGS = $(PRINT_DIRECTORY_FLAGS_$(V))
7	-SUBDIRS = doc libevdev tools test
8	+SUBDIRS = doc libevdev
9
10	-pkgconfigdir = $(libdir)/pkgconfig
11	+pkgconfigdir = $(prefix)/libdata/pkgconfig
12	pkgconfig_DATA = libevdev.pc
13
14	EXTRA_DIST = libevdev.pc.in

Lines 1-32 Link Here

(-)devel/libevdev/Makefile (-17 / +17 lines)
1	# Created by:
2	# $FreeBSD$	1	# $FreeBSD$
3		2
4	PORTNAME= libevdev	3	PORTNAME= libevdev
5	PORTVERSION= 1.3.2	4	PORTVERSION= 1.4.4
6	CATEGORIES= comms	5	CATEGORIES= devel
7	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/	6	MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/
8		7
9	MAINTAINER= hselasky@FreeBSD.org	8	MAINTAINER= hselasky@FreeBSD.org
10	COMMENT= Linux Event Device library	9	COMMENT= Linux Event Device library
11		10
12	LICENSE= GPLv2	11	LICENSE= MIT # without linux/*.h
13	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
14		13
		14	BUILD_DEPENDS= v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
		15	RUN_DEPENDS= v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
		16
		17	USES= gmake libtool pathfix pkgconfig python:build tar:xz
		18	EXTRACT_AFTER_ARGS= --exclude include # v4l_compat
15	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
		20	CONFIGURE_ENV= ac_cv_path_DOXYGEN=""
		21	CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat
		22	INSTALL_TARGET= install-strip
		23	USE_LDCONFIG= yes
16		24
17	USES= autoreconf gettext gmake libtool pkgconfig python tar:xz
18
19	CONFIGURE_ARGS= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
20
21	post-patch:	25	post-patch:
22	${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} -n 10 ${REINPLACE_CMD} \	26	@${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,' \
23	-e 's\|linux/types.h\|sys/types.h\|g; \	27	${WRKSRC}/libevdev/Makefile.in
24	s\|_IOC_READ\|IOC_OUT\|g; \	28	# XXX tools require signalfd(2), test require /dev/uinput
25	s\|_IOC_WRITE\|IOC_IN\|g; \	29	@${REINPLACE_CMD} -e '/^SUBDIRS/s,tools test,,' \
26	s\|__u8\|uint8_t\|g; s\|__s8\|int8_t\|g; \	30	${WRKSRC}/Makefile.in
27	s\|__u16\|uint16_t\|g; s\|__s16\|int16_t\|g; \
28	s\|__u32\|uint32_t\|g; s\|__s32\|int32_t\|g; \
29	s\|__u64\|uint64_t\|g; s\|__s64\|int64_t\|g'
30		31
31	.include <bsd.port.mk>	32	.include <bsd.port.mk>
32

Line 0 Link Here

(-)devel/libmtdev/Makefile (+24 lines)
	1	# $FreeBSD$
	2
	3	PORTNAME= mtdev
	4	PORTVERSION= 1.1.5
	5	CATEGORIES= devel
	6	MASTER_SITES= http://bitmath.org/code/${PORTNAME}/
	7	PKGNAMEPREFIX= lib
	8
	9	MAINTAINER= hselasky@FreeBSD.org
	10	COMMENT= Multitouch Protocol Translation Library
	11
	12	LICENSE= MIT
	13	LICENSE_FILE= ${WRKSRC}/COPYING
	14
	15	BUILD_DEPENDS= v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
	16	RUN_DEPENDS= v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
	17
	18	USES= libtool pathfix tar:bz2
	19	GNU_CONFIGURE= yes
	20	CPPFLAGS+= -I${LOCALBASE}/include # v4l_compat
	21	INSTALL_TARGET= install-strip
	22	USE_LDCONFIG= yes
	23
	24	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)x11-drivers/xf86-input-evdev/files/patch-configure.ac (-12 lines)
1	--- configure.ac.orig 2015-01-12 08:47:13.000000000 +0100
2	+++ configure.ac 2015-01-12 08:47:52.000000000 +0100
3	@@ -45,7 +45,8 @@
4
5	# Obtain compiler/linker options from server and required extensions
6	PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto)
7	-PKG_CHECK_MODULES(UDEV, libudev)
8	+#Linux Only
9	+#PKG_CHECK_MODULES(UDEV, libudev)
10
11	PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3] [xorg-server >= 1.11.99.901], HAVE_XI22="yes", HAVE_XI22="no")
12	PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4])

Lines 1-62 Link Here

(-)x11-drivers/xf86-input-evdev/files/patch-src-evdev.c (-62 lines)
1	--- src/evdev.c.orig 2015-01-13 14:06:29.000000000 +0100
2	+++ src/evdev.c 2015-01-13 14:11:54.000000000 +0100
3	@@ -39,7 +39,9 @@
4
5	#include <linux/version.h>
6	#include <sys/stat.h>
7	+#ifdef __linux__
8	#include <libudev.h>
9	+#endif
10	#include <unistd.h>
11	#include <errno.h>
12	#include <fcntl.h>
13	@@ -222,6 +224,7 @@
14	static BOOL
15	EvdevDeviceIsVirtual(const char* devicenode)
16	{
17	+#ifdef __linux__
18	struct udev *udev = NULL;
19	struct udev_device *device = NULL;
20	struct stat st;
21	@@ -252,6 +255,9 @@
22	udev_device_unref(device);
23	udev_unref(udev);
24	return rc;
25	+#else
26	+ return FALSE;
27	+#endif
28	}
29
30	#ifndef HAVE_SMOOTH_SCROLLING
31	@@ -1078,11 +1084,13 @@
32	do {
33	rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
34	if (rc < 0) {
35	- if (rc == -ENODEV) /* May happen after resume */
36	+ if (rc != -EAGAIN && rc != -EINTR && rc != -EWOULDBLOCK) {
37	+ /* May happen after resume or at device detach */
38	xf86RemoveEnabledDevice(pInfo);
39	- else if (rc != -EAGAIN)
40	+ EvdevCloseDevice(pInfo);
41	LogMessageVerbSigSafe(X_ERROR, 0, "%s: Read error: %s\n", pInfo->name,
42	strerror(-rc));
43	+ }
44	break;
45	} else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {
46	#ifdef MULTITOUCH
47	@@ -1436,10 +1444,15 @@
48	continue;
49
50	abs = libevdev_get_abs_info(pEvdev->dev, axis);
51	+#if defined(__linux__)
52	#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 30)
53	/* Kernel provides units/mm, X wants units/m */
54	resolution = abs->resolution * 1000;
55	#endif
56	+#else
57	+ /* Kernel provides units/mm, X wants units/m */
58	+ resolution = abs->resolution * 1000;
59	+#endif
60
61	xf86InitValuatorAxisStruct(device, axnum,
62	atoms[axnum],

Lines 1-24 Link Here

(-)x11-drivers/xf86-input-evdev/files/patch-src_evdev.c (-10 / +14 lines)
1	--- src/evdev.c.orig 2015-01-13 14:06:29.000000000 +0100	1	--- src/evdev.c.orig 2015-03-27 01:35:50 UTC
2	+++ src/evdev.c 2015-01-13 14:11:54.000000000 +0100	2	+++ src/evdev.c
3	@@ -39,7 +39,9 @@	3	@@ -37,9 +37,13 @@
		4	#include <X11/keysym.h>
		5	#include <X11/extensions/XI.h>
4		6
		7	+#ifdef __linux__
5	#include <linux/version.h>	8	#include <linux/version.h>
		9	+#endif
6	#include <sys/stat.h>	10	#include <sys/stat.h>
7	+#ifdef __linux__	11	+#ifdef HAVE_LIBUDEV
8	#include <libudev.h>	12	#include <libudev.h>
9	+#endif	13	+#endif
10	#include <unistd.h>	14	#include <unistd.h>
11	#include <errno.h>	15	#include <errno.h>
12	#include <fcntl.h>	16	#include <fcntl.h>
13	@@ -222,6 +224,7 @@	17	@@ -222,6 +226,7 @@ EvdevIsDuplicate(InputInfoPtr pInfo)
14	static BOOL	18	static BOOL
15	EvdevDeviceIsVirtual(const char* devicenode)	19	EvdevDeviceIsVirtual(const char* devicenode)
16	{	20	{
17	+#ifdef __linux__	21	+#ifdef HAVE_LIBUDEV
18	struct udev *udev = NULL;	22	struct udev *udev = NULL;
19	struct udev_device *device = NULL;	23	struct udev_device *device = NULL;
20	struct stat st;	24	struct stat st;
21	@@ -252,6 +255,9 @@	25	@@ -252,6 +257,9 @@ out:
22	udev_device_unref(device);	26	udev_device_unref(device);
23	udev_unref(udev);	27	udev_unref(udev);
24	return rc;	28	return rc;
Lines 28-34 Link Here
28	}	32	}
29		33
30	#ifndef HAVE_SMOOTH_SCROLLING	34	#ifndef HAVE_SMOOTH_SCROLLING
31	@@ -1078,11 +1084,13 @@	35	@@ -1086,11 +1094,13 @@ EvdevReadInput(InputInfoPtr pInfo)
32	do {	36	do {
33	rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);	37	rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
34	if (rc < 0) {	38	if (rc < 0) {
Lines 44-54 Link Here
44	break;	48	break;
45	} else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {	49	} else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {
46	#ifdef MULTITOUCH	50	#ifdef MULTITOUCH
47	@@ -1436,10 +1444,15 @@	51	@@ -1470,10 +1480,15 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de
48	continue;	52	continue;
49		53
50	abs = libevdev_get_abs_info(pEvdev->dev, axis);	54	abs = libevdev_get_abs_info(pEvdev->dev, axis);
51	+#if defined(__linux__)	55	+#ifdef __linux__
52	#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 30)	56	#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 30)
53	/* Kernel provides units/mm, X wants units/m */	57	/* Kernel provides units/mm, X wants units/m */
54	resolution = abs->resolution * 1000;	58	resolution = abs->resolution * 1000;

Line 0 Link Here

(-)x11-drivers/xf86-input-evdev/files/patch-src_evdev.h (+19 lines)
	1	--- src/evdev.h.orig 2015-03-27 01:35:50 UTC
	2	+++ src/evdev.h
	3	@@ -36,7 +36,15 @@
	4	#define EVDEV_H
	5
	6	#include <linux/input.h>
	7	-#include <linux/types.h>
	8	+#include <sys/types.h>
	9	+
	10	+/* XXX Copied from <xf86str.h> for linux */
	11	+/* Tolerate prior #include <linux/input.h> */
	12	+#undef BUS_NONE
	13	+#undef BUS_PCI
	14	+#undef BUS_SBUS
	15	+#undef BUS_PLATFORM
	16	+#undef BUS_last
	17
	18	#include <xorg-server.h>
	19	#include <xf86Xinput.h>