6 files changed, 81 insertions, 6 deletions

diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index de7eb03a1e47..0a99baedddec 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -1,17 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-synaptics
-PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTVERSION=	1.9.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org synaptics input driver
 
-CONFLICTS=	synaptics-[0-9]*
+LICESNE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pathfix
 USE_XORG=	x11 xtst
 XORG_CAT=	driver
 
+OPTIONS_DEFINE=	EVDEV
+EVDEV_DESC=	Use evdev for input events (requires kernel support)
+
+EVDEV_CONFIGURE_ENV=	BUILD_EVENTCOMM=yes
+EVDEV_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
+EVDEV_LIB_DEPENDS=	libevdev.so:devel/libevdev
+
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo
index 1e3f7c49bbdb..324aeaba23f0 100644
--- a/x11-drivers/xf86-input-synaptics/distinfo
+++ b/x11-drivers/xf86-input-synaptics/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xorg/driver/xf86-input-synaptics-1.8.2.tar.bz2) = 7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80
-SIZE (xorg/driver/xf86-input-synaptics-1.8.2.tar.bz2) = 484261
+TIMESTAMP = 1479490184
+SHA256 (xorg/driver/xf86-input-synaptics-1.9.0.tar.bz2) = afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a
+SIZE (xorg/driver/xf86-input-synaptics-1.9.0.tar.bz2) = 501814
diff --git a/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c b/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c
new file mode 100644
index 000000000000..0aecdcd4a315
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c
@@ -0,0 +1,18 @@
+--- src/eventcomm.c.orig	2016-09-30 07:09:32 UTC
++++ src/eventcomm.c
+@@ -421,10 +421,15 @@ event_get_abs(struct libevdev *evdev, in
+     /* We dont trust a zero fuzz as it probably is just a lazy value */
+     if (fuzz && abs->fuzz > 0)
+         *fuzz = abs->fuzz;
++#ifdef __linux__
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)
+     if (res)
+         *res = abs->resolution;
+ #endif
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
++    if (res)
++        *res = abs->resolution;
++#endif
+
+     return 0;
+ }
diff --git a/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h b/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h
new file mode 100644
index 000000000000..0da0434c6f0b
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h
@@ -0,0 +1,18 @@
+--- src/eventcomm.h.orig	2015-11-24 23:47:05 UTC
++++ src/eventcomm.h
+@@ -30,7 +30,15 @@
+ #include <xorg-server.h>
+ 
+ #include <linux/input.h>
++#ifdef __linux__
+ #include <linux/version.h>
++#else
++#undef BUS_NONE
++#undef BUS_PCI
++#undef BUS_SBUS
++#undef BUS_PLATFORM
++#undef BUS_last
++#endif
+ #include <xf86Xinput.h>
+ #include "synproto.h"
+ 
diff --git a/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c b/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c
new file mode 100644
index 000000000000..86833d7a71ad
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c
@@ -0,0 +1,31 @@
+--- src/synaptics.c.orig	2016-09-30 07:09:32 UTC
++++ src/synaptics.c
+@@ -2599,7 +2599,7 @@ HandleScrolling(SynapticsPrivate * priv,
+ 
+         priv->scroll.delta_y += priv->scroll.coast_speed_y * dtime * abs(para->scroll_dist_vert);
+         delay = MIN(delay, POLL_MS);
+-        if (abs(priv->scroll.coast_speed_y) < ddy) {
++        if (fabs(priv->scroll.coast_speed_y) < ddy) {
+             priv->scroll.coast_speed_y = 0;
+             priv->scroll.packets_this_scroll = 0;
+         }
+@@ -2614,7 +2614,7 @@ HandleScrolling(SynapticsPrivate * priv,
+         double ddx = para->coasting_friction * dtime;
+         priv->scroll.delta_x += priv->scroll.coast_speed_x * dtime * abs(para->scroll_dist_horiz);
+         delay = MIN(delay, POLL_MS);
+-        if (abs(priv->scroll.coast_speed_x) < ddx) {
++        if (fabs(priv->scroll.coast_speed_x) < ddx) {
+             priv->scroll.coast_speed_x = 0;
+             priv->scroll.packets_this_scroll = 0;
+         }
+@@ -2670,8 +2670,8 @@ clickpad_guess_clickfingers(SynapticsPri
+              * really, this should be dependent on the touchpad size. Also,
+              * you'll need to find a touchpad that doesn't lie about it's
+              * size. Good luck. */
+-            if (abs(x1 - x2) < (priv->maxx - priv->minx) * .3 &&
+-                abs(y1 - y2) < (priv->maxy - priv->miny) * .3) {
++            if (fabs(x1 - x2) < (priv->maxx - priv->minx) * .3 &&
++                fabs(y1 - y2) < (priv->maxy - priv->miny) * .3) {
+                 close_point |= (1 << j);
+                 close_point |= (1 << i);
+             }
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
index bcb4e1ca5a39..3d205d6d57ec 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -6,4 +6,4 @@ libdata/pkgconfig/xorg-synaptics.pc
 man/man1/synclient.1.gz
 man/man1/syndaemon.1.gz
 man/man4/synaptics.4x.gz
-share/X11/xorg.conf.d/50-synaptics.conf
+share/X11/xorg.conf.d/70-synaptics.conf