svn commit: r357422 - in head: . x11-drivers x11-drivers/input-wacom x11-drivers/xf86-input-wacom x11-drivers/xf86-input-wacom/files x11-drivers/xorg-drivers
Baptiste Daroussin
bapt at FreeBSD.org
Wed Jun 11 06:44:45 UTC 2014
Author: bapt
Date: Wed Jun 11 06:44:41 2014
New Revision: 357422
URL: http://svnweb.freebsd.org/changeset/ports/357422
QAT: https://qat.redports.org/buildarchive/r357422/
Log:
Update wacom input driver to 0.24.99.1
- replace rc.d script with a sample file to simplify configuration
- use the underlying install target; this exposes xorg headers which may
be used by gnome-settings-daemon
- drop gmake and autotools dependencies
- drop explicit xinput dependency
- require webcamd to get /dev/input/eventN
- require xinerama for xsetwacom display mapping
- explicitly disable doxygen docs
- add wacom to xorg-drivers port
- pass maintainership to submitter
- enable support of wacom tablets connected via a serial port [1]
- support stage
PR: 175876 , 181133 [1]
Submitted by: Jan Beich, aasoft at gmail.com [1]
Added:
head/x11-drivers/xf86-input-wacom/
- copied from r356504, head/x11-drivers/input-wacom/
head/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c (contents, props changed)
head/x11-drivers/xf86-input-wacom/files/patch-tools-isdv4-serial-debugger.c (contents, props changed)
head/x11-drivers/xf86-input-wacom/files/patch-tools-isdv4-serial-inputattach.c (contents, props changed)
head/x11-drivers/xf86-input-wacom/files/patch-tools-tools-shared.c (contents, props changed)
head/x11-drivers/xf86-input-wacom/files/pkg-message.in (contents, props changed)
head/x11-drivers/xf86-input-wacom/files/wacom.conf.sample (contents, props changed)
Deleted:
head/x11-drivers/input-wacom/
head/x11-drivers/xf86-input-wacom/files/patch-configure.ac
head/x11-drivers/xf86-input-wacom/files/patch-src-Makefile.in
head/x11-drivers/xf86-input-wacom/files/patch-tools-Makefile.in
head/x11-drivers/xf86-input-wacom/files/pkg-message-serial.in
head/x11-drivers/xf86-input-wacom/files/pkg-message-usb.in
head/x11-drivers/xf86-input-wacom/files/wacom.in
Modified:
head/MOVED
head/x11-drivers/Makefile
head/x11-drivers/xf86-input-wacom/Makefile
head/x11-drivers/xf86-input-wacom/distinfo
head/x11-drivers/xf86-input-wacom/files/patch-src-wcmConfig.c
head/x11-drivers/xf86-input-wacom/files/patch-src-wcmUSB.c
head/x11-drivers/xf86-input-wacom/files/patch-src-xf86WacomDefs.h
head/x11-drivers/xf86-input-wacom/pkg-descr
head/x11-drivers/xf86-input-wacom/pkg-plist
head/x11-drivers/xorg-drivers/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Wed Jun 11 06:25:14 2014 (r357421)
+++ head/MOVED Wed Jun 11 06:44:41 2014 (r357422)
@@ -6129,3 +6129,4 @@ net/cvsup-mirror||2014-06-01|Removed: ww
multimedia/shell-fm||2014-06-02|Has expired: Unusable, subscription radio streaming service will come to an end
security/py-posix1e|security/py-pylibacl|2014-06-03|Duplicate of security/py-pylibacl
www/mediawiki120||2014-06-08|Has expired: Not maintained upstream
+x11-drivers/input-wacom|x11-drivers/xf86-input-wacom|2014-06-11|Following the usual naming of xorg input drivers
Modified: head/x11-drivers/Makefile
==============================================================================
--- head/x11-drivers/Makefile Wed Jun 11 06:25:14 2014 (r357421)
+++ head/x11-drivers/Makefile Wed Jun 11 06:44:41 2014 (r357422)
@@ -3,7 +3,6 @@
COMMENT = X11 drivers
- SUBDIR += input-wacom
SUBDIR += xf86-input-acecad
SUBDIR += xf86-input-egalax
SUBDIR += xf86-input-elographics
@@ -16,6 +15,7 @@
SUBDIR += xf86-input-penmount
SUBDIR += xf86-input-synaptics
SUBDIR += xf86-input-vmmouse
+ SUBDIR += xf86-input-wacom
SUBDIR += xf86-input-void
SUBDIR += xf86-video-apm
SUBDIR += xf86-video-ark
Modified: head/x11-drivers/xf86-input-wacom/Makefile
==============================================================================
--- head/x11-drivers/input-wacom/Makefile Wed Jun 4 14:39:22 2014 (r356504)
+++ head/x11-drivers/xf86-input-wacom/Makefile Wed Jun 11 06:44:41 2014 (r357422)
@@ -1,113 +1,38 @@
-# Created by: Dominic Fandrey <kamikaze at bsdforen.de>
# $FreeBSD$
-PORTNAME= input-wacom
-PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
-PORTREVISION= 4
-CATEGORIES= x11-drivers kld
-MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \
- SF/linuxwacom/xf86-input-wacom/:linuxwacom
-DISTFILES= ${BSDWACOM}.tbz:bsdwacom \
- ${LINUXWACOM}.tar.bz2:linuxwacom
+PORTNAME= xf86-input-wacom
+PORTVERSION= 0.24.99.1
+CATEGORIES= x11-drivers
+MASTER_SITES= SF/linuxwacom/${PORTNAME}
-MAINTAINER= ports at FreeBSD.org
-COMMENT= X.Org Wacom tablet driver and kernel module
+MAINTAINER= jbeich at vfemail.net
+COMMENT= X.Org Wacom tablet driver
BUILD_DEPENDS= v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
+RUN_DEPENDS= webcamd>0:${PORTSDIR}/multimedia/webcamd
-MAN4= wacom.4x
-MAN1= xsetwacom.1
-#MANCOMPRESSED= yes
-
-USES= gmake
-USE_RC_SUBR= wacom
-
-KMODDIR?= /boot/modules
-XINPUTMODDIR= lib/xorg/modules/input
-MAN1DIR= man/man1
-MAN4DIR= man/man4
-WRKSRC= ${WRKDIR}
-
-PLIST_SUB+= KMODDIR=${KMODDIR} \
- XINPUTMODDIR=${XINPUTMODDIR} \
- PORTTYPE=${PORTTYPE}
-SUB_LIST:= ${PLIST_SUB}
-SUB_FILES+= pkg-message-${PORTTYPE}
-PKGMESSAGE= ${WRKDIR}/pkg-message-${PORTTYPE}
-
+USES= tar:bzip2 pathfix pkgconfig libtool
+USE_XORG= xrandr xinerama
XORG_CAT= driver
-USE_XORG= xi xrandr
-
-LINUXWACOM= xf86-input-wacom-${WACOM_VERSION}
-BSDWACOM= bsdwacom-${KLD_VERSION}
-WACOM_VERSION= 0.15.0
-KLD_VERSION= 40
-PATCH_WRKSRC= ${WRKDIR}/${LINUXWACOM}
-CONFIGURE_WRKSRC= ${WRKDIR}/${LINUXWACOM}
-USE_AUTOTOOLS= autoconf
-MAKE_ARGS+= UDEV_CFLAGS=""
-
-OPTIONS_DEFINE= UWACOMKLD
-UWACOMKLD_DESC= Install USB kernel module (not supported on 8.x)
-
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MUWACOMKLD}
-PLIST_SUB+= UWACOMKLD="uwacom.ko"
-PORTTYPE= usb
-.else
-PLIST_SUB+= UWACOMKLD="@noinst UWACOMKLD uwacom.ko"
-PORTTYPE= serial
-.endif
-
-do-build:
-.if ${PORT_OPTIONS:MUWACOMKLD}
- @cd ${WRKDIR}/uwacom \
- && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
-.endif
- @cd ${WRKDIR}/${LINUXWACOM} \
- && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS}
-
-do-install:
-.if ${PORT_OPTIONS:MUWACOMKLD}
- @${MKDIR} ${KMODDIR}
- @${INSTALL_KLD} ${WRKDIR}/uwacom/uwacom.ko ${KMODDIR}/
-.endif
- @${MKDIR} ${PREFIX}/${XINPUTMODDIR} ${PREFIX}/${MAN4DIR}
- @cd ${WRKDIR}/${LINUXWACOM}/tools/ \
- && ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL}
- @${INSTALL} ${WRKDIR}/${LINUXWACOM}/src/.libs/wacom_drv.so \
- ${PREFIX}/${XINPUTMODDIR}/
- @${INSTALL_MAN} ${WRKDIR}/${LINUXWACOM}/man/wacom.4x \
- ${PREFIX}/${MAN4DIR}/
- @${INSTALL_MAN} ${WRKDIR}/${LINUXWACOM}/man/xsetwacom.1 \
- ${PREFIX}/${MAN1DIR}/
-
-plist: clean configure
- @${ECHO} "===> Rebuilding PLIST."
- @${TOUCH} ${PLIST}
- @${RM} ${PLIST}
- @cd ${WRKDIR}/linuxwacom \
- && ${SETENV} ${MAKE_ENV} PREFIX=${WRKDIR}/plist ./run_configure
- @${MKDIR} ${WRKDIR}/plist
- @cd ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/util \
- && ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL}
- @cd ${WRKDIR}/linuxwacom \
- && ${SETENV} ${MAKE_ENV} ./run_configure
- @${FIND} ${WRKDIR}/plist/ -not -type d \
- | ${SED} "s|${WRKDIR}/plist/||1" \
- >> ${PLIST}
- @${FIND} -d ${WRKDIR}/plist/ -mindepth 2 -type d \
- | ${SED} "s|${WRKDIR}/plist/|@dirrm |1" \
- >> ${PLIST}
- @${ECHO} "%%XINPUTMODDIR%%/wacom_drv.so" >> ${PLIST}
- @${ECHO} "@dirrmtry %%XINPUTMODDIR%%" >> ${PLIST}
- @${ECHO} "@cwd %%KMODDIR%%" >> ${PLIST}
- @${ECHO} "%%UWACOMKLD%%" >> ${PLIST}
+SUB_FILES= pkg-message
+CONFIGURE_ARGS= --without-systemd-unit-dir \
+ --without-udev-rules-dir \
+ --without-doxygen
+
+post-patch:
+ @${REINPLACE_CMD} -e 's/as_fn_error.*udev/${TRUE} &/' \
+ -e 's/dir=.*xorg-server/& \
+ --define-variable prefix="$$prefix"/' \
+ ${WRKSRC}/configure
+
+# XXX adjust MatchProduct to whatever Xorg/devd reports
+ @${REINPLACE_CMD} -e '/^SUBDIRS/s/ conf//' \
+ ${WRKSRC}/Makefile.in
post-install:
- @${ECHO} "===> Displaying pkg-message."
- @${CAT} ${PKGMESSAGE}
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/input/wacom_drv.so
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
+ ${INSTALL_DATA} ${FILESDIR}/wacom.conf.sample \
+ ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/x11-drivers/xf86-input-wacom/distinfo
==============================================================================
--- head/x11-drivers/input-wacom/distinfo Wed Jun 4 14:39:22 2014 (r356504)
+++ head/x11-drivers/xf86-input-wacom/distinfo Wed Jun 11 06:44:41 2014 (r357422)
@@ -1,4 +1,2 @@
-SHA256 (xorg/driver/bsdwacom-40.tbz) = 42c37d321768ff29fef10eb088a87a83c94753a1b4ae5f92fd453781039a5df9
-SIZE (xorg/driver/bsdwacom-40.tbz) = 19305
-SHA256 (xorg/driver/xf86-input-wacom-0.15.0.tar.bz2) = 2e9b64c30fb223c46407bd0e105a54a1e83f378eb33ac68bd8a73fdbface000f
-SIZE (xorg/driver/xf86-input-wacom-0.15.0.tar.bz2) = 528528
+SHA256 (xorg/driver/xf86-input-wacom-0.24.99.1.tar.bz2) = 4b68b1570bd6ce085010980fa1842825e5d676cd2962ec6ad2d7d5bc52149983
+SIZE (xorg/driver/xf86-input-wacom-0.24.99.1.tar.bz2) = 586002
Modified: head/x11-drivers/xf86-input-wacom/files/patch-src-wcmConfig.c
==============================================================================
--- head/x11-drivers/input-wacom/files/patch-src-wcmConfig.c Wed Jun 4 14:39:22 2014 (r356504)
+++ head/x11-drivers/xf86-input-wacom/files/patch-src-wcmConfig.c Wed Jun 11 06:44:41 2014 (r357422)
@@ -1,16 +1,19 @@
---- src/wcmConfig.c.orig
+--- src/wcmConfig.c~
+++ src/wcmConfig.c
-@@ -373,9 +373,12 @@ wcmDetectDeviceClass(const InputInfoPtr
- return TRUE;
+@@ -307,7 +307,7 @@ out:
+ */
+ static void wcmSplitName(char* devicename, char *basename, char *subdevice, char *tool, size_t len)
+ {
+- char *name = strdupa(devicename);
++ char *name = strdup(devicename);
+ char *a, *b;
- /* Bluetooth is also considered as USB */
-+#if 0
- if (gWacomISDV4Device.Detect(pInfo))
- common->wcmDevCls = &gWacomISDV4Device;
-- else if (gWacomUSBDevice.Detect(pInfo))
-+ else
-+#endif
-+ if (gWacomUSBDevice.Detect(pInfo))
- common->wcmDevCls = &gWacomUSBDevice;
- else
- xf86Msg(X_ERROR, "%s: cannot identify device class.\n", pInfo->name);
+ *basename = *subdevice = *tool = '\0';
+@@ -325,6 +325,7 @@ static void wcmSplitName(char* devicenam
+ strncat(tool, a+1, len-1);
+ }
+ strncat(basename, name, len-1);
++ free(name);
+ }
+
+ /**
Added: head/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c Wed Jun 11 06:44:41 2014 (r357422)
@@ -0,0 +1,83 @@
+--- src/wcmISDV4.c~
++++ src/wcmISDV4.c
+@@ -24,11 +24,16 @@
+ #include "xf86Wacom.h"
+ #include <xf86_OSproc.h>
+ #include "wcmFilter.h"
+-#include <linux/serial.h>
+ #include "isdv4.h"
+ #include <unistd.h>
+ #include <fcntl.h>
++
++#ifdef __linux__
++#include <linux/serial.h>
+ #include <libudev.h>
++#else
++#include <termios.h>
++#endif
+
+ #define RESET_RELATIVE(ds) do { (ds).relwheel = 0; } while (0)
+
+@@ -192,10 +197,15 @@ static int wcmSerialValidate(InputInfoPt
+
+ static Bool isdv4Detect(InputInfoPtr pInfo)
+ {
+- struct serial_struct ser;
+ int rc;
+
++#ifdef __linux__
++ struct serial_struct ser;
+ rc = ioctl(pInfo->fd, TIOCGSERIAL, &ser);
++#else
++ struct termios termAttr;
++ rc = tcgetattr(pInfo->fd, &termAttr);
++#endif
+ if (rc == -1)
+ return FALSE;
+
+@@ -959,6 +969,7 @@ static Bool get_keys_vendor_tablet_id(ch
+ return TRUE;
+ }
+
++#ifdef __linux__
+ /**
+ * Return the content of id file from sysfs: /sys/.../device/id
+ *
+@@ -1004,6 +1015,7 @@ out:
+
+ return ret;
+ }
++#endif
+
+ /**
+ * Query the device's fd for the key bits and the tablet ID. Returns the ID
+@@ -1018,11 +1030,16 @@ out:
+ */
+ static int isdv4ProbeKeys(InputInfoPtr pInfo)
+ {
+- struct serial_struct tmp;
+ WacomDevicePtr priv = (WacomDevicePtr)pInfo->private;
+ WacomCommonPtr common = priv->common;
+
++#ifdef __linux__
++ struct serial_struct tmp;
+ if (ioctl(pInfo->fd, TIOCGSERIAL, &tmp) < 0)
++#else
++ struct termios tmp;
++ if (tcgetattr(pInfo->fd, &tmp) < 0)
++#endif
+ return 0;
+
+ common->tablet_id = 0x90;
+@@ -1037,9 +1054,11 @@ static int isdv4ProbeKeys(InputInfoPtr p
+ common->wcmProtocolLevel = WCM_PROTOCOL_GENERIC;
+
+ if (!get_keys_vendor_tablet_id(pInfo->name, common)) {
++#ifdef __linux__
+ char buf[15] = {0};
+ if (get_sysfs_id(pInfo, buf, sizeof(buf)))
+ get_keys_vendor_tablet_id(buf, common);
++#endif
+ }
+
+ return common->tablet_id;
Modified: head/x11-drivers/xf86-input-wacom/files/patch-src-wcmUSB.c
==============================================================================
--- head/x11-drivers/input-wacom/files/patch-src-wcmUSB.c Wed Jun 4 14:39:22 2014 (r356504)
+++ head/x11-drivers/xf86-input-wacom/files/patch-src-wcmUSB.c Wed Jun 11 06:44:41 2014 (r357422)
@@ -1,15 +1,15 @@
---- src/wcmUSB.c.orig
+--- src/wcmUSB.c~
+++ src/wcmUSB.c
@@ -23,10 +23,17 @@
#include "xf86Wacom.h"
-+#ifndef __FreeBSD__
++#ifdef __linux__
#include <asm/types.h>
+#endif
#include <linux/input.h>
#include <sys/utsname.h>
-+#ifndef __FreeBSD__
++#ifdef __linux__
#include <linux/version.h>
+#else
+#define LINUX_VERSION_CODE 1
Modified: head/x11-drivers/xf86-input-wacom/files/patch-src-xf86WacomDefs.h
==============================================================================
--- head/x11-drivers/input-wacom/files/patch-src-xf86WacomDefs.h Wed Jun 4 14:39:22 2014 (r356504)
+++ head/x11-drivers/xf86-input-wacom/files/patch-src-xf86WacomDefs.h Wed Jun 11 06:44:41 2014 (r357422)
@@ -1,10 +1,10 @@
---- src/xf86WacomDefs.h.orig
+--- src/xf86WacomDefs.h~
+++ src/xf86WacomDefs.h
@@ -24,7 +24,9 @@
* General Defines
****************************************************************************/
#include <wacom-util.h>
-+#ifndef __FreeBSD__
++#ifdef __linux__
#include <asm/types.h>
+#endif
#include <linux/input.h>
Added: head/x11-drivers/xf86-input-wacom/files/patch-tools-isdv4-serial-debugger.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-input-wacom/files/patch-tools-isdv4-serial-debugger.c Wed Jun 11 06:44:41 2014 (r357422)
@@ -0,0 +1,10 @@
+--- tools/isdv4-serial-debugger.c~
++++ tools/isdv4-serial-debugger.c
+@@ -25,7 +25,6 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <linux/serial.h>
+ #include <getopt.h>
+ #include <poll.h>
+ #include <stdio.h>
Added: head/x11-drivers/xf86-input-wacom/files/patch-tools-isdv4-serial-inputattach.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-input-wacom/files/patch-tools-isdv4-serial-inputattach.c Wed Jun 11 06:44:41 2014 (r357422)
@@ -0,0 +1,71 @@
+--- tools/isdv4-serial-inputattach.c~
++++ tools/isdv4-serial-inputattach.c
+@@ -23,8 +23,10 @@
+ #include "config.h"
+ #endif
+
++#ifdef __linux__
+ #include <linux/serio.h>
+ #include <libudev.h>
++#endif
+
+ #include <getopt.h>
+ #include <stdio.h>
+@@ -49,7 +52,11 @@ static void usage(void)
+ "--verbose - verbose output\n"
+ "--version - version info\n"
+ "--baudrate <19200|38400> - set baudrate\n",
++#ifdef __GLIBC__
+ program_invocation_short_name
++#else
++ getprogname()
++#endif
+ );
+ }
+
+@@ -64,6 +71,7 @@ static int set_line_discipline(int fd, i
+ return rc;
+ }
+
++#ifdef __linux
+ static int bind_kernel_driver(int fd)
+ {
+ unsigned long devt;
+@@ -77,9 +85,11 @@ static int bind_kernel_driver(int fd)
+
+ return 0;
+ }
++#endif
+
+ int get_baud_rate(int fd)
+ {
++#ifdef __linux__
+ struct stat st;
+ int baudrate = 19200;
+ int id;
+@@ -112,6 +122,9 @@ int get_baud_rate(int fd)
+ udev_unref(udev);
+
+ return baudrate;
++#else
++ return 19200;
++#endif
+ }
+
+ void sighandler(int signum)
+@@ -194,6 +207,7 @@ int main(int argc, char **argv)
+ return 1;
+ }
+
++#ifdef __linux__
+ /* some of the 19200 tablets can't set the line discipline */
+ set_line_discipline(fd, N_MOUSE);
+
+@@ -201,6 +215,7 @@ int main(int argc, char **argv)
+ fprintf(stderr, "Failed to bind the kernel driver.\n");
+ goto out;
+ }
++#endif
+
+ signal(SIGINT, sighandler);
+ signal(SIGHUP, sighandler);
Added: head/x11-drivers/xf86-input-wacom/files/patch-tools-tools-shared.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-input-wacom/files/patch-tools-tools-shared.c Wed Jun 11 06:44:41 2014 (r357422)
@@ -0,0 +1,34 @@
+--- tools/tools-shared.c~
++++ tools/tools-shared.c
+@@ -23,7 +23,9 @@
+
+ #include <errno.h>
+ #include <fcntl.h>
++#ifdef __linux__
+ #include <linux/serial.h>
++#endif
+ #include <getopt.h>
+ #include <poll.h>
+ #include <stdio.h>
+@@ -51,7 +53,6 @@ void version(void)
+ int open_device(const char *path)
+ {
+ int fd;
+- struct serial_struct ser;
+
+ TRACE("Opening device '%s'.\n", path);
+ fd = open(path, O_RDWR | O_NOCTTY);
+@@ -59,7 +60,13 @@ int open_device(const char *path)
+ if (fd < 1)
+ perror("Failed to open device file");
+
++#ifdef __linux__
++ struct serial_struct ser;
+ if (ioctl(fd, TIOCGSERIAL, &ser) == -1)
++#else
++ struct termios termAttr;
++ if (tcgetattr(fd, &termAttr) == -1)
++#endif
+ {
+ perror("Not a serial device?");
+ close(fd);
Added: head/x11-drivers/xf86-input-wacom/files/pkg-message.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-input-wacom/files/pkg-message.in Wed Jun 11 06:44:41 2014 (r357422)
@@ -0,0 +1,13 @@
+To configure the driver with HAL just reattach the tablet for Xserver
+to pick it up. Otherwise, use/edit the sample configuration file:
+
+ $ cd %%PREFIX%%/etc/X11/xorg.conf.d/
+ $ cp wacom.conf.sample wacom.conf
+
+On xorg-server-1.7 and earlier you may need to also merge wacom.conf
+into xorg.conf and add the following lines to ServerLayout section
+
+ InputDevice "wacom stylus"
+ InputDevice "wacom eraser"
+ InputDevice "wacom touch"
+ InputDevice "wacom pad"
Added: head/x11-drivers/xf86-input-wacom/files/wacom.conf.sample
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-drivers/xf86-input-wacom/files/wacom.conf.sample Wed Jun 11 06:44:41 2014 (r357422)
@@ -0,0 +1,33 @@
+# A static configuration example for Bamboo P&T for use without HAL.
+
+Section "InputDevice"
+ Identifier "wacom stylus"
+ Driver "wacom"
+ Option "Type" "stylus"
+ Option "Device" "/dev/input/event0"
+ Option "AutoServerLayout" "true"
+EndSection
+
+Section "InputDevice"
+ Identifier "wacom eraser"
+ Driver "wacom"
+ Option "Type" "eraser"
+ Option "Device" "/dev/input/event0"
+ Option "AutoServerLayout" "true"
+EndSection
+
+Section "InputDevice"
+ Identifier "wacom touch"
+ Driver "wacom"
+ Option "Type" "touch"
+ Option "Device" "/dev/input/event1"
+ Option "AutoServerLayout" "true"
+EndSection
+
+Section "InputDevice"
+ Identifier "wacom pad"
+ Driver "wacom"
+ Option "Type" "pad"
+ Option "Device" "/dev/input/event1"
+ Option "AutoServerLayout" "true"
+EndSection
Modified: head/x11-drivers/xf86-input-wacom/pkg-descr
==============================================================================
--- head/x11-drivers/input-wacom/pkg-descr Wed Jun 4 14:39:22 2014 (r356504)
+++ head/x11-drivers/xf86-input-wacom/pkg-descr Wed Jun 11 06:44:41 2014 (r357422)
@@ -1,14 +1,4 @@
-This package contains the X.Org linuxwacom driver, a Wacom kernel module
-and a script to configure Xorg.
-
-The kernel module is provided by Bartosz Fabianowski <freebsd at chillt.de> and
-supports the following devices:
- Graphire*, Graphire2*, Graphire3, Graphire4
- Bamboo, Bamboo One*, Bamboo Fun
- Intuos3, Cintiq 21UX
- Volito*, Volito2*
- PenStation2*, PenPartner2*
-
-* not tested
+An X.Org driver for Wacom tablets. It communicates with a character
+device provided by linux kernel driver in webcamd.
WWW: http://linuxwacom.sourceforge.net/
Modified: head/x11-drivers/xf86-input-wacom/pkg-plist
==============================================================================
--- head/x11-drivers/input-wacom/pkg-plist Wed Jun 4 14:39:22 2014 (r356504)
+++ head/x11-drivers/xf86-input-wacom/pkg-plist Wed Jun 11 06:44:41 2014 (r357422)
@@ -1,5 +1,19 @@
+bin/isdv4-serial-debugger
+bin/isdv4-serial-inputattach
bin/xsetwacom
-%%XINPUTMODDIR%%/wacom_drv.so
- at dirrmtry %%XINPUTMODDIR%%
- at cwd %%KMODDIR%%
-%%UWACOMKLD%%
+ at comment not marked @sample due to conflict with HAL
+etc/X11/xorg.conf.d/wacom.conf.sample
+include/xorg/Xwacom.h
+include/xorg/isdv4.h
+include/xorg/wacom-properties.h
+include/xorg/wacom-util.h
+lib/xorg/modules/input/wacom_drv.so
+libdata/pkgconfig/xorg-wacom.pc
+man/man1/xsetwacom.1.gz
+man/man4/wacom.4x.gz
+ at dirrmtry lib/xorg/modules/input
+ at dirrmtry lib/xorg/modules
+ at dirrmtry lib/xorg
+ at dirrmtry include/xorg
+ at dirrmtry etc/X11/xorg.conf.d
+ at dirrmtry etc/X11
Modified: head/x11-drivers/xorg-drivers/Makefile
==============================================================================
--- head/x11-drivers/xorg-drivers/Makefile Wed Jun 11 06:25:14 2014 (r357421)
+++ head/x11-drivers/xorg-drivers/Makefile Wed Jun 11 06:44:41 2014 (r357422)
@@ -2,6 +2,7 @@
PORTNAME= xorg-drivers
PORTVERSION= 7.7
+PORTREVISION= 1
CATEGORIES= x11-drivers
MASTER_SITES= # none
DISTFILES= # none
@@ -26,7 +27,8 @@ INPUT_DRIVERS= mouse \
penmount \
synaptics \
vmmouse \
- void
+ void \
+ wacom
VIDEO_DRIVERS= ati \
mach64 \
More information about the svn-ports-head
mailing list