Hello community, here is the log from the commit of package x11-input-wacom for openSUSE:Factory checked in at Mon Nov 2 12:45:42 CET 2009. -------- --- x11-input-wacom/x11-input-wacom.changes 2009-10-23 21:47:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2009-11-01 12:42:30.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 1 12:36:44 CET 2009 - sndirsch@suse.de + +- n-trig.diff + * support for n-trig touchscreen (bnc #541082) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- n-trig.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.V6A1wY/_old 2009-11-02 12:45:30.000000000 +0100 +++ /var/tmp/diff_new_pack.V6A1wY/_new 2009-11-02 12:45:30.000000000 +0100 @@ -32,7 +32,7 @@ Url: http://linuxwacom.sourceforge.net/ Group: System/X11/Utilities Version: 0.8.3 -Release: 3 +Release: 4 Summary: X11 input module for wacom tablet Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o Supplements: xorg-x11-server @@ -41,6 +41,7 @@ %if %udev_rules_custom Source1: 65-wacom.rules %endif +Patch: n-trig.diff #BuildRoot: %{_tmppath}/%{name}-%{version}-%{revision}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x @@ -95,6 +96,7 @@ %prep %setup -q -n linuxwacom-%{version}-%{revision} #%setup -n linuxwacom-%{version} +%patch touch NEWS %build ++++++ n-trig.diff ++++++ 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 */ }; Bool usbWcmInit(LocalDevicePtr local, char* id, float *version) @@ -526,8 +527,8 @@ Bool usbWcmInit(LocalDevicePtr local, ch ioctl(local->fd, EVIOCGID, sID); ioctl(local->fd, EVIOCGNAME(sizeof(id)), id); - /* vendor is wacom */ - if (sID[1] == 0x056A) + /* vendor is wacom or n-trig */ + if (sID[1] == 0x056A || sID[1] == 0x1b96) { common->tablet_id = sID[2]; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org