[Midnightbsd-cvs] mports [23999] trunk/x11-drivers/xf86-input-synaptics: update to 1.9.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 28 09:02:05 EDT 2018
Revision: 23999
http://svnweb.midnightbsd.org/mports/?rev=23999
Author: laffer1
Date: 2018-08-28 09:02:05 -0400 (Tue, 28 Aug 2018)
Log Message:
-----------
update to 1.9.1
Modified Paths:
--------------
trunk/x11-drivers/xf86-input-synaptics/Makefile
trunk/x11-drivers/xf86-input-synaptics/distinfo
trunk/x11-drivers/xf86-input-synaptics/pkg-descr
trunk/x11-drivers/xf86-input-synaptics/pkg-plist
Added Paths:
-----------
trunk/x11-drivers/xf86-input-synaptics/files/
trunk/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c
trunk/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h
trunk/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c
Modified: trunk/x11-drivers/xf86-input-synaptics/Makefile
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/Makefile 2018-08-28 13:01:26 UTC (rev 23998)
+++ trunk/x11-drivers/xf86-input-synaptics/Makefile 2018-08-28 13:02:05 UTC (rev 23999)
@@ -1,17 +1,24 @@
# $MidnightBSD$
PORTNAME= xf86-input-synaptics
-PORTVERSION= 1.8.2
+PORTVERSION= 1.9.1
CATEGORIES= x11-drivers
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org synaptics input driver
-LICENSE= mit
-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>
Modified: trunk/x11-drivers/xf86-input-synaptics/distinfo
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/distinfo 2018-08-28 13:01:26 UTC (rev 23998)
+++ trunk/x11-drivers/xf86-input-synaptics/distinfo 2018-08-28 13:02:05 UTC (rev 23999)
@@ -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 = 1528485941
+SHA256 (xorg/driver/xf86-input-synaptics-1.9.1.tar.bz2) = 7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576
+SIZE (xorg/driver/xf86-input-synaptics-1.9.1.tar.bz2) = 503722
Added: trunk/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c (rev 0)
+++ trunk/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c 2018-08-28 13:02:05 UTC (rev 23999)
@@ -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;
+ }
Property changes on: trunk/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c
___________________________________________________________________
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
Added: trunk/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h (rev 0)
+++ trunk/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h 2018-08-28 13:02:05 UTC (rev 23999)
@@ -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"
+
Property changes on: trunk/x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h
___________________________________________________________________
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
Added: trunk/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c (rev 0)
+++ trunk/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c 2018-08-28 13:02:05 UTC (rev 23999)
@@ -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);
+ }
Property changes on: trunk/x11-drivers/xf86-input-synaptics/files/patch-src_synaptics.c
___________________________________________________________________
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
Modified: trunk/x11-drivers/xf86-input-synaptics/pkg-descr
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/pkg-descr 2018-08-28 13:01:26 UTC (rev 23998)
+++ trunk/x11-drivers/xf86-input-synaptics/pkg-descr 2018-08-28 13:02:05 UTC (rev 23999)
@@ -1,3 +1,3 @@
This package contains the X.Org xf86-input-synaptics driver.
-WWW: http://www.x.org
+WWW: https://www.x.org/
Modified: trunk/x11-drivers/xf86-input-synaptics/pkg-plist
===================================================================
--- trunk/x11-drivers/xf86-input-synaptics/pkg-plist 2018-08-28 13:01:26 UTC (rev 23998)
+++ trunk/x11-drivers/xf86-input-synaptics/pkg-plist 2018-08-28 13:02:05 UTC (rev 23999)
@@ -6,4 +6,4 @@
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
More information about the Midnightbsd-cvs
mailing list