Attachment #179229 for bug #214715

Lines 1-17 Link Here

(-)x11-drivers/xf86-input-synaptics/Makefile (-3 / +11 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xf86-input-synaptics	3	PORTNAME= xf86-input-synaptics
4	PORTVERSION= 1.8.2	4	PORTVERSION= 1.9.0
5	PORTREVISION= 1
6	CATEGORIES= x11-drivers	5	CATEGORIES= x11-drivers
7		6
8	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org
9	COMMENT= X.Org synaptics input driver	8	COMMENT= X.Org synaptics input driver
10		9
11	CONFLICTS= synaptics-[0-9]*	10	LICENSE= MIT
		11	LICENSE_FILE= ${WRKSRC}/COPYING
12		12
		13	OPTIONS_DEFINE= EVDEV
		14	EVDEV_DESC= Support for input event devices
		15
13	USES= pathfix	16	USES= pathfix
14	USE_XORG= x11 xtst	17	USE_XORG= x11 xtst
15	XORG_CAT= driver	18	XORG_CAT= driver
		19	INSTALL_TARGET= install-strip
16		20
		21	EVDEV_CONFIGURE_ENV= BUILD_EVENTCOMM=yes
		22	EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
		23	EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev
		24
17	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)x11-drivers/xf86-input-synaptics/distinfo (-2 / +3 lines)
1	SHA256 (xorg/driver/xf86-input-synaptics-1.8.2.tar.bz2) = 7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80	1	TIMESTAMP = 1479731896
2	SIZE (xorg/driver/xf86-input-synaptics-1.8.2.tar.bz2) = 484261	2	SHA256 (xorg/driver/xf86-input-synaptics-1.9.0.tar.bz2) = afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a
		3	SIZE (xorg/driver/xf86-input-synaptics-1.9.0.tar.bz2) = 501814




--- src/eventcomm.c.orig	2016-04-26 23:29:23 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__)
+    if (res)
+        *res = abs->resolution;
+#endif
 
     return 0;
 }




--- 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"
 

Lines 6-9 Link Here

(-)x11-drivers/xf86-input-synaptics/pkg-plist (-1 / +1 lines)
6	man/man1/synclient.1.gz	6	man/man1/synclient.1.gz
7	man/man1/syndaemon.1.gz	7	man/man1/syndaemon.1.gz
8	man/man4/synaptics.4x.gz	8	man/man4/synaptics.4x.gz
9	share/X11/xorg.conf.d/50-synaptics.conf	9	share/X11/xorg.conf.d/70-synaptics.conf

Return to bug 214715

Line 0 Link Here

(-)x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c (+18 lines)
	1	--- src/eventcomm.c.orig 2016-04-26 23:29:23 UTC
	2	+++ src/eventcomm.c
	3	@@ -421,10 +421,15 @@ event_get_abs(struct libevdev *evdev, in
	4	/* We dont trust a zero fuzz as it probably is just a lazy value */
	5	if (fuzz && abs->fuzz > 0)
	6	*fuzz = abs->fuzz;
	7	+#ifdef __linux__
	8	#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)
	9	if (res)
	10	*res = abs->resolution;
	11	#endif
	12	+#elif defined(__FreeBSD__)
	13	+ if (res)
	14	+ *res = abs->resolution;
	15	+#endif
	16
	17	return 0;
	18	}

Line 0 Link Here

(-)x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h (+18 lines)
	1	--- src/eventcomm.h.orig 2015-11-24 23:47:05 UTC
	2	+++ src/eventcomm.h
	3	@@ -30,7 +30,15 @@
	4	#include <xorg-server.h>
	5
	6	#include <linux/input.h>
	7	+#ifdef __linux__
	8	#include <linux/version.h>
	9	+#else
	10	+#undef BUS_NONE
	11	+#undef BUS_PCI
	12	+#undef BUS_SBUS
	13	+#undef BUS_PLATFORM
	14	+#undef BUS_last
	15	+#endif
	16	#include <xf86Xinput.h>
	17	#include "synproto.h"
	18