FreeBSD Bugzilla – Attachment 151994 Details for
Bug 196978
[x11-drivers/xf86-input-evdev] [comms/libevdev] [new ports] to allow better support for wacom tablets
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for ports
evdev.patch (text/plain), 8.69 KB, created by
Hans Petter Selasky
on 2015-01-21 21:56:09 UTC
(
hide
)
Description:
Patch for ports
Filename:
MIME Type:
Creator:
Hans Petter Selasky
Created:
2015-01-21 21:56:09 UTC
Size:
8.69 KB
patch
obsolete
>Index: ports/comms/libevdev/pkg-plist >=================================================================== >--- ports/comms/libevdev/pkg-plist (revision 0) >+++ ports/comms/libevdev/pkg-plist (revision 3450) >@@ -0,0 +1,9 @@ >+include/libevdev-1.0/libevdev/libevdev.h >+include/libevdev-1.0/libevdev/libevdev-uinput.h >+lib/libevdev.so.2.1.5 >+lib/libevdev.so.2 >+lib/libevdev.so >+lib/libevdev.a >+libdata/pkgconfig/libevdev.pc >+man/man3/libevdev.3.gz >+ >Index: ports/comms/libevdev/Makefile >=================================================================== >--- ports/comms/libevdev/Makefile (revision 0) >+++ ports/comms/libevdev/Makefile (revision 3450) >@@ -0,0 +1,32 @@ >+# Created by: >+# $FreeBSD$ >+ >+PORTNAME= libevdev >+PORTVERSION= 1.3.2 >+CATEGORIES= comms >+MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ >+ >+MAINTAINER= hselasky@FreeBSD.org >+COMMENT= Linux Event Device library >+ >+LICENSE= GPLv2 >+LICENSE_FILE= ${WRKSRC}/COPYING >+ >+GNU_CONFIGURE= yes >+ >+USES= autoreconf gettext gmake libtool pkgconfig python tar:xz >+ >+CONFIGURE_ARGS= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig" >+ >+post-patch: >+ ${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} -n 10 ${REINPLACE_CMD} \ >+ -e 's|linux/types.h|sys/types.h|g; \ >+ s|_IOC_READ|IOC_OUT|g; \ >+ s|_IOC_WRITE|IOC_IN|g; \ >+ s|__u8|uint8_t|g; s|__s8|int8_t|g; \ >+ s|__u16|uint16_t|g; s|__s16|int16_t|g; \ >+ s|__u32|uint32_t|g; s|__s32|int32_t|g; \ >+ s|__u64|uint64_t|g; s|__s64|int64_t|g' >+ >+.include <bsd.port.mk> >+ >Index: ports/comms/libevdev/distinfo >=================================================================== >--- ports/comms/libevdev/distinfo (revision 0) >+++ ports/comms/libevdev/distinfo (revision 3450) >@@ -0,0 +1,2 @@ >+SHA256 (libevdev-1.3.2.tar.xz) = a4317de9e818093dc131cc2bb96cdfc0cebd631e4be5c5244e1e373ce1536eed >+SIZE (libevdev-1.3.2.tar.xz) = 395324 >Index: ports/comms/libevdev/pkg-descr >=================================================================== >--- ports/comms/libevdev/pkg-descr (revision 0) >+++ ports/comms/libevdev/pkg-descr (revision 3450) >@@ -0,0 +1,4 @@ >+This package contains the Event Device Library. >+ >+WWW: http://www.freedesktop.org/wiki/Software/libevdev >+ >Index: ports/comms/libevdev/files/patch-Makefile.am >=================================================================== >--- ports/comms/libevdev/files/patch-Makefile.am (revision 0) >+++ ports/comms/libevdev/files/patch-Makefile.am (revision 3450) >@@ -0,0 +1,14 @@ >+--- Makefile.am.orig 2013-10-22 03:34:17.000000000 +0200 >++++ Makefile.am 2015-01-12 10:13:14.000000000 +0100 >+@@ -3,9 +3,9 @@ >+ PRINT_DIRECTORY_FLAGS_0=--no-print-directory >+ PRINT_DIRECTORY_FLAGS_=$(PRINT_DIRECTORY_FLAGS_$(AM_DEFAULT_VERBOSITY)) >+ AM_MAKEFLAGS = $(PRINT_DIRECTORY_FLAGS_$(V)) >+-SUBDIRS = doc libevdev tools test >++SUBDIRS = doc libevdev >+ >+-pkgconfigdir = $(libdir)/pkgconfig >++pkgconfigdir = $(prefix)/libdata/pkgconfig >+ pkgconfig_DATA = libevdev.pc >+ >+ EXTRA_DIST = libevdev.pc.in >Index: ports/x11-drivers/xf86-input-evdev/pkg-plist >=================================================================== >--- ports/x11-drivers/xf86-input-evdev/pkg-plist (revision 0) >+++ ports/x11-drivers/xf86-input-evdev/pkg-plist (revision 3450) >@@ -0,0 +1,5 @@ >+include/xorg/evdev-properties.h >+lib/xorg/modules/input/evdev_drv.so >+libdata/pkgconfig/xorg-evdev.pc >+man/man4/evdev.4x.gz >+ >Index: ports/x11-drivers/xf86-input-evdev/Makefile >=================================================================== >--- ports/x11-drivers/xf86-input-evdev/Makefile (revision 0) >+++ ports/x11-drivers/xf86-input-evdev/Makefile (revision 3450) >@@ -0,0 +1,29 @@ >+# $FreeBSD: head/x11-drivers/xf86-input-mouse/Makefile 374982 2014-12-19 23:03:54Z dumbbell $ >+ >+PORTNAME= xf86-input-evdev >+PORTVERSION= 2.9.1 >+CATEGORIES= x11-drivers >+ >+MAINTAINER= x11@FreeBSD.org >+COMMENT= X.Org event device input driver >+ >+LIB_DEPENDS= libevdev.so:${PORTSDIR}/comms/libevdev >+ >+XORG_CAT= driver >+ >+GNU_CONFIGURE=yes >+ >+USES= autoreconf gmake libtool pathfix pkgconfig gettext >+ >+post-patch: >+ ${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} -n 10 ${REINPLACE_CMD} \ >+ -e 's|linux/types.h|sys/types.h|g; \ >+ s|linux/version.h|sys/param.h|g; \ >+ s|_IOC_READ|IOC_OUT|g; \ >+ s|_IOC_WRITE|IOC_IN|g; \ >+ s|__u8|uint8_t|g; s|__s8|int8_t|g; \ >+ s|__u16|uint16_t|g; s|__s16|int16_t|g; \ >+ s|__u32|uint32_t|g; s|__s32|int32_t|g; \ >+ s|__u64|uint64_t|g; s|__s64|int64_t|g' >+ >+.include <bsd.port.mk> >Index: ports/x11-drivers/xf86-input-evdev/distinfo >=================================================================== >--- ports/x11-drivers/xf86-input-evdev/distinfo (revision 0) >+++ ports/x11-drivers/xf86-input-evdev/distinfo (revision 3450) >@@ -0,0 +1,2 @@ >+SHA256 (xorg/driver/xf86-input-evdev-2.9.1.tar.bz2) = 0ce30328adfeac90a6f4b508d992fb834d8e50b484b29d3d58cf6683fa8502f9 >+SIZE (xorg/driver/xf86-input-evdev-2.9.1.tar.bz2) = 386505 >Index: ports/x11-drivers/xf86-input-evdev/pkg-descr >=================================================================== >--- ports/x11-drivers/xf86-input-evdev/pkg-descr (revision 0) >+++ ports/x11-drivers/xf86-input-evdev/pkg-descr (revision 3450) >@@ -0,0 +1,3 @@ >+This package contains the X.Org xf86-input-evdev driver. >+ >+WWW: http://www.x.org >Index: ports/x11-drivers/xf86-input-evdev/files/patch-configure.ac >=================================================================== >--- ports/x11-drivers/xf86-input-evdev/files/patch-configure.ac (revision 0) >+++ ports/x11-drivers/xf86-input-evdev/files/patch-configure.ac (revision 3450) >@@ -0,0 +1,12 @@ >+--- configure.ac.orig 2015-01-12 08:47:13.000000000 +0100 >++++ configure.ac 2015-01-12 08:47:52.000000000 +0100 >+@@ -45,7 +45,8 @@ >+ >+ # Obtain compiler/linker options from server and required extensions >+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto) >+-PKG_CHECK_MODULES(UDEV, libudev) >++#Linux Only >++#PKG_CHECK_MODULES(UDEV, libudev) >+ >+ PKG_CHECK_MODULES(XI22, [inputproto >= 2.1.99.3] [xorg-server >= 1.11.99.901], HAVE_XI22="yes", HAVE_XI22="no") >+ PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4]) >Index: ports/x11-drivers/xf86-input-evdev/files/patch-Makefile.am >=================================================================== >--- ports/x11-drivers/xf86-input-evdev/files/patch-Makefile.am (revision 0) >+++ ports/x11-drivers/xf86-input-evdev/files/patch-Makefile.am (revision 3450) >@@ -0,0 +1,11 @@ >+--- Makefile.am.orig 2015-01-12 10:33:33.000000000 +0100 >++++ Makefile.am 2015-01-12 10:33:44.000000000 +0100 >+@@ -25,7 +25,7 @@ >+ SUBDIRS = src man include >+ MAINTAINERCLEANFILES = ChangeLog INSTALL >+ >+-pkgconfigdir = $(libdir)/pkgconfig >++pkgconfigdir = $(prefix)/libdata/pkgconfig >+ pkgconfig_DATA = xorg-evdev.pc >+ >+ >Index: ports/x11-drivers/xf86-input-evdev/files/patch-src-evdev.c >=================================================================== >--- ports/x11-drivers/xf86-input-evdev/files/patch-src-evdev.c (revision 0) >+++ ports/x11-drivers/xf86-input-evdev/files/patch-src-evdev.c (revision 3450) >@@ -0,0 +1,62 @@ >+--- src/evdev.c.orig 2015-01-13 14:06:29.000000000 +0100 >++++ src/evdev.c 2015-01-13 14:11:54.000000000 +0100 >+@@ -39,7 +39,9 @@ >+ >+ #include <linux/version.h> >+ #include <sys/stat.h> >++#ifdef __linux__ >+ #include <libudev.h> >++#endif >+ #include <unistd.h> >+ #include <errno.h> >+ #include <fcntl.h> >+@@ -222,6 +224,7 @@ >+ static BOOL >+ EvdevDeviceIsVirtual(const char* devicenode) >+ { >++#ifdef __linux__ >+ struct udev *udev = NULL; >+ struct udev_device *device = NULL; >+ struct stat st; >+@@ -252,6 +255,9 @@ >+ udev_device_unref(device); >+ udev_unref(udev); >+ return rc; >++#else >++ return FALSE; >++#endif >+ } >+ >+ #ifndef HAVE_SMOOTH_SCROLLING >+@@ -1078,11 +1084,13 @@ >+ 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 >+@@ -1436,10 +1444,15 @@ >+ continue; >+ >+ abs = libevdev_get_abs_info(pEvdev->dev, axis); >++#if defined(__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],
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 196978
: 151994 |
160722
|
161107
|
161109