Index: comms/libevdev/Makefile =================================================================== --- comms/libevdev/Makefile (revision 3628) +++ comms/libevdev/Makefile (working copy) @@ -1,8 +1,7 @@ -# Created by: # $FreeBSD$ PORTNAME= libevdev -PORTVERSION= 1.3.2 +PORTVERSION= 1.4.4 CATEGORIES= comms MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ @@ -9,24 +8,24 @@ MASTER_SITES= http://freedesktop.org/software/${PO MAINTAINER= hselasky@FreeBSD.org COMMENT= Linux Event Device library -LICENSE= GPLv2 +LICENSE= MIT # without linux/*.h LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat + +USES= autoreconf gmake libtool pathfix pkgconfig python:build \ + shebangfix tar:xz +EXTRACT_AFTER_ARGS= --exclude include # v4l_compat +PATHFIX_MAKEFILEIN= Makefile.am +SHEBANG_FILES= libevdev/make-event-names.py +python_OLD_CMD= /usr/bin/env python GNU_CONFIGURE= yes +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: - ${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' + @${REINPLACE_CMD} -e '/input\.h/s,$$(top_srcdir),${LOCALBASE},' \ + ${WRKSRC}/libevdev/Makefile.am .include - Index: comms/libevdev/distinfo =================================================================== --- comms/libevdev/distinfo (revision 3628) +++ comms/libevdev/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (libevdev-1.3.2.tar.xz) = a4317de9e818093dc131cc2bb96cdfc0cebd631e4be5c5244e1e373ce1536eed -SIZE (libevdev-1.3.2.tar.xz) = 395324 +SHA256 (libevdev-1.4.4.tar.xz) = ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9 +SIZE (libevdev-1.4.4.tar.xz) = 409856 Index: comms/libevdev/files/patch-Makefile.am =================================================================== --- comms/libevdev/files/patch-Makefile.am (revision 3628) +++ comms/libevdev/files/patch-Makefile.am (working copy) @@ -1,6 +1,6 @@ ---- 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 @@ +--- Makefile.am.orig 2013-10-22 01:34:17 UTC ++++ Makefile.am +@@ -3,7 +3,7 @@ PRINT_DIRECTORY_FLAGS_1= PRINT_DIRECTORY_FLAGS_0=--no-print-directory PRINT_DIRECTORY_FLAGS_=$(PRINT_DIRECTORY_FLAGS_$(AM_DEFAULT_VERBOSITY)) AM_MAKEFLAGS = $(PRINT_DIRECTORY_FLAGS_$(V)) @@ -7,8 +7,5 @@ -SUBDIRS = doc libevdev tools test +SUBDIRS = doc libevdev --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libevdev.pc - - EXTRA_DIST = libevdev.pc.in Index: comms/libevdev/pkg-descr =================================================================== --- comms/libevdev/pkg-descr (revision 3628) +++ comms/libevdev/pkg-descr (working copy) @@ -1,4 +1,3 @@ This package contains the Event Device Library. WWW: http://www.freedesktop.org/wiki/Software/libevdev - Index: comms/libevdev/pkg-plist =================================================================== --- comms/libevdev/pkg-plist (revision 3628) +++ comms/libevdev/pkg-plist (working copy) @@ -1,9 +1,8 @@ +include/libevdev-1.0/libevdev/libevdev-uinput.h include/libevdev-1.0/libevdev/libevdev.h -include/libevdev-1.0/libevdev/libevdev-uinput.h -lib/libevdev.so.2.1.5 +lib/libevdev.a +lib/libevdev.so lib/libevdev.so.2 -lib/libevdev.so -lib/libevdev.a +lib/libevdev.so.2.1.10 libdata/pkgconfig/libevdev.pc man/man3/libevdev.3.gz - Index: x11-drivers/xf86-input-evdev/Makefile =================================================================== --- x11-drivers/xf86-input-evdev/Makefile (revision 3628) +++ x11-drivers/xf86-input-evdev/Makefile (working copy) @@ -1,29 +1,21 @@ # $FreeBSD: head/x11-drivers/xf86-input-mouse/Makefile 374982 2014-12-19 23:03:54Z dumbbell $ PORTNAME= xf86-input-evdev -PORTVERSION= 2.9.1 +PORTVERSION= 2.9.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org event device input driver +LICENSE= MIT # various styles +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= libevdev.so:${PORTSDIR}/comms/libevdev XORG_CAT= driver +USES= autoreconf pathfix +PATHFIX_MAKEFILEIN= Makefile.am +INSTALL_TARGET= install-strip -GNU_CONFIGURE=yes - -USES= autoreconf gmake libtool pathfix pkgconfig gettext - -post-patch: - ${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} -n 10 ${REINPLACE_CMD} \ - -e 's|linux/types.h|sys/types.h|g; \ - s|linux/version.h|sys/param.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 Index: x11-drivers/xf86-input-evdev/distinfo =================================================================== --- x11-drivers/xf86-input-evdev/distinfo (revision 3628) +++ x11-drivers/xf86-input-evdev/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-evdev-2.9.1.tar.bz2) = 0ce30328adfeac90a6f4b508d992fb834d8e50b484b29d3d58cf6683fa8502f9 -SIZE (xorg/driver/xf86-input-evdev-2.9.1.tar.bz2) = 386505 +SHA256 (xorg/driver/xf86-input-evdev-2.9.2.tar.bz2) = 792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec +SIZE (xorg/driver/xf86-input-evdev-2.9.2.tar.bz2) = 387095 Index: x11-drivers/xf86-input-evdev/files/patch-Makefile.am =================================================================== --- x11-drivers/xf86-input-evdev/files/patch-Makefile.am (revision 3628) +++ x11-drivers/xf86-input-evdev/files/patch-Makefile.am (working copy) @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2015-01-12 10:33:33.000000000 +0100 -+++ Makefile.am 2015-01-12 10:33:44.000000000 +0100 -@@ -25,7 +25,7 @@ - SUBDIRS = src man include - MAINTAINERCLEANFILES = ChangeLog INSTALL - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = xorg-evdev.pc - - Index: x11-drivers/xf86-input-evdev/files/patch-configure.ac =================================================================== --- x11-drivers/xf86-input-evdev/files/patch-configure.ac (revision 3628) +++ x11-drivers/xf86-input-evdev/files/patch-configure.ac (working copy) @@ -1,6 +1,6 @@ ---- 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 @@ +--- configure.ac.orig 2015-03-27 01:36:31 UTC ++++ configure.ac +@@ -45,7 +45,8 @@ XORG_DEFAULT_OPTIONS # Obtain compiler/linker options from server and required extensions PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto) Index: x11-drivers/xf86-input-evdev/files/patch-src-evdev.c =================================================================== --- x11-drivers/xf86-input-evdev/files/patch-src-evdev.c (revision 3628) +++ x11-drivers/xf86-input-evdev/files/patch-src-evdev.c (working copy) @@ -1,62 +0,0 @@ ---- 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 - #include -+#ifdef __linux__ - #include -+#endif - #include - #include - #include -@@ -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], Index: x11-drivers/xf86-input-evdev/files/patch-src_evdev.c =================================================================== --- x11-drivers/xf86-input-evdev/files/patch-src_evdev.c (revision 3628) +++ x11-drivers/xf86-input-evdev/files/patch-src_evdev.c (working copy) @@ -1,16 +1,19 @@ ---- 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 @@ +--- src/evdev.c.orig 2015-03-27 01:35:50 UTC ++++ src/evdev.c +@@ -37,9 +37,11 @@ + #include + #include - #include +-#include #include +#ifdef __linux__ ++#include #include +#endif #include #include #include -@@ -222,6 +224,7 @@ +@@ -222,6 +224,7 @@ EvdevIsDuplicate(InputInfoPtr pInfo) static BOOL EvdevDeviceIsVirtual(const char* devicenode) { @@ -18,7 +21,7 @@ struct udev *udev = NULL; struct udev_device *device = NULL; struct stat st; -@@ -252,6 +255,9 @@ +@@ -252,6 +255,9 @@ out: udev_device_unref(device); udev_unref(udev); return rc; @@ -28,7 +31,7 @@ } #ifndef HAVE_SMOOTH_SCROLLING -@@ -1078,11 +1084,13 @@ +@@ -1086,11 +1092,13 @@ EvdevReadInput(InputInfoPtr pInfo) do { rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev); if (rc < 0) { @@ -44,7 +47,7 @@ break; } else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) { #ifdef MULTITOUCH -@@ -1436,10 +1444,15 @@ +@@ -1470,10 +1478,15 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de continue; abs = libevdev_get_abs_info(pEvdev->dev, axis); Index: x11-drivers/xf86-input-evdev/files/patch-src_evdev.h =================================================================== --- x11-drivers/xf86-input-evdev/files/patch-src_evdev.h (revision 0) +++ x11-drivers/xf86-input-evdev/files/patch-src_evdev.h (working copy) @@ -0,0 +1,19 @@ +--- src/evdev.h.orig 2015-03-27 01:35:50 UTC ++++ src/evdev.h +@@ -36,7 +36,15 @@ + #define EVDEV_H + + #include +-#include ++#include ++ ++/* XXX Copied from for linux */ ++/* Tolerate prior #include */ ++#undef BUS_NONE ++#undef BUS_PCI ++#undef BUS_SBUS ++#undef BUS_PLATFORM ++#undef BUS_last + + #include + #include Index: x11-drivers/xf86-input-evdev/pkg-plist =================================================================== --- x11-drivers/xf86-input-evdev/pkg-plist (revision 3628) +++ x11-drivers/xf86-input-evdev/pkg-plist (working copy) @@ -2,4 +2,3 @@ include/xorg/evdev-properties.h lib/xorg/modules/input/evdev_drv.so libdata/pkgconfig/xorg-evdev.pc man/man4/evdev.4x.gz -