From owner-svn-ports-head@FreeBSD.ORG Fri Mar 13 15:03:28 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B81A6824; Fri, 13 Mar 2015 15:03:28 +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 9897E61A; Fri, 13 Mar 2015 15:03:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2DF3Saq036492; Fri, 13 Mar 2015 15:03:28 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2DF3RP3036483; Fri, 13 Mar 2015 15:03:27 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201503131503.t2DF3RP3036483@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Fri, 13 Mar 2015 15:03:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381216 - 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2015 15:03:28 -0000 Author: robak Date: Fri Mar 13 15:03:26 2015 New Revision: 381216 URL: https://svnweb.freebsd.org/changeset/ports/381216 QAT: https://qat.redports.org/buildarchive/r381216/ Log: x11-drivers/xf86-input-wacom: update 0.27.0 -> 0.28.0 - Add RC script - Add moused(8) workaround PR: 196539 Submitted by: Jan Beich Added: head/x11-drivers/xf86-input-wacom/files/patch-configure (contents, props changed) head/x11-drivers/xf86-input-wacom/files/wacom.in (contents, props changed) Modified: head/x11-drivers/xf86-input-wacom/Makefile head/x11-drivers/xf86-input-wacom/distinfo head/x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c head/x11-drivers/xf86-input-wacom/files/pkg-message.in Modified: head/x11-drivers/xf86-input-wacom/Makefile ============================================================================== --- head/x11-drivers/xf86-input-wacom/Makefile Fri Mar 13 14:59:56 2015 (r381215) +++ head/x11-drivers/xf86-input-wacom/Makefile Fri Mar 13 15:03:26 2015 (r381216) @@ -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}/multi 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 \ Modified: head/x11-drivers/xf86-input-wacom/distinfo ============================================================================== --- head/x11-drivers/xf86-input-wacom/distinfo Fri Mar 13 14:59:56 2015 (r381215) +++ head/x11-drivers/xf86-input-wacom/distinfo Fri Mar 13 15:03:26 2015 (r381216) @@ -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 Added: head/x11-drivers/xf86-input-wacom/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-input-wacom/files/patch-configure Fri Mar 13 15:03:26 2015 (r381216) @@ -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 () 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 Fri Mar 13 14:59:56 2015 (r381215) +++ head/x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c Fri Mar 13 15:03:26 2015 (r381216) @@ -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; Modified: head/x11-drivers/xf86-input-wacom/files/pkg-message.in ============================================================================== --- head/x11-drivers/xf86-input-wacom/files/pkg-message.in Fri Mar 13 14:59:56 2015 (r381215) +++ head/x11-drivers/xf86-input-wacom/files/pkg-message.in Fri Mar 13 15:03:26 2015 (r381216) @@ -11,3 +11,8 @@ into xorg.conf and add the following lin 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" Added: head/x11-drivers/xf86-input-wacom/files/wacom.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-input-wacom/files/wacom.in Fri Mar 13 15:03:26 2015 (r381216) @@ -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"