Index: x11-drivers/xf86-input-wacom/Makefile =================================================================== --- x11-drivers/xf86-input-wacom/Makefile (revision 376385) +++ x11-drivers/xf86-input-wacom/Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-input-wacom -PORTVERSION= 0.27.0 -PORTREVISION= 1 +PORTVERSION= 0.28.0 CATEGORIES= x11-drivers MASTER_SITES= SF/linuxwacom/${PORTNAME} @@ -17,6 +16,7 @@ RUN_DEPENDS= webcamd>0:${PORTSDIR}/multimedia/webc USES= tar:bzip2 pathfix pkgconfig libtool USE_XORG= xrandr xinerama XORG_CAT= driver +USE_RC_SUBR= wacom SUB_FILES= pkg-message CONFIGURE_ARGS= --without-systemd-unit-dir \ --without-udev-rules-dir \ Index: x11-drivers/xf86-input-wacom/distinfo =================================================================== --- x11-drivers/xf86-input-wacom/distinfo (revision 376385) +++ x11-drivers/xf86-input-wacom/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-wacom-0.27.0.tar.bz2) = d1280361595f28c273d237cb234c28ca77617f875207ee0424a385a41407ec42 -SIZE (xorg/driver/xf86-input-wacom-0.27.0.tar.bz2) = 594818 +SHA256 (xorg/driver/xf86-input-wacom-0.28.0.tar.bz2) = 7c19008ef727a5437d300fc297325953ad2b30a23163fba19adda2aa9ad6243b +SIZE (xorg/driver/xf86-input-wacom-0.28.0.tar.bz2) = 595621 Index: x11-drivers/xf86-input-wacom/files/patch-configure =================================================================== --- x11-drivers/xf86-input-wacom/files/patch-configure (revision 0) +++ x11-drivers/xf86-input-wacom/files/patch-configure (working copy) @@ -0,0 +1,29 @@ +To workaround the following error + + $ clang conftest.c -I/usr/local/include/xorg + In file included from conftest.c:3: + In file included from /usr/local/include/xorg/xf86Optionstr.h:27: + /usr/local/include/xorg/list.h:216:15: error: unknown type name 'Bool'; did you mean + '_Bool'? + static inline Bool + ^~~~ + _Bool + 1 error generated. + + $ gcc conftest.c -I/usr/local/include/xorg + In file included from /usr/local/include/xorg/xf86Optionstr.h:27, + from conftest.c:3: + /usr/local/include/xorg/list.h:217: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'xorg_list_is_empty' + +cf. http://cgit.freedesktop.org/xorg/xserver/commit/?id=13b5074 + +--- configure~ ++++ configure +@@ -18788,6 +18788,7 @@ CFLAGS="$XORG_CFLAGS $CFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++ typedef int Bool; + #include + int + main () Property changes on: x11-drivers/xf86-input-wacom/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property 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 Index: x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c =================================================================== --- x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c (revision 376385) +++ x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c (working copy) @@ -48,7 +48,7 @@ @@ -506,6 +518,7 @@ xf86UnblockSIGIO (int wasset) /* This is not the same as the X server one, but it'll do for the tests */ - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14 + #if HAVE_XF86OPTIONPTR +#define InputOption InputOption_custom typedef struct _InputOption { struct _InputOption *next; Index: x11-drivers/xf86-input-wacom/files/pkg-message.in =================================================================== --- x11-drivers/xf86-input-wacom/files/pkg-message.in (revision 376385) +++ x11-drivers/xf86-input-wacom/files/pkg-message.in (working copy) @@ -11,3 +11,8 @@ into xorg.conf and add the following lines to Serv InputDevice "wacom eraser" InputDevice "wacom touch" InputDevice "wacom pad" + +If moused(8) interferes with tablet input try adding the following +line to /etc/rc.conf + + wacom_enable="YES" Index: x11-drivers/xf86-input-wacom/files/wacom.in =================================================================== --- x11-drivers/xf86-input-wacom/files/wacom.in (revision 0) +++ x11-drivers/xf86-input-wacom/files/wacom.in (working copy) @@ -0,0 +1,39 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: wacom +# REQUIRE: mountcritlocal +# KEYWORD: nojail +# +# Add the following lines to /etc/rc.conf to enable this service: +# +# wacom_enable (bool): Set it to YES to add Wacom USB quirks on startup. +# Default: NO + +. /etc/rc.subr + +name="wacom" +rcvar="wacom_enable" + +load_rc_config "$name" + +: ${wacom_enable:="NO"} + +start_precmd="wacom_prepare" +start_cmd="wacom_start" +stop_cmd=":" + +wacom_prepare() +{ + kldload -n usb_quirk +} + +wacom_start() +{ + # Prevent moused(8) from picking up bogus /dev/umsN + usbconfig add_dev_quirk_vplh 0x056a 0 0 0xffff UQ_MATCH_VENDOR_ONLY + usbconfig add_dev_quirk_vplh 0x056a 0 0 0xffff UQ_UMS_IGNORE +} + +run_rc_command "$1" Property changes on: x11-drivers/xf86-input-wacom/files/wacom.in ___________________________________________________________________ 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