[xorg-x11-drv-wacom] Add support for Cintiq 22HD

[Peter Hutterer]

commit b6153befc7dbd9309f1c457b07abd10e1b8e8501
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sun Aug 5 11:23:09 2012 +1000

    Add support for Cintiq 22HD

 0001-Add-Cintiq-22HD.patch |   38 ++++++++++++++++++++++++++++++++++++++
 xorg-x11-drv-wacom.spec    |    8 +++++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/0001-Add-Cintiq-22HD.patch b/0001-Add-Cintiq-22HD.patch
new file mode 100644
index 0000000..50aecad
--- /dev/null
+++ b/0001-Add-Cintiq-22HD.patch
@@ -0,0 +1,38 @@
+From 1a8db01e896514d06f7a69c647aac05832d54ea7 Mon Sep 17 00:00:00 2001
+From: Ping Cheng <pinglinux at gmail.com>
+Date: Thu, 12 Jul 2012 17:23:00 -0700
+Subject: [PATCH] Add Cintiq 22HD
+
+Signed-off-by: Ping Cheng <pinglinux at gmail.com>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/wcmUSB.c            |    1 +
+ src/wcmValidateDevice.c |    1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/wcmUSB.c b/src/wcmUSB.c
+index 47c8964..3ee5d8f 100644
+--- a/src/wcmUSB.c
++++ b/src/wcmUSB.c
+@@ -276,6 +276,7 @@ static struct
+	{ WACOM_VENDOR_ID, 0xC6, 200000, 200000, &usbCintiqV5   }, /* Cintiq 12WX */
+	{ WACOM_VENDOR_ID, 0xCC, 200000, 200000, &usbCintiqV5   }, /* Cintiq 21UX2 */
+	{ WACOM_VENDOR_ID, 0xF4, 200000, 200000, &usbCintiqV5   }, /* Cintiq 24HD */
++	{ WACOM_VENDOR_ID, 0xFA, 200000, 200000, &usbCintiqV5   }, /* Cintiq 22HD */
+
+	{ WACOM_VENDOR_ID, 0x90, 100000, 100000, &usbTabletPC   }, /* TabletPC 0x90 */
+	{ WACOM_VENDOR_ID, 0x93, 100000, 100000, &usbTabletPC   }, /* TabletPC 0x93 */
+diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
+index 119539d..6c08c45 100644
+--- a/src/wcmValidateDevice.c
++++ b/src/wcmValidateDevice.c
+@@ -254,6 +254,7 @@ int wcmDeviceTypeKeys(InputInfoPtr pInfo)
+		case 0xC5:  /* CintiqV5 */
+		case 0xC6:  /* CintiqV5 */
+		case 0xCC:  /* CinitqV5 */
++		case 0xFA:  /* Cintiq 22HD */
+			TabletSetFeature(priv->common, WCM_LCD);
+			/* fall through */
+		case 0xB0:  /* I3 */
+--
+1.7.10.4
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index 5638b5a..6086425 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -8,7 +8,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.16.0
-Release:    3%{?gitdate:.%{gitdate}}%{?dist}
+Release:    4%{?gitdate:.%{gitdate}}%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -20,6 +20,8 @@ Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{versio
 %endif
 Source1: 70-wacom.rules
 
+Patch01: 0001-Add-Cintiq-22HD.patch
+
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
 BuildRequires: xorg-x11-server-sdk >= 1.10.99.902
@@ -38,6 +40,7 @@ X.Org X11 wacom input driver for Wacom tablets.
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%patch01 -p1
 
 %build
 %if 0%{?gitdate}
@@ -97,6 +100,9 @@ X.Org X11 wacom input driver development files.
 %{_bindir}/isdv4-serial-debugger
 
 %changelog
+* Sun Aug 05 2012 Peter Hutterer <peter.hutterer at redhat.com> 0.16.0-4
+- Add support for Cintiq 22HD
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.16.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild