Hello community,
here is the log from the commit of package x11-input-wacom
checked in at Sun Apr 6 17:23:45 CEST 2008.
--------
--- x11-input-wacom/x11-input-wacom.changes 2007-11-05 18:38:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2008-04-06 12:17:16.456504000 +0200
@@ -1,0 +2,10 @@
+Sun Apr 6 10:40:44 CEST 2008 - sndirsch@suse.de
+
+- update to development releasee 0.7.9-9
+ * obsoletes linuxwacom-0.7.8-3.diff, linuxwacom-0.7.9-1.diff,
+ linuxwacom-autoprobe.diff
+ * adjusted linuxwacom-fix-multitouch.diff
+- added xorg-x11-driver-input to BuildRequires to fix build;
+ required for dllloader detection, oh well ...
+
+-------------------------------------------------------------------
Old:
----
linuxwacom-0.7.8-3.diff
linuxwacom-0.7.9-1.diff
linuxwacom-0.7.9-1.tar.bz2
linuxwacom-autoprobe.diff
New:
----
linuxwacom-0.7.9-9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-wacom.spec ++++++
--- /var/tmp/diff_new_pack.S11327/_old 2008-04-06 17:23:33.000000000 +0200
+++ /var/tmp/diff_new_pack.S11327/_new 2008-04-06 17:23:33.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package x11-input-wacom (Version 0.7.9)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,24 +10,22 @@
# norootforbuild
+%define revision 9
+
Name: x11-input-wacom
-%define revision 1
BuildRequires: gtk2-devel ncurses ncurses-devel tk-devel update-desktop-files
%ifnarch s390 s390x
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-driver-input xorg-x11-server-sdk
%endif
License: GPL v2 or later
Url: http://linuxwacom.sourceforge.net/
Group: System/X11/Utilities
Version: 0.7.9
-Release: 1
+Release: 39
Summary: X11 input module for wacom tablet
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o
Source: linuxwacom-%{version}-%{revision}.tar.bz2
-Patch0: linuxwacom-0.7.8-3.diff
-Patch1: linuxwacom-autoprobe.diff
-Patch2: linuxwacom-0.7.9-1.diff
-Patch3: linuxwacom-fix-multitouch.diff
+Patch: linuxwacom-fix-multitouch.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -40,6 +38,7 @@
Ping Cheng
%package tools
+License: GPL v2 or later
Summary: Tools for configuration, diagnostic and libraries for Wacom tablets
Group: System/X11/Utilities
Requires: %{name} = %{version}-%{release}
@@ -58,6 +57,7 @@
Ping Cheng
%package devel
+License: GPL v2 or later
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/X11
Requires: %{name}-tools = %{version}-%{release}
@@ -77,19 +77,16 @@
%prep
%setup -n linuxwacom-%{version}-%{revision}
-%patch0
-%patch1
-%patch2
-%patch3
+%patch
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
libtoolize --force
autoreconf --force --install
%ifarch s390 s390x
-./configure --prefix=/usr
+%configure --prefix=/usr
%else
-./configure --prefix=/usr \
+%configure --prefix=/usr \
%ifarch x86_64
--enable-xserver64 \
%endif
@@ -102,11 +99,6 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
-if [ "%_lib" == "lib64" ]; then
- mkdir -p $RPM_BUILD_ROOT/usr/lib64
- mv $RPM_BUILD_ROOT/usr/lib/libwacomcfg.* $RPM_BUILD_ROOT/usr/lib64/
- mv $RPM_BUILD_ROOT/usr/lib/TkXInput $RPM_BUILD_ROOT/usr/lib64/
-fi
# Script libraries for Tcl extensions should be in a package-specific
# subdir of /usr/share/tcl
mkdir -p $RPM_BUILD_ROOT/usr/share/tcl/%{name}-tools
@@ -155,7 +147,14 @@
/usr/%_lib/libwacomcfg.so
%changelog
-* Mon Nov 05 2007 - dkukawka@suse.de
+* Sun Apr 06 2008 sndirsch@suse.de
+- update to development releasee 0.7.9-9
+ * obsoletes linuxwacom-0.7.8-3.diff, linuxwacom-0.7.9-1.diff,
+ linuxwacom-autoprobe.diff
+ * adjusted linuxwacom-fix-multitouch.diff
+- added xorg-x11-driver-input to BuildRequires to fix build;
+ required for dllloader detection, oh well ...
+* Mon Nov 05 2007 dkukawka@suse.de
- added patch:
* linuxwacom-fix-multitouch.diff: Fix new feature MultiTouch
on Tablet PCs as e.g. Lenovo X61t. Now at least the stylus/
@@ -163,29 +162,29 @@
the eraser.
Added new xorg.conf option "MultiTouch" "off" which allow to
disable the multitouch feature completely.
-* Sat Nov 03 2007 - dkukawka@suse.de
+* Sat Nov 03 2007 dkukawka@suse.de
- updated to: development release 0.7.9-1
- added patch: linuxwacom-0.7.9-1.diff
* fixes build with xorg-server 1.4
-* Wed Oct 10 2007 - mhopf@suse.de
+* Wed Oct 10 2007 mhopf@suse.de
- Added auto-dev scanning support.
-* Sun Sep 30 2007 - sndirsch@suse.de
+* Sun Sep 30 2007 sndirsch@suse.de
- linuxwacom-0.7.8-3.diff
* fixes build with xorg-server 1.4
-* Thu Aug 16 2007 - sndirsch@suse.de
+* Thu Aug 16 2007 sndirsch@suse.de
- updated to new release 0.7.8-3
* Fixed a wacom.c bug for 2.4 and older 2.6's
* Fixed a double click issue
* Updated wacomcpl
-* Thu Aug 02 2007 - sndirsch@suse.de
+* Thu Aug 02 2007 sndirsch@suse.de
- updated to new release 0.7.8-2
* Fixed a xsetwacom bug
* Updated wacomcpl
-* Fri Jul 13 2007 - sndirsch@suse.de
+* Fri Jul 13 2007 sndirsch@suse.de
- updated to new release 0.7.8-1
* Updated HowTo pages
* Fixed a control panel button bug
-* Sat Jun 30 2007 - sndirsch@suse.de
+* Sat Jun 30 2007 sndirsch@suse.de
- updated to new release 0.7.8
* Merged patch 1689476 (Gregor Richards)
* Merged patch 1674472 (Magnus Vigerlöf)
@@ -198,7 +197,7 @@
* Change Bamboo ring from strip to absolute wheel
* Updated xsetwacom suppress option
* Merged Ron's building and configuration patches
-* Wed May 30 2007 - dkukawka@suse.de
+* Wed May 30 2007 dkukawka@suse.de
- updated package to new version v0.7.7-10:
- Added 2 new xsetwacom potions (TVResolution0/1 and Screen_No)
- Added support for Bamboo
@@ -212,16 +211,16 @@
- Fixed bug 1698123
- Incorporated patch 1680163 from Magnus Vigerloe
- Updated wacom man page, wacom.4x
-* Mon Apr 16 2007 - dkukawka@suse.de
+* Mon Apr 16 2007 dkukawka@suse.de
- update package to new version v0.7.7-7:
- added --enable-wacdump
- added 'ncurses ncurses-devel' to BuildRequires
-* Thu Mar 08 2007 - dkukawka@suse.de
+* Thu Mar 08 2007 dkukawka@suse.de
- update package to new version v0.7.7-6:
- allow to use the driver again, old version work no longer on
openSUSE 10.3Alpha1Plus
- removed no longer needed patches
-* Mon Dec 04 2006 - sndirsch@suse.de
+* Mon Dec 04 2006 sndirsch@suse.de
- updated to release 0.7.6-4
* updated xsetwacom
* Fixed cursor relative out-prox issue
@@ -232,7 +231,7 @@
* Updated acinclude.m4 and configure.in (Mats Johannesson)
* Updated X driver for Xinerama setup
* Removed option gimp
-* Thu Nov 02 2006 - sndirsch@suse.de
+* Thu Nov 02 2006 sndirsch@suse.de
- updated to release 0.7.6-2
* Updated README and NEWS
* Fixed a relative mode acceleration problem.
@@ -240,99 +239,99 @@
* Updated wacdump for TabletPC.
* Supports Graphire outbound tracking.
* Updated acinclude.m4 and wacom.c
-* Wed Oct 18 2006 - sndirsch@suse.de
+* Wed Oct 18 2006 sndirsch@suse.de
- updated to release 0.7.6-1
* obsoletes linuxwacom-0.7.0-rotate-patch
- fix-linuxwacom-Makefile-64bitArch.diff no longer required
-* Sat Sep 02 2006 - sndirsch@suse.de
+* Sat Sep 02 2006 sndirsch@suse.de
- xf86Parser.h/xf86Optrec.h has moved again
-* Fri Jul 28 2006 - sndirsch@suse.de
+* Fri Jul 28 2006 sndirsch@suse.de
- use "-fno-strict-aliasing"
-* Thu Jul 27 2006 - sndirsch@suse.de
+* Thu Jul 27 2006 sndirsch@suse.de
- cleanup
-* Wed Jul 26 2006 - sndirsch@suse.de
+* Thu Jul 27 2006 sndirsch@suse.de
- fixed build (xf86Parser.h/xf86Optrec.h have been moved)
-* Tue Jul 25 2006 - sndirsch@suse.de
+* Tue Jul 25 2006 sndirsch@suse.de
- fixed build for X.Org 7
-* Tue Jun 20 2006 - sndirsch@suse.de
+* Tue Jun 20 2006 sndirsch@suse.de
- updated to release 0.7.4-3
* Fixed a Volito1 wacom.c issue as reported by
Samuel Colin (Samuel.Colin@laposte.net)
-* Fri May 26 2006 - sndirsch@suse.de
+* Fri May 26 2006 sndirsch@suse.de
- updated to release 0.7.4-2
* fixes a typo in some wacom.c files
-* Sat May 06 2006 - sndirsch@suse.de
+* Sun May 07 2006 sndirsch@suse.de
- updated to release 0.7.4-1
* added support for DTF 521, I3 12x12, and I3 12x19
* various bugfixes
-* Fri Feb 24 2006 - sndirsch@suse.de
+* Fri Feb 24 2006 sndirsch@suse.de
- disabled stripping of "wacom_drv.o" again, which has resulted in
a non loadable module ("(EE) LoadModule: Module wacom does not
have a wacomModuleData data object.")
-* Sat Feb 18 2006 - schwab@suse.de
+* Sat Feb 18 2006 schwab@suse.de
- Fix last change.
-* Fri Feb 17 2006 - sndirsch@suse.de
+* Fri Feb 17 2006 sndirsch@suse.de
- strip input module (Bug #151801)
-* Thu Feb 16 2006 - sndirsch@suse.de
+* Thu Feb 16 2006 sndirsch@suse.de
- linuxwacom-0.7.0-rotate-patch:
* fixes wacom rotate support (Bug #150893)
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Fri Dec 23 2005 - sndirsch@suse.de
+* Fri Dec 23 2005 sndirsch@suse.de
- updated to release 0.7.2
-* Mon Dec 19 2005 - sndirsch@suse.de
+* Mon Dec 19 2005 sndirsch@suse.de
- added missing .so symlink to filelist
-* Fri Dec 16 2005 - sndirsch@suse.de
+* Fri Dec 16 2005 sndirsch@suse.de
- updated to release 0.7.1-2
-* Wed Nov 23 2005 - sndirsch@suse.de
+* Wed Nov 23 2005 sndirsch@suse.de
- xsetwacom.diff:
* xsetwacom: fixed detection of wacom devices (#118795)
-* Sat Nov 19 2005 - sndirsch@suse.de
+* Sun Nov 20 2005 sndirsch@suse.de
- updated to release 0.7.1 (beta release)
* Added DTU710, DTF 720 and Graphire 4
* Added Device ID info for USB and P4 tablets
* Updated wacdump and xidump
-* Wed Nov 16 2005 - sndirsch@suse.de
+* Wed Nov 16 2005 sndirsch@suse.de
- added libwacomxi.so symlink (#118793)
-* Thu Sep 22 2005 - sndirsch@suse.de
+* Thu Sep 22 2005 sndirsch@suse.de
- updated to release 0.7.0
-* Thu Jul 28 2005 - sndirsch@suse.de
+* Thu Jul 28 2005 sndirsch@suse.de
- moved /usr/lib/TkXInput/pkgIndex.tcl to
/usr/share/tcl/x11-input-wacom-tools/
-* Tue Jun 14 2005 - sndirsch@suse.de
+* Tue Jun 14 2005 sndirsch@suse.de
- removed udev rules file (conflicts with udev package)
-* Thu Jun 09 2005 - sndirsch@suse.de
+* Thu Jun 09 2005 sndirsch@suse.de
- added libwacomxi.so to filelist (Bug #88259)
-* Fri May 13 2005 - sndirsch@suse.de
+* Fri May 13 2005 sndirsch@suse.de
- use norootforbuild
-* Tue May 10 2005 - sndirsch@suse.de
+* Tue May 10 2005 sndirsch@suse.de
- updated to release 0.6.8
-* Thu May 05 2005 - sndirsch@suse.de
+* Thu May 05 2005 sndirsch@suse.de
- updated to release 0.6.7
* obsoletes linuxwacom-0.6.6.diff
-* Wed May 04 2005 - sndirsch@suse.de
+* Wed May 04 2005 sndirsch@suse.de
- package renaming:
* linuxwacom --> x11-input-wacom + x11-input-wacom-tools
* linuxwacom-devel --> x11-input-wacom-devel
-* Wed May 04 2005 - sndirsch@suse.de
+* Wed May 04 2005 sndirsch@suse.de
- fixed build on s390/s390x
-* Wed May 04 2005 - sndirsch@suse.de
+* Wed May 04 2005 sndirsch@suse.de
- build wacom Xinput driver as well (was in xorg-x11-server before)
-* Wed Mar 09 2005 - dkukawka@suse.de
+* Wed Mar 09 2005 dkukawka@suse.de
- fixed bug with /usr/bin/xsetwacom , added needed libs
- added udev rule for wacom
-* Tue Dec 07 2004 - sndirsch@suse.de
+* Tue Dec 07 2004 sndirsch@suse.de
- updated to release 0.6.6
-* Wed Nov 17 2004 - sndirsch@suse.de
+* Wed Nov 17 2004 sndirsch@suse.de
- updated to release 0.6.5
-* Thu Aug 12 2004 - sndirsch@suse.de
+* Thu Aug 12 2004 sndirsch@suse.de
- updated to release 0.6.4
-* Fri Jul 16 2004 - sndirsch@suse.de
+* Fri Jul 16 2004 sndirsch@suse.de
- updated to release 0.6.3
-* Tue May 25 2004 - sndirsch@suse.de
+* Tue May 25 2004 sndirsch@suse.de
- updated to release 0.6.2
* fixes DoubleSpeed, DoubleRadius and TwinView issues
-* Mon May 24 2004 - sndirsch@suse.de
+* Tue May 25 2004 sndirsch@suse.de
- added -devel package
-* Mon May 24 2004 - sndirsch@suse.de
+* Mon May 24 2004 sndirsch@suse.de
- created package
++++++ linuxwacom-0.7.9-1.tar.bz2 -> linuxwacom-0.7.9-9.tar.bz2 ++++++
++++ 41183 lines of diff (skipped)
++++++ linuxwacom-fix-multitouch.diff ++++++
--- /var/tmp/diff_new_pack.S11327/_old 2008-04-06 17:23:36.000000000 +0200
+++ /var/tmp/diff_new_pack.S11327/_new 2008-04-06 17:23:36.000000000 +0200
@@ -1,3 +1,32 @@
+From: Danny Kukawka
+Subject: fix multitouch and add new xorg.conf option to disable multitouch
+
+This patch fixes problems with the multitouch feature of 0.7.8-3 and 0.7.9-1
+on a Lenovo X61 TabletPC. The X driver does not differ correctly between
+the usage of the pen and multitouch events which are also caused by
+pressing the pen on the tablet. This cause a jumping cursor/stylus which
+lead to strange input.
+
+This fixes the issue for the cursor/stylus (set lastismt back if it wasn't
+a multitouch event and some other smaller changes). Unfortunatly currently
+this fix not the eraser of the pen, but I'm working on it. This change
+make the pen at least usable again.
+
+The patch include also a new config option for xorg.conf to disable the
+Multitouch feature completely. The new option is named "MultiTouch" and
+has as value "off" to disable multitouch, any other value has no effect
+and let the feature enabled. The option get only parsed if the TabletPC
+ISD V4 protocol get forced.
+
+Signed-off-by: Danny Kukawka
+---
+
+ wacom.4x | 5 +++++
+ xdrv/wcmConfig.c | 9 +++++++++
+ xdrv/wcmISDV4.c | 14 +++++++++++---
+ xdrv/xf86Wacom.h | 1 +
+ 4 files changed, 26 insertions(+), 3 deletions(-)
+
--- src/xdrv/wcmConfig.c 2007-11-05 17:42:58.000000000 +0100
+++ src/xdrv/wcmConfig.c 2007-11-05 17:51:50.000000000 +0100
@@ -548,6 +548,15 @@
@@ -16,58 +45,6 @@
}
s = xf86FindOptionValue(local->options, "Rotate");
---- src/xdrv/xf86Wacom.h 2007-11-05 17:49:23.000000000 +0100
-+++ src/xdrv/xf86Wacom.h 2007-11-05 17:50:43.000000000 +0100
-@@ -491,6 +491,7 @@
- int wcmProtocolLevel; /* 4 for Wacom IV, 5 for Wacom V */
- float wcmVersion; /* ROM version */
- int wcmForceDevice; /* force device type (used by ISD V4) */
-+ int wcmMultiTouch; /* if the multitouch feature should be supported */
- int wcmRotate; /* rotate screen (for TabletPC) */
- int wcmThreshold; /* Threshold for button pressure */
- WacomChannel wcmChannel[MAX_CHANNELS]; /* channel device state */
---- src/xdrv/wcmISDV4.c 2007-11-05 16:21:56.000000000 +0100
-+++ src/xdrv/wcmISDV4.c 2007-11-05 18:20:38.000000000 +0100
-@@ -99,7 +99,7 @@
- {
- /* set parameters */
- common->wcmProtocolLevel = 4;
-- common->wcmPktLength = 5; /* length of a packet
-+ common->wcmPktLength = 9; /* length of a packet
- * device packets are 9 bytes long,
- * multitouch are only 5 */
- common->wcmResolX = 2540; /* tablet X resolution in points/inch */
-@@ -214,11 +214,18 @@
- /* determine the type of message */
- if (data[0] & 0x10)
- {
-- ismt = 1;
-+ if (common->wcmMultiTouch == 0) {
-+ lastismt = 0;
-+ return 5;
-+ }
-+
- common->wcmPktLength = 5;
-+ ismt = 1;
- }
- else
- {
-+ /* set state back */
-+ lastismt = 0;
- common->wcmPktLength = 9;
- if (common->buffer + common->bufpos - data < common->wcmPktLength)
- {
-@@ -232,8 +239,9 @@
- else
- {
- /* Coordinate data bit check */
-- if (data[0] & 0x40)
-+ if (data[0] & 0x40) {
- return common->wcmPktLength;
-+ }
- }
- /* pick up where we left off, minus relative values */
- ds = &common->wcmChannel[0].work;
--- src/wacom.4x_save 2007-11-05 18:30:27.000000000 +0100
+++ src/wacom.4x 2007-11-05 18:32:51.000000000 +0100
@@ -61,6 +61,11 @@
@@ -82,3 +59,27 @@
.B Option \fI"Suppress"\fP \fI"Inumber"\fP
sets the position increment under which not to transmit coordinates.
This entry must be specified only in the first Wacom subsection if you have
+diff -u src/xdrv.orig//wcmISDV4.c src/xdrv/wcmISDV4.c
+--- src/xdrv.orig//wcmISDV4.c 2008-04-06 10:46:52.985558250 +0200
++++ src/xdrv/wcmISDV4.c 2008-04-06 10:49:02.769669250 +0200
+@@ -263,6 +263,9 @@
+ /* determine the type of message (touch or stylus)*/
+ if (data[0] & 0x18)
+ {
++ if (common->wcmMultiTouch == 0) {
++ return 5;
++ }
+ ds = &common->wcmChannel[0].work;
+ if (common->wcmPktLength == 9 && ds->proximity)
+ return 5; /* ignore touch event */
+diff -u src/xdrv.orig//xf86WacomDefs.h src/xdrv/xf86WacomDefs.h
+--- src/xdrv.orig//xf86WacomDefs.h 2008-04-06 10:46:52.601534250 +0200
++++ src/xdrv/xf86WacomDefs.h 2008-04-06 10:49:49.500589750 +0200
+@@ -391,6 +391,7 @@
+ int wcmProtocolLevel; /* 4 for Wacom IV, 5 for Wacom V */
+ float wcmVersion; /* ROM version */
+ int wcmForceDevice; /* force device type (used by ISD V4) */
++ int wcmMultiTouch; /* if the multitouch feature should be supported */
+ int wcmRotate; /* rotate screen (for TabletPC) */
+ int wcmThreshold; /* Threshold for button pressure */
+ WacomChannel wcmChannel[MAX_CHANNELS]; /* channel device state */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org