Hello community, here is the log from the commit of package x11-input-wacom for openSUSE:Factory checked in at Wed Nov 4 11:44:37 CET 2009. -------- --- x11-input-wacom/x11-input-wacom.changes 2009-11-01 12:42:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2009-11-04 04:09:56.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 4 04:04:16 CET 2009 - sndirsch@suse.de + +- update to development release 0.8.5-1; redone n-trig.diff + (bnc #541082) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linuxwacom-0.8.3-6.tar.bz2 New: ---- linuxwacom-0.8.5-1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.H0WGqA/_old 2009-11-04 11:42:03.000000000 +0100 +++ /var/tmp/diff_new_pack.H0WGqA/_new 2009-11-04 11:42:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package x11-input-wacom (Version 0.8.3) +# spec file for package x11-input-wacom (Version 0.8.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild -%define revision 6 +%define revision 1 %define udev_rules_custom 0 Name: x11-input-wacom @@ -31,8 +31,8 @@ License: GPL v2 or later Url: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities -Version: 0.8.3 -Release: 4 +Version: 0.8.5 +Release: 1 Summary: X11 input module for wacom tablet Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o Supplements: xorg-x11-server ++++++ linuxwacom-0.8.3-6.tar.bz2 -> linuxwacom-0.8.5-1.tar.bz2 ++++++ ++++ 10552 lines of diff (skipped) ++++++ n-trig.diff ++++++ --- /var/tmp/diff_new_pack.H0WGqA/_old 2009-11-04 11:42:04.000000000 +0100 +++ /var/tmp/diff_new_pack.H0WGqA/_new 2009-11-04 11:42:04.000000000 +0100 @@ -1,24 +1,58 @@ -diff -u -p -r ../linuxwacom-0.8.3-6.orig//src/xdrv/wcmUSB.c ./src/xdrv/wcmUSB.c ---- ../linuxwacom-0.8.3-6.orig//src/xdrv/wcmUSB.c 2009-11-01 12:30:28.785865397 +0100 -+++ ./src/xdrv/wcmUSB.c 2009-11-01 12:33:24.901795805 +0100 -@@ -508,7 +508,8 @@ static struct - - { 0x90, 2540, 2540, &usbTabletPC }, /* TabletPC 0x90 */ - { 0x93, 2540, 2540, &usbTabletPC }, /* TabletPC 0x93 */ -- { 0x9A, 2540, 2540, &usbTabletPC } /* TabletPC 0x9A */ -+ { 0x9A, 2540, 2540, &usbTabletPC }, /* TabletPC 0x9A */ -+ { 0x01, 935, 1122, &usbTabletPC } /* TabletPC 0x9A */ +--- ../e1/linuxwacom-0.8.5-1/src/xdrv/xf86Wacom.c 2009-10-31 23:34:18.000000000 +0100 ++++ src/xdrv/xf86Wacom.c 2009-11-03 22:33:47.898230675 +0100 +@@ -820,7 +820,7 @@ + ioctl(fd, EVIOCGID, id); + close(fd); + +- if (id->vendor == 0x056a) ++ if (id->vendor == 0x056a || id->vendor == 0x1b96) + return TRUE; + else + return FALSE; +--- src/xdrv/wcmUSB.c 2009-10-31 23:34:18.000000000 +0100 ++++ ../changes/src/xdrv/wcmUSB.c 2009-11-03 20:03:16.000000000 +0100 +@@ -499,7 +499,9 @@ + { 0x9A, 2540, 2540, &usbTabletPC }, /* TabletPC 0x9A */ + { 0x9F, 10, 10, &usbTabletPC }, /* CapPlus 0x9F */ + { 0xE2, 10, 10, &usbTabletPC }, /* TabletPC 0xE2 */ +- { 0xE3, 2540, 2540, &usbTabletPC } /* TabletPC 0xE3 */ ++ { 0xE3, 2540, 2540, &usbTabletPC }, /* TabletPC 0xE3 */ ++ { 0x01, 935, 1122, &usbTabletPC } /* TabletPC 0x01 */ ++ }; Bool usbWcmInit(LocalDevicePtr local, char* id, float *version) -@@ -526,8 +527,8 @@ Bool usbWcmInit(LocalDevicePtr local, ch - ioctl(local->fd, EVIOCGID, sID); +@@ -517,8 +519,8 @@ + ioctl(local->fd, EVIOCGID, &sID); ioctl(local->fd, EVIOCGNAME(sizeof(id)), id); - /* vendor is wacom */ -- if (sID[1] == 0x056A) +- if (sID.vendor == 0x056A) + /* vendor is wacom or n-trig */ -+ if (sID[1] == 0x056A || sID[1] == 0x1b96) ++ if (sID.vendor == 0x056A || sID.vendor == 0x1b96) { - common->tablet_id = sID[2]; + common->tablet_id = sID.product; + +@@ -544,7 +546,7 @@ + if ( common->wcmTouch ) + xf86Msg(X_CONFIG, "%s: Touch is enabled \n", common->wcmDevice); + +- if(common->tablet_id == 0xE2 || common->tablet_id == 0xE3) ++ if(common->tablet_id == 0xE2 || common->tablet_id == 0xE3 || common->tablet_id == 0x01) + { + /* GestureDefault was off for all devices */ + /* except when multi-touch is supported */ + + +--- ../e1/linuxwacom-0.8.5-1/src/xdrv/wcmConfig.c 2009-10-31 23:34:18.000000000 +0100 ++++ src/xdrv/wcmConfig.c 2009-11-04 01:37:16.753354886 +0100 +@@ -625,7 +625,8 @@ + { 0x9A, STYLUS_ID | ERASER_ID | TOUCH_ID }, /* TabletPC 0x9A */ + { 0x9F, TOUCH_ID }, /* CapPlus 0x9F */ + { 0xE2, TOUCH_ID }, /* TabletPC 0xE2 */ +- { 0xE3, STYLUS_ID | ERASER_ID | TOUCH_ID } /* TabletPC 0xE3 */ ++ { 0xE3, STYLUS_ID | ERASER_ID | TOUCH_ID }, /* TabletPC 0xE3 */ ++ { 0x01, STYLUS_ID | ERASER_ID | TOUCH_ID } /* TabletPC 0x01 */ + }; + static struct ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org