Index: head/x11-drivers/Makefile =================================================================== --- head/x11-drivers/Makefile (revision 397049) +++ head/x11-drivers/Makefile (revision 397050) @@ -1,55 +1,56 @@ # $FreeBSD$ # COMMENT = X11 drivers SUBDIR += drm-kmod SUBDIR += xf86-input-acecad SUBDIR += xf86-input-egalax SUBDIR += xf86-input-elographics + SUBDIR += xf86-input-evdev SUBDIR += xf86-input-fpit SUBDIR += xf86-input-hyperpen SUBDIR += xf86-input-joystick SUBDIR += xf86-input-keyboard SUBDIR += xf86-input-mouse SUBDIR += xf86-input-mutouch SUBDIR += xf86-input-penmount SUBDIR += xf86-input-synaptics SUBDIR += xf86-input-vmmouse SUBDIR += xf86-input-void SUBDIR += xf86-input-wacom SUBDIR += xf86-video-apm SUBDIR += xf86-video-ark SUBDIR += xf86-video-ati SUBDIR += xf86-video-ati-ums SUBDIR += xf86-video-chips SUBDIR += xf86-video-cirrus SUBDIR += xf86-video-dummy SUBDIR += xf86-video-fbdev SUBDIR += xf86-video-glint SUBDIR += xf86-video-i128 SUBDIR += xf86-video-i740 SUBDIR += xf86-video-intel SUBDIR += xf86-video-mach64 SUBDIR += xf86-video-mga SUBDIR += xf86-video-neomagic SUBDIR += xf86-video-nv SUBDIR += xf86-video-openchrome SUBDIR += xf86-video-r128 SUBDIR += xf86-video-rendition SUBDIR += xf86-video-s3 SUBDIR += xf86-video-s3virge SUBDIR += xf86-video-savage SUBDIR += xf86-video-scfb SUBDIR += xf86-video-siliconmotion SUBDIR += xf86-video-sis SUBDIR += xf86-video-sunffb SUBDIR += xf86-video-tdfx SUBDIR += xf86-video-trident SUBDIR += xf86-video-tseng SUBDIR += xf86-video-vesa SUBDIR += xf86-video-vmware SUBDIR += xf86-video-voodoo SUBDIR += xorg-drivers .include Index: head/x11-drivers/xf86-input-evdev/Makefile =================================================================== --- head/x11-drivers/xf86-input-evdev/Makefile (nonexistent) +++ head/x11-drivers/xf86-input-evdev/Makefile (revision 397050) @@ -0,0 +1,33 @@ +# $FreeBSD$ + +PORTNAME= xf86-input-evdev +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}/devel/libevdev +RUN_DEPENDS= webcamd>=3.1.0.1:${PORTSDIR}/multimedia/webcamd + +XORG_CAT= driver +USES= pathfix +CONFIGURE_ENV= UDEV_CFLAGS=" " UDEV_LIBS=" " +INSTALL_TARGET= install-strip + +OPTIONS_DEFINE= MULTITOUCH + +MULTITOUCH_DESC= XInput 2.2 multitouch support +MULTITOUCH_LIB_DEPENDS= libmtdev.so:${PORTSDIR}/devel/libmtdev + +post-patch-MULTITOUCH-off: +# XXX Convert to CONFIGURE_ENV + @${REINPLACE_CMD} -i '.mtdev.bak' \ + -e '/PKG_CONFIG/s/mtdev/nonexistent/' \ + ${WRKSRC}/configure + +.include Property changes on: head/x11-drivers/xf86-input-evdev/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-drivers/xf86-input-evdev/distinfo =================================================================== --- head/x11-drivers/xf86-input-evdev/distinfo (nonexistent) +++ head/x11-drivers/xf86-input-evdev/distinfo (revision 397050) @@ -0,0 +1,2 @@ +SHA256 (xorg/driver/xf86-input-evdev-2.9.2.tar.bz2) = 792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec +SIZE (xorg/driver/xf86-input-evdev-2.9.2.tar.bz2) = 387095 Property changes on: head/x11-drivers/xf86-input-evdev/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.c =================================================================== --- head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.c (nonexistent) +++ head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.c (revision 397050) @@ -0,0 +1,66 @@ +--- src/evdev.c.orig 2015-03-27 01:35:50 UTC ++++ src/evdev.c +@@ -37,9 +37,13 @@ + #include + #include + ++#ifdef __linux__ + #include ++#endif + #include ++#ifdef HAVE_LIBUDEV + #include ++#endif + #include + #include + #include +@@ -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; ++#else ++ return FALSE; ++#endif + } + + #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) { +- 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 +@@ -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; + #endif ++#else ++ /* Kernel provides units/mm, X wants units/m */ ++ resolution = abs->resolution * 1000; ++#endif + + xf86InitValuatorAxisStruct(device, axnum, + atoms[axnum], Property changes on: head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.h =================================================================== --- head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.h (nonexistent) +++ head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.h (revision 397050) @@ -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 Property changes on: head/x11-drivers/xf86-input-evdev/files/patch-src_evdev.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-drivers/xf86-input-evdev/pkg-descr =================================================================== --- head/x11-drivers/xf86-input-evdev/pkg-descr (nonexistent) +++ head/x11-drivers/xf86-input-evdev/pkg-descr (revision 397050) @@ -0,0 +1,5 @@ +This package contains the X.Org xf86-input-evdev driver. It supports +all input devices that webcamd knows about, including tablets, +touchscreens, joysticks and HIDs. + +WWW: http://www.x.org Property changes on: head/x11-drivers/xf86-input-evdev/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-drivers/xf86-input-evdev/pkg-plist =================================================================== --- head/x11-drivers/xf86-input-evdev/pkg-plist (nonexistent) +++ head/x11-drivers/xf86-input-evdev/pkg-plist (revision 397050) @@ -0,0 +1,4 @@ +include/xorg/evdev-properties.h +lib/xorg/modules/input/evdev_drv.so +libdata/pkgconfig/xorg-evdev.pc +man/man4/evdev.4x.gz Property changes on: head/x11-drivers/xf86-input-evdev/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property