From owner-svn-ports-all@FreeBSD.ORG Sun Mar 22 11:03:05 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E439E50; Sun, 22 Mar 2015 11:03:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6EB12D8; Sun, 22 Mar 2015 11:03:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2MB35A0029479; Sun, 22 Mar 2015 11:03:05 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2MB33PG029470; Sun, 22 Mar 2015 11:03:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201503221103.t2MB33PG029470@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 22 Mar 2015 11:03:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381903 - in head/x11-drivers/xf86-input-wacom: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2015 11:03:05 -0000 Author: jbeich Date: Sun Mar 22 11:03:02 2015 New Revision: 381903 URL: https://svnweb.freebsd.org/changeset/ports/381903 QAT: https://qat.redports.org/buildarchive/r381903/ Log: - Update to 0.29.0 - Convert to load_kld as 8.4R lacks kldload -n [1] - Provide _stop command useful for testing - Reword pkg-message to nudge looking inside rc.d/wacom Suggested by: flo (via D1595) [1] Deleted: head/x11-drivers/xf86-input-wacom/files/patch-configure Modified: head/x11-drivers/xf86-input-wacom/Makefile head/x11-drivers/xf86-input-wacom/distinfo head/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c head/x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c head/x11-drivers/xf86-input-wacom/files/pkg-message.in head/x11-drivers/xf86-input-wacom/files/wacom.in Modified: head/x11-drivers/xf86-input-wacom/Makefile ============================================================================== --- head/x11-drivers/xf86-input-wacom/Makefile Sun Mar 22 11:02:34 2015 (r381902) +++ head/x11-drivers/xf86-input-wacom/Makefile Sun Mar 22 11:03:02 2015 (r381903) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-input-wacom -PORTVERSION= 0.28.0 +PORTVERSION= 0.29.0 CATEGORIES= x11-drivers MASTER_SITES= SF/linuxwacom/${PORTNAME} Modified: head/x11-drivers/xf86-input-wacom/distinfo ============================================================================== --- head/x11-drivers/xf86-input-wacom/distinfo Sun Mar 22 11:02:34 2015 (r381902) +++ head/x11-drivers/xf86-input-wacom/distinfo Sun Mar 22 11:03:02 2015 (r381903) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-wacom-0.28.0.tar.bz2) = 7c19008ef727a5437d300fc297325953ad2b30a23163fba19adda2aa9ad6243b -SIZE (xorg/driver/xf86-input-wacom-0.28.0.tar.bz2) = 595621 +SHA256 (xorg/driver/xf86-input-wacom-0.29.0.tar.bz2) = 88507e76f1eb98a20c4381806e03c694adcff88ac0028f93892019a7a6fc8b96 +SIZE (xorg/driver/xf86-input-wacom-0.29.0.tar.bz2) = 589495 Modified: head/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c ============================================================================== --- head/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c Sun Mar 22 11:02:34 2015 (r381902) +++ head/x11-drivers/xf86-input-wacom/files/patch-src-wcmISDV4.c Sun Mar 22 11:03:02 2015 (r381903) @@ -1,6 +1,6 @@ --- src/wcmISDV4.c~ +++ src/wcmISDV4.c -@@ -24,11 +24,16 @@ +@@ -24,14 +24,19 @@ #include "xf86Wacom.h" #include #include "wcmFilter.h" @@ -8,16 +8,20 @@ #include "isdv4.h" #include #include -+ +-#include + #include + #include + +#ifdef __linux__ +#include - #include ++#include +#else +#include +#endif - ++ #define RESET_RELATIVE(ds) do { (ds).relwheel = 0; } while (0) + /* resolution in points/m */ @@ -192,10 +197,15 @@ static int wcmSerialValidate(InputInfoPt static Bool isdv4Detect(InputInfoPtr pInfo) Modified: head/x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c ============================================================================== --- head/x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c Sun Mar 22 11:02:34 2015 (r381902) +++ head/x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c Sun Mar 22 11:03:02 2015 (r381903) @@ -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 HAVE_XF86OPTIONPTR + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14 +#define InputOption InputOption_custom typedef struct _InputOption { struct _InputOption *next; Modified: head/x11-drivers/xf86-input-wacom/files/pkg-message.in ============================================================================== --- head/x11-drivers/xf86-input-wacom/files/pkg-message.in Sun Mar 22 11:02:34 2015 (r381902) +++ head/x11-drivers/xf86-input-wacom/files/pkg-message.in Sun Mar 22 11:03:02 2015 (r381903) @@ -12,7 +12,6 @@ into xorg.conf and add the following lin 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" +moused(8) may interfere with tablet input by attaching to fake /dev/ums*. +To prevent that add a usb_quirk(4) then detach and attach the tablet. +%%PREFIX%%/etc/rc.d/wacom is an example how preserve quirks across reboot. Modified: head/x11-drivers/xf86-input-wacom/files/wacom.in ============================================================================== --- head/x11-drivers/xf86-input-wacom/files/wacom.in Sun Mar 22 11:02:34 2015 (r381902) +++ head/x11-drivers/xf86-input-wacom/files/wacom.in Sun Mar 22 11:03:02 2015 (r381903) @@ -22,11 +22,11 @@ load_rc_config "$name" start_precmd="wacom_prepare" start_cmd="wacom_start" -stop_cmd=":" +stop_cmd="wacom_stop" wacom_prepare() { - kldload -n usb_quirk + load_kld -e usb_quirk usb_quirk } wacom_start() @@ -36,4 +36,10 @@ wacom_start() usbconfig add_dev_quirk_vplh 0x056a 0 0 0xffff UQ_UMS_IGNORE } +wacom_stop() +{ + usbconfig remove_dev_quirk_vplh 0x056a 0 0 0xffff UQ_MATCH_VENDOR_ONLY + usbconfig remove_dev_quirk_vplh 0x056a 0 0 0xffff UQ_UMS_IGNORE +} + run_rc_command "$1"