Attachment #151396 for bug #196539

View | Details | Raw Unified | Return to bug 196539
Collapse All | Expand All

Lines 1-8 Link Here

(-)x11-drivers/xf86-input-wacom/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xf86-input-wacom	3	PORTNAME= xf86-input-wacom
4	PORTVERSION= 0.27.0	4	PORTVERSION= 0.28.0
5	PORTREVISION= 1
6	CATEGORIES= x11-drivers	5	CATEGORIES= x11-drivers
7	MASTER_SITES= SF/linuxwacom/${PORTNAME}	6	MASTER_SITES= SF/linuxwacom/${PORTNAME}
8		7
Lines 17-22 RUN_DEPENDS= webcamd>0:${PORTSDIR}/multimedia/webc Link Here
17	USES= tar:bzip2 pathfix pkgconfig libtool	16	USES= tar:bzip2 pathfix pkgconfig libtool
18	USE_XORG= xrandr xinerama	17	USE_XORG= xrandr xinerama
19	XORG_CAT= driver	18	XORG_CAT= driver
		19	USE_RC_SUBR= wacom
20	SUB_FILES= pkg-message	20	SUB_FILES= pkg-message
21	CONFIGURE_ARGS= --without-systemd-unit-dir \	21	CONFIGURE_ARGS= --without-systemd-unit-dir \
22	--without-udev-rules-dir \	22	--without-udev-rules-dir \

Lines 1-2 Link Here

(-)x11-drivers/xf86-input-wacom/distinfo (-2 / +2 lines)
1	SHA256 (xorg/driver/xf86-input-wacom-0.27.0.tar.bz2) = d1280361595f28c273d237cb234c28ca77617f875207ee0424a385a41407ec42	1	SHA256 (xorg/driver/xf86-input-wacom-0.28.0.tar.bz2) = 7c19008ef727a5437d300fc297325953ad2b30a23163fba19adda2aa9ad6243b
2	SIZE (xorg/driver/xf86-input-wacom-0.27.0.tar.bz2) = 594818	2	SIZE (xorg/driver/xf86-input-wacom-0.28.0.tar.bz2) = 595621




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 <xf86Optionstr.h>
 int
 main ()

Lines 48-54 Link Here

(-)x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c (-1 / +1 lines)
48	@@ -506,6 +518,7 @@ xf86UnblockSIGIO (int wasset)	48	@@ -506,6 +518,7 @@ xf86UnblockSIGIO (int wasset)
49		49
50	/* This is not the same as the X server one, but it'll do for the tests */	50	/* This is not the same as the X server one, but it'll do for the tests */
51	#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14	51	#if HAVE_XF86OPTIONPTR
52	+#define InputOption InputOption_custom	52	+#define InputOption InputOption_custom
53	typedef struct _InputOption {	53	typedef struct _InputOption {
54	struct _InputOption *next;	54	struct _InputOption *next;

Lines 11-13 into xorg.conf and add the following lines to Serv Link Here

(-)x11-drivers/xf86-input-wacom/files/pkg-message.in (+5 lines)
11	InputDevice "wacom eraser"	11	InputDevice "wacom eraser"
12	InputDevice "wacom touch"	12	InputDevice "wacom touch"
13	InputDevice "wacom pad"	13	InputDevice "wacom pad"
		14
		15	If moused(8) interferes with tablet input try adding the following
		16	line to /etc/rc.conf
		17
		18	wacom_enable="YES"




#!/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"

Return to bug 196539

Line 0 Link Here

(-)x11-drivers/xf86-input-wacom/files/patch-configure (+29 lines)
	1	To workaround the following error
	2
	3	$ clang conftest.c -I/usr/local/include/xorg
	4	In file included from conftest.c:3:
	5	In file included from /usr/local/include/xorg/xf86Optionstr.h:27:
	6	/usr/local/include/xorg/list.h:216:15: error: unknown type name 'Bool'; did you mean
	7	'_Bool'?
	8	static inline Bool
	9	^~~~
	10	_Bool
	11	1 error generated.
	12
	13	$ gcc conftest.c -I/usr/local/include/xorg
	14	In file included from /usr/local/include/xorg/xf86Optionstr.h:27,
	15	from conftest.c:3:
	16	/usr/local/include/xorg/list.h:217: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'xorg_list_is_empty'
	17
	18	cf. http://cgit.freedesktop.org/xorg/xserver/commit/?id=13b5074
	19
	20	--- configure~
	21	+++ configure
	22	@@ -18788,6 +18788,7 @@ CFLAGS="$XORG_CFLAGS $CFLAGS"
	23	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	24	/* end confdefs.h. */
	25
	26	+ typedef int Bool;
	27	#include <xf86Optionstr.h>
	28	int
	29	main ()

Line 0 Link Here

(-)x11-drivers/xf86-input-wacom/files/wacom.in (+39 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD$
	4	#
	5	# PROVIDE: wacom
	6	# REQUIRE: mountcritlocal
	7	# KEYWORD: nojail
	8	#
	9	# Add the following lines to /etc/rc.conf to enable this service:
	10	#
	11	# wacom_enable (bool): Set it to YES to add Wacom USB quirks on startup.
	12	# Default: NO
	13
	14	. /etc/rc.subr
	15
	16	name="wacom"
	17	rcvar="wacom_enable"
	18
	19	load_rc_config "$name"
	20
	21	: ${wacom_enable:="NO"}
	22
	23	start_precmd="wacom_prepare"
	24	start_cmd="wacom_start"
	25	stop_cmd=":"
	26
	27	wacom_prepare()
	28	{
	29	kldload -n usb_quirk
	30	}
	31
	32	wacom_start()
	33	{
	34	# Prevent moused(8) from picking up bogus /dev/umsN
	35	usbconfig add_dev_quirk_vplh 0x056a 0 0 0xffff UQ_MATCH_VENDOR_ONLY
	36	usbconfig add_dev_quirk_vplh 0x056a 0 0 0xffff UQ_UMS_IGNORE
	37	}
	38
	39	run_rc_command "$1"