[xorg-x11-drv-wacom/f13/master] Add wacom-0.10.8-ntrig.patch: add N-Trig to known vendors.

[Peter Hutterer]

commit 79d6bd177e1e741bdd1b28f64e2054b4cb48ffa7
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Aug 2 09:16:57 2010 +1000

    Add wacom-0.10.8-ntrig.patch: add N-Trig to known vendors.

 wacom-0.10.8-ntrig.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 xorg-x11-drv-wacom.spec  |    9 ++++++++-
 2 files changed, 52 insertions(+), 1 deletions(-)
---
diff --git a/wacom-0.10.8-ntrig.patch b/wacom-0.10.8-ntrig.patch
new file mode 100644
index 0000000..e4a6413
--- /dev/null
+++ b/wacom-0.10.8-ntrig.patch
@@ -0,0 +1,44 @@
+From f14e8a710c17b1c15412911bf910e0d318609225 Mon Sep 17 00:00:00 2001
+From: Rafi Rubin <rafi at ugcs.caltech.edu>
+Date: Wed, 28 Jul 2010 20:04:10 -0400
+Subject: [PATCH] Add ntrig vendor and device codes.
+
+Signed-off-by: Rafi Rubin <rafi at ugcs.caltech.edu>
+Tested-by: Thomas Spura <spurath at students.uni-mainz.de>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/wcmUSB.c        |    5 ++++-
+ src/xf86WacomDefs.h |    1 +
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/src/wcmUSB.c b/src/wcmUSB.c
+index 2bbf1e3..c41a67b 100644
+--- a/src/wcmUSB.c
++++ b/src/wcmUSB.c
+@@ -471,7 +471,10 @@ static struct
+ 	{ WALTOP_VENDOR_ID, 0x500, 2540, 2540, &usbBamboo    },
+ 	{ WALTOP_VENDOR_ID, 0x501, 2540, 2540, &usbBamboo    },
+ 	{ WALTOP_VENDOR_ID, 0x502, 5080, 5080, &usbIntuos4   },
+-	{ WALTOP_VENDOR_ID, 0x503, 5080, 5080, &usbIntuos4   }
++	{ WALTOP_VENDOR_ID, 0x503, 5080, 5080, &usbIntuos4   },
++
++	/* N-Trig devices */
++	{ NTRIG_VENDOR_ID,  0x01, 1122, 934, &usbTabletPC    }
+ };
+ 
+ static Bool usbWcmInit(LocalDevicePtr local, char* id, float *version)
+diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
+index d9baea2..14409b5 100644
+--- a/src/xf86WacomDefs.h
++++ b/src/xf86WacomDefs.h
+@@ -30,6 +30,7 @@
+ /* vendor IDs on the kernel device */
+ #define WACOM_VENDOR_ID 0x056a
+ #define WALTOP_VENDOR_ID 0x172F
++#define NTRIG_VENDOR_ID 0x1b96
+ 
+ #define DEFAULT_SUPPRESS 2      /* default suppress */
+ #define MAX_SUPPRESS 100        /* max value of suppress */
+-- 
+1.7.2
+
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index b1d38ba..620547b 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.8
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
 Source1: 70-wacom.rules
 
+Patch01: wacom-0.10.8-ntrig.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.7.0
@@ -33,6 +35,8 @@ X.Org X11 wacom input driver for Wacom tablets.
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch01 -p1
+
 %build
 %configure --disable-static
 make %{_smp_mflags}
@@ -86,6 +90,9 @@ X.Org X11 wacom input driver development files.
 %{_bindir}/isdv4-serial-debugger
 
 %changelog
+* Mon Aug 02 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.8-2
+- wacom-0.10.8-ntrig.patch: add N-Trig to known vendors.
+
 * Mon Jul 26 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.8-1
 - Update to 0.10.8