.gear/rules | 2 + .../tags/cfbd044b140af29bbbec61bae6f8719f19be1cdb | 13 +++++ .gear/tags/list | 1 + src/wcmCommon.c | 2 +- src/wcmTouchFilter.c | 1 - src/xf86Wacom.h | 2 + xorg-drv-wacom.spec | 57 ++++++++++++++++++++ 7 files changed, 76 insertions(+), 2 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..3d8c5a2 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: xf86-input-wacom-@version@:. +diff: xf86-input-wacom-@version@:. . diff --git a/.gear/tags/cfbd044b140af29bbbec61bae6f8719f19be1cdb b/.gear/tags/cfbd044b140af29bbbec61bae6f8719f19be1cdb new file mode 100644 index 0000000..b169058 --- /dev/null +++ b/.gear/tags/cfbd044b140af29bbbec61bae6f8719f19be1cdb @@ -0,0 +1,13 @@ +object d6a194c80623c5306d60ee3f234863b3b4bacc6d +type commit +tag xf86-input-wacom-0.10.4 +tagger Peter Hutterer 1263534504 +1000 + +wacom 0.10.4 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iEYEABECAAYFAktQAagACgkQ4jt+cLRn8L9j2ACglqq2Vqw57UwGE64gIWR3+qkd ++soAoJB5WAMuORFQpv/ymdB+orNtu2ob +=gHIj +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..e9af02e --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +cfbd044b140af29bbbec61bae6f8719f19be1cdb xf86-input-wacom-0.10.4 diff --git a/src/wcmCommon.c b/src/wcmCommon.c index 32ad82e..bc1450c 100644 --- a/src/wcmCommon.c +++ b/src/wcmCommon.c @@ -332,7 +332,7 @@ static int ODDKEYSYM [][2] = { 0, 0} }; -static void emitKeysym (DeviceIntPtr keydev, int keysym, int state) +void emitKeysym (DeviceIntPtr keydev, int keysym, int state) { int i, j, alt_keysym = 0; diff --git a/src/wcmTouchFilter.c b/src/wcmTouchFilter.c index 2b069c0..56683f2 100644 --- a/src/wcmTouchFilter.c +++ b/src/wcmTouchFilter.c @@ -45,7 +45,6 @@ void xf86WcmFingerTapToClick(WacomCommonPtr common); extern void wcmRotateCoordinates(LocalDevicePtr local, int* x, int* y); -extern void emitKeysym (DeviceIntPtr keydev, int keysym, int state); static void xf86WcmFingerScroll(WacomDevicePtr priv); static void xf86WcmFingerZoom(WacomDevicePtr priv); diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h index 351abb1..334bdca 100644 --- a/src/xf86Wacom.h +++ b/src/xf86Wacom.h @@ -177,5 +177,7 @@ int xf86WcmSetPadCoreMode(LocalDevicePtr local); /* calculate the proper tablet to screen mapping factor */ void wcmMappingFactor(LocalDevicePtr local); +void emitKeysym (DeviceIntPtr keydev, int keysym, int state); + /****************************************************************************/ #endif /* __XF86WACOM_H */ diff --git a/xorg-drv-wacom.spec b/xorg-drv-wacom.spec new file mode 100644 index 0000000..39a3993 --- /dev/null +++ b/xorg-drv-wacom.spec @@ -0,0 +1,57 @@ +%define _modulesdir %_libdir/X11/modules +%define _fdidir %_datadir/hal/fdi/policy/20thirdparty + +Name: xorg-drv-wacom +Version: 0.10.4 +Release: alt1 +Serial: 1 +Summary: Wacom input driver +License: GPLv2 +Group: System/X11 +Url: http://linuxwacom.sourceforge.net/ +Packager: Valery Inozemtsev + +PreReq: XORG_ABI_XINPUT = %get_xorg_abi_xinput +Provides: xorg-x11-drv-wacom = %serial:%version-%release +Obsoletes: xorg-x11-drv-wacom < %version-%release +Conflicts: linuxwacom + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires(Pre): xorg-sdk +BuildRequires: libX11-devel libXi-devel + +%description +wacom is an X input driver for Wacom devices + +%prep +%setup -q +%patch -p1 + +%build +%autoreconf +%configure \ + --with-xorg-module-dir=%_modulesdir \ + --disable-static +%make_build + +%install +%make DESTDIR=%buildroot install + +mkdir -p %buildroot%_fdidir +install -m644 fdi/wacom.fdi %buildroot%_fdidir/20-x11-input-wacom.fdi + +%files +%_bindir/xsetwacom +%_modulesdir/input/*.so +%_fdidir/*.fdi +%_man4dir/*.4* + +%changelog +* Sat Jan 23 2010 Valery Inozemtsev 1:0.10.4-alt1 +- 0.10.4 + +* Thu Dec 24 2009 Valery Inozemtsev 1:0.10.3-alt1 +- 0.10.3 +