Attachment #179090 for bug #216276

View | Details | Raw Unified | Return to bug 216276
Collapse All | Expand All

Lines 1-7 Link Here

(-)x11-drivers/xf86-input-evdev/Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xf86-input-evdev	3	PORTNAME= xf86-input-evdev
4	PORTVERSION= 2.10.4	4	PORTVERSION= 2.10.5
5	CATEGORIES= x11-drivers	5	CATEGORIES= x11-drivers
6		6
7	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org
Lines 18-23 Link Here
18	XORG_CAT= driver	18	XORG_CAT= driver
19	USES= pathfix	19	USES= pathfix
20	CONFIGURE_ENV= UDEV_CFLAGS=" " UDEV_LIBS=" "	20	CONFIGURE_ENV= UDEV_CFLAGS=" " UDEV_LIBS=" "
21	INSTALL_TARGET= install-strip
22		21
23	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)x11-drivers/xf86-input-evdev/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1479415100	1	TIMESTAMP = 1484717140
2	SHA256 (xorg/driver/xf86-input-evdev-2.10.4.tar.bz2) = bbf6a03fbce1a6c0c7d874eef519fd0a854bf01b515c745d41fa551ce6490cc2	2	SHA256 (xorg/driver/xf86-input-evdev-2.10.5.tar.bz2) = 9edaa6205baf6d2922cc4db3d8e54a7e7773b5f733b0ae90f6be7725f983b70d
3	SIZE (xorg/driver/xf86-input-evdev-2.10.4.tar.bz2) = 404465	3	SIZE (xorg/driver/xf86-input-evdev-2.10.5.tar.bz2) = 405956




--- src/evdev.c.orig	2017-01-03 01:26:00 UTC
+++ src/evdev.c
@@ -38,9 +38,13 @@
 #include <X11/keysym.h>
 #include <X11/extensions/XI.h>
 

 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -226,6 +230,7 @@ EvdevIsDuplicate(InputInfoPtr pInfo)
 static BOOL
 EvdevDeviceIsVirtual(const char* devicenode)
 {

     struct udev *udev = NULL;
     struct udev_device *device = NULL;
     struct stat st;
@@ -256,6 +261,9 @@ out:
     udev_device_unref(device);
     udev_unref(udev);
     return rc;

+#endif
 }
 
 
@@ -1062,11 +1070,13 @@ EvdevReadInput(InputInfoPtr pInfo)
     do {
         rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
         if (rc < 0) {

+            }
             break;
         } else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {
             if (pEvdev->mtdev)
@@ -1476,10 +1486,15 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de
             continue;
 
         abs = libevdev_get_abs_info(pEvdev->dev, axis);

Lines 1-4 Link Here

(-)x11-drivers/xf86-input-evdev/files/patch-src_evdev.h (-1 / +1 lines)
1	--- src/evdev.h.orig 2015-03-27 01:35:50 UTC	1	--- src/evdev.h.orig 2016-11-21 04:59:44 UTC
2	+++ src/evdev.h	2	+++ src/evdev.h
3	@@ -36,7 +36,15 @@	3	@@ -36,7 +36,15 @@
4	#define EVDEV_H	4	#define EVDEV_H

Return to bug 216276

Lines 1-6 Link Here

(-)x11-drivers/xf86-input-evdev/files/patch-src_evdev.c (-8 / +8 lines)
1	--- src/evdev.c.orig 2015-03-27 01:35:50 UTC	1	--- src/evdev.c.orig 2017-01-03 01:26:00 UTC
2	+++ src/evdev.c	2	+++ src/evdev.c
3	@@ -37,9 +37,13 @@	3	@@ -38,9 +38,13 @@
4	#include <X11/keysym.h>	4	#include <X11/keysym.h>
5	#include <X11/extensions/XI.h>	5	#include <X11/extensions/XI.h>
6		6
Lines 14-20 Link Here
14	#include <unistd.h>	14	#include <unistd.h>
15	#include <errno.h>	15	#include <errno.h>
16	#include <fcntl.h>	16	#include <fcntl.h>
17	@@ -222,6 +226,7 @@ EvdevIsDuplicate(InputInfoPtr pInfo)	17	@@ -226,6 +230,7 @@ EvdevIsDuplicate(InputInfoPtr pInfo)
18	static BOOL	18	static BOOL
19	EvdevDeviceIsVirtual(const char* devicenode)	19	EvdevDeviceIsVirtual(const char* devicenode)
20	{	20	{
Lines 22-28 Link Here
22	struct udev *udev = NULL;	22	struct udev *udev = NULL;
23	struct udev_device *device = NULL;	23	struct udev_device *device = NULL;
24	struct stat st;	24	struct stat st;
25	@@ -252,6 +257,9 @@ out:	25	@@ -256,6 +261,9 @@ out:
26	udev_device_unref(device);	26	udev_device_unref(device);
27	udev_unref(udev);	27	udev_unref(udev);
28	return rc;	28	return rc;
Lines 31-38 Link Here
31	+#endif	31	+#endif
32	}	32	}
33		33
34	#ifndef HAVE_SMOOTH_SCROLLING	34
35	@@ -1086,11 +1094,13 @@ EvdevReadInput(InputInfoPtr pInfo)	35	@@ -1062,11 +1070,13 @@ EvdevReadInput(InputInfoPtr pInfo)
36	do {	36	do {
37	rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);	37	rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
38	if (rc < 0) {	38	if (rc < 0) {
Lines 47-54 Link Here
47	+ }	47	+ }
48	break;	48	break;
49	} else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {	49	} else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {
50	#ifdef MULTITOUCH	50	if (pEvdev->mtdev)
51	@@ -1470,10 +1480,15 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de	51	@@ -1476,10 +1486,15 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de
52	continue;	52	continue;
53		53
54	abs = libevdev_get_abs_info(pEvdev->dev, axis);	54	abs = libevdev_get_abs_info(pEvdev->dev, axis);