Hello community,
here is the log from the commit of package x11-input-wacom
checked in at Thu Jul 24 22:40:12 CEST 2008.
--------
--- x11-input-wacom/x11-input-wacom.changes 2008-07-03 17:31:19.000000000 +0200
+++ x11-input-wacom/x11-input-wacom.changes 2008-07-24 17:40:13.926351931 +0200
@@ -1,0 +2,6 @@
+Thu Jul 24 17:39:30 CEST 2008 - sndirsch@suse.de
+
+- updated to 0.8.1-1 due to rotation working again with this
+ version
+
+-------------------------------------------------------------------
Old:
----
linuxwacom-0.7.8-3.diff
linuxwacom-0.7.9-1.diff
linuxwacom-0.7.9-4.tar.bz2
linuxwacom-autoprobe.diff
linuxwacom-debug.diff
New:
----
linuxwacom-0.8.1-1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-wacom.spec ++++++
--- /var/tmp/diff_new_pack.m17322/_old 2008-07-24 22:37:50.000000000 +0200
+++ /var/tmp/diff_new_pack.m17322/_new 2008-07-24 22:37:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package x11-input-wacom (Version 0.7.9)
+# spec file for package x11-input-wacom (Version 0.8.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,9 +10,9 @@
# norootforbuild
+%define revision 1
Name: x11-input-wacom
-%define revision 4
BuildRequires: gtk2-devel ncurses ncurses-devel tk-devel update-desktop-files
%ifnarch s390 s390x
BuildRequires: xorg-x11-driver-input xorg-x11-server-sdk
@@ -20,20 +20,16 @@
License: GPL v2 or later
Url: http://linuxwacom.sourceforge.net/
Group: System/X11/Utilities
-Version: 0.7.9
-Release: 56
+Version: 0.8.1
+Release: 1
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
Source1: 65-wacom.rules
-Patch0: linuxwacom-0.7.8-3.diff
-Patch1: linuxwacom-autoprobe.diff
-Patch2: linuxwacom-0.7.9-1.diff
-Patch3: linuxwacom-fix-multitouch.diff
-Patch4: linuxwacom-debug.diff
-Patch5: linuxwacom-fix-xsetwacom_find_devices.diff
-Patch6: s390.diff
-Patch7: xorg-server-1.5.diff
+Patch: linuxwacom-fix-multitouch.diff
+Patch1: linuxwacom-fix-xsetwacom_find_devices.diff
+Patch2: s390.diff
+Patch3: xorg-server-1.5.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -89,30 +85,26 @@
%prep
%setup -n linuxwacom-%{version}-%{revision}
-%patch0
+%patch
%patch1
-%patch2
-%patch3
-%patch4 -p1
-%patch5
%ifarch s390 s390x
-%patch6
+%patch2
%endif
-%patch7
+%patch3
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
libtoolize --force
autoreconf --force --install
%ifarch s390 s390x
-./configure --prefix=/usr \
+%configure --prefix=/usr \
--disable-libwacomcfg \
--disable-xsetwacom \
--disable-wacdump \
--disable-xidump \
--disable-libwacomxi
%else
-./configure --prefix=/usr \
+%configure --prefix=/usr \
%ifarch x86_64
--enable-xserver64 \
%endif
@@ -126,11 +118,6 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
%ifnarch s390 s390x
-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
@@ -193,6 +180,9 @@
%endif
%changelog
+* Thu Jul 24 2008 sndirsch@suse.de
+- updated to 0.8.1-1 due to rotation working again with this
+ version
* Thu Jul 03 2008 sndirsch@suse.de
- xorg-server-1.5.diff:
* fixes build with xorg-server 1.5
++++++ linuxwacom-0.7.9-4.tar.bz2 -> linuxwacom-0.8.1-1.tar.bz2 ++++++
++++ 40888 lines of diff (skipped)
++++++ linuxwacom-fix-multitouch.diff ++++++
--- /var/tmp/diff_new_pack.m17322/_old 2008-07-24 22:37:52.000000000 +0200
+++ /var/tmp/diff_new_pack.m17322/_new 2008-07-24 22:37:52.000000000 +0200
@@ -1,9 +1,63 @@
---- 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 @@
- common->wcmDevCls = &gWacomISDV4Device;
- xf86Msg(X_CONFIG, "%s: forcing TabletPC ISD V4 protocol\n",
+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/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 @@
+ we only support serial Tablet PC. It is a special Wacom IV protocol,
+ called ISDV4 protocol. This option is mandatory for Tablet PC.
+ .TP 4
++.B Option \fI"MultiTouch"\fP \fI"off"\fP
++tells the driver to ignore MultiTouch events on newer Tablet PCs as e.g.
++on WACf008 devices. This option is only used if option "ForceDevice" is
++"ISDV4"
++.TP 4
+ .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//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 */
+--- ./src/xdrv/wcmConfig.c.orig 2008-07-21 21:13:24.000000000 +0000
++++ ./src/xdrv/wcmConfig.c 2008-07-24 15:32:41.000000000 +0000
+@@ -589,6 +589,15 @@
dev->identifier);
+ common->wcmTPCButton = 1; /* Tablet PC buttons on by default */
+ common->wcmTPCButtonDefault = 1;
+
+ /* disable multitouch feature ... only available on TabletPCs */
+ s = xf86FindOptionValue(local->options, "MultiTouch");
@@ -16,69 +70,17 @@
}
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)
+--- ./src/xdrv/wcmISDV4.c.orig 2008-07-21 21:13:24.000000000 +0000
++++ ./src/xdrv/wcmISDV4.c 2008-07-24 15:34:27.000000000 +0000
+@@ -300,7 +300,10 @@
+ /* determine the type of message (touch or stylus)*/
+ if (data[0] & 0x18) /* not a pen */
{
-- ismt = 1;
+-ErrorF("isdv4Parse last-prox=%d, length=%d \n", last->proximity, common->wcmPktLength);
+ 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)
++ ErrorF("isdv4Parse last-prox=%d, length=%d \n", last->proximity, common->wcmPktLength);
+ if ((common->wcmPktLength == 9 && last->proximity ) ||
+ !common->wcmTouch )
{
-@@ -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 @@
- we only support serial Tablet PC. It is a special Wacom IV protocol,
- called ISDV4 protocol. This option is mandatory for Tablet PC.
- .TP 4
-+.B Option \fI"MultiTouch"\fP \fI"off"\fP
-+tells the driver to ignore MultiTouch events on newer Tablet PCs as e.g.
-+on WACf008 devices. This option is only used if option "ForceDevice" is
-+"ISDV4"
-+.TP 4
- .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
++++++ linuxwacom-fix-xsetwacom_find_devices.diff ++++++
--- /var/tmp/diff_new_pack.m17322/_old 2008-07-24 22:37:52.000000000 +0200
+++ /var/tmp/diff_new_pack.m17322/_new 2008-07-24 22:37:53.000000000 +0200
@@ -1,6 +1,6 @@
---- src/util/wacomcfg.c 2008-06-10 19:23:00.000000000 +0200
-+++ src/util/wacomcfg.c 2008-06-10 19:25:05.000000000 +0200
-@@ -41,11 +41,20 @@
+--- src/util/wacomcfg.c 2008-05-15 21:13:04.000000000 +0200
++++ src/util/wacomcfg.c 2008-05-16 15:13:31.000000000 +0200
+@@ -39,11 +39,20 @@
#include /* debugging only, we've got no business output text */
#include
#include
@@ -21,7 +21,7 @@
/*****************************************************************************
** Internal structures
*****************************************************************************/
-@@ -123,6 +132,7 @@
+@@ -121,6 +130,7 @@
unsigned char* pReq;
WACOMDEVICEINFO* pInfo;
XDeviceInfo* info;
@@ -29,7 +29,7 @@
char devName[64];
if (!hConfig || !ppInfo || !puCount)
-@@ -132,12 +142,15 @@
+@@ -130,6 +140,9 @@
if (!hConfig->pDevs && CfgGetDevs(hConfig))
return -1;
@@ -39,14 +39,7 @@
/* estimate size of memory needed to hold structures */
nSize = nCount = 0;
for (i=0; i<hConfig->nDevCnt; ++i)
- {
- info = hConfig->pDevs + i;
-- if (info->use != IsXExtensionDevice) continue;
-+ if (info->use != IsXExtensionDevice && info->use != IsXExtensionPointer) continue;
- if (!info->num_classes) continue;
- nSize += sizeof(WACOMDEVICEINFO);
- nSize += strlen(info->name) + 1;
-@@ -146,8 +159,10 @@
+@@ -150,8 +163,10 @@
/* allocate memory and zero */
pReq = (unsigned char*)malloc(nSize);
@@ -59,16 +52,7 @@
memset(pReq,0,nSize);
/* populate data */
-@@ -158,7 +173,7 @@
- {
- info = hConfig->pDevs + i;
- /* ignore non-extension devices */
-- if (info->use != IsXExtensionDevice) continue;
-+ if (info->use != IsXExtensionDevice && info->use != IsXExtensionPointer) continue;
- /* ignore uninitialized tools */
- if (!info->num_classes) continue;
- /* copy name */
-@@ -170,16 +185,12 @@
+@@ -179,18 +194,12 @@
for (j=0; jpszName); j++)
devName[j] = tolower(pInfo->pszName[j]);
devName[j] = '\0';
@@ -78,6 +62,8 @@
- pInfo->type = WACOMDEVICETYPE_STYLUS;
- else if (strstr(devName,"eraser") != NULL)
- pInfo->type = WACOMDEVICETYPE_ERASER;
+- else if (strstr(devName,"touch") != NULL)
+- pInfo->type = WACOMDEVICETYPE_TOUCH;
- else if (strstr(devName,"pad") != NULL)
- pInfo->type = WACOMDEVICETYPE_PAD;
- else
@@ -91,7 +77,7 @@
if ( pInfo->type != WACOMDEVICETYPE_UNKNOWN )
{
-@@ -196,6 +207,62 @@
+@@ -207,6 +216,64 @@
return 0;
}
@@ -144,6 +130,8 @@
+ return WACOMDEVICETYPE_STYLUS;
+ else if (strstr(name,"eraser") != NULL)
+ return WACOMDEVICETYPE_ERASER;
++ else if (strstr(name,"touch") != NULL)
++ return WACOMDEVICETYPE_TOUCH;
+ else if (strstr(name,"pad") != NULL)
+ return WACOMDEVICETYPE_PAD;
+ else
@@ -154,7 +142,7 @@
WACOMDEVICE * WacomConfigOpenDevice(WACOMCONFIG * hConfig,
const char* pszDeviceName)
{
-@@ -381,3 +448,36 @@
+@@ -392,3 +459,36 @@
free(pvData);
}
@@ -191,21 +179,26 @@
+ vfprintf(stderr, f, args);
+ va_end(args);
+}
---- src/util/Makefile.am 2007-10-24 21:44:52.000000000 +0000
-+++ src/util/Makefile.am 2008-05-16 20:22:53.000000000 +0000
-@@ -4,7 +4,10 @@
+--- src/util/Makefile.am 2008-05-16 13:53:17.000000000 +0200
++++ src/util/Makefile.am 2008-05-16 14:47:55.000000000 +0200
+@@ -4,7 +4,15 @@
wacomcfgdir = $(includedir)/wacomcfg
wacomcfg_HEADERS = wacomcfg.h
-AM_CFLAGS = -Wall -pedantic
+if WCM_ENV_XORGSDK
-+WACOMCFG_INCLUDES = -I/usr/include/xorg $(X_CFLAGS)
++WACOMCFG_INCLUDES = -I$(WCM_XORGSDK_DIR) $(X_CFLAGS)
+endif
++
++if WCM_ENV_XFREE86
++WACOMCFG_INCLUDES = -I$(WCM_XFREE86_DIR)
++endif
++
+AM_CFLAGS = -Wall -pedantic $(WACOMCFG_INCLUDES)
- DEPFLAGS = @WCM_DEPFLAGS@
# These identify which programs, libraries, and headers could
-@@ -27,7 +35,7 @@
+ # potentially be built or installed depending on the results of
+@@ -28,7 +36,7 @@
libwacomcfg_la_SOURCES = wacomcfg.c wacomcfg.h ../include/Xwacom.h
libwacomcfg_la_LDFLAGS = -no-undefined -version-info @WCM_LIBWACOMCFG_VER@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org