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

[Peter Hutterer]

commit 3eda8e423609f8ed3212ca112a419b239493a4ec
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Aug 2 09:30:33 2010 +1000

    Add wacom-0.10.8-ntrig.patch: add N-Trig to known vendors.
    
    Also, build from tarball, not git. We only track upstream git in rawhide.

 .gitignore               |    2 +-
 sources                  |    2 +-
 wacom-0.10.8-ntrig.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 xorg-x11-drv-wacom.spec  |   12 ++++++++++--
 4 files changed, 56 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c3199a..b28bcb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xf86-input-wacom-20100726.tar.bz2
+xf86-input-wacom-0.10.8.tar.bz2
diff --git a/sources b/sources
index 2e22ed2..070712a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c914904b0aaf6c9f8e22f7bcbb632bd  xf86-input-wacom-20100726.tar.bz2
+e2bcc125070a16a7e3608d074d5d27dc  xf86-input-wacom-0.10.8.tar.bz2
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 2b23963..4134b3d 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -3,12 +3,12 @@
 %global driverdir %{moduledir}/input
 
 # Disable gitdate to build from a fixed release
-%global gitdate 20100726
+#global gitdate 20100726
 
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.8
-Release:    1%{?gitdate:.%{gitdate}}%{?dist}
+Release:    2%{?gitdate:.%{gitdate}}%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -21,6 +21,8 @@ Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{versio
 %endif
 Source1: 70-wacom.rules
 
+Patch01: wacom-0.10.8-ntrig.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.7.0
@@ -40,6 +42,8 @@ X.Org X11 wacom input driver for Wacom tablets.
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
+%patch01 -p1
+
 %build
 %if 0%{?gitdate}
 autoreconf -v --install || exit 1
@@ -97,6 +101,10 @@ 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.
+- Build from tarball, not git. We only track upstream git in rawhide.
+
 * Mon Jul 26 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.8-1
 - wacom 0.10.8 (from git)