[colorhug-client] Allow people using the legacy VID/PID to use colorhug-ccmx.

[Richard Hughes]

commit adcf9577cf03d0019f2d981274bdf8ee289891ac
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu May 24 07:40:12 2012 +0100

    Allow people using the legacy VID/PID to use colorhug-ccmx.

 ...ccmx-re-enable-support-for-legacy-USB-IDs.patch |   41 ++++++++++++++++++++
 colorhug-client.spec                               |    7 +++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/0001-colorhug-ccmx-re-enable-support-for-legacy-USB-IDs.patch b/0001-colorhug-ccmx-re-enable-support-for-legacy-USB-IDs.patch
new file mode 100644
index 0000000..3f010a7
--- /dev/null
+++ b/0001-colorhug-ccmx-re-enable-support-for-legacy-USB-IDs.patch
@@ -0,0 +1,41 @@
+From 73a30bc3e1fae28789c5154a7160f1fa9cb2dfde Mon Sep 17 00:00:00 2001
+From: Thilo Fromm <github at thilo-fromm.de>
+Date: Wed, 23 May 2012 10:26:57 +0200
+Subject: [PATCH] colorhug-ccmx: re-enable support for legacy USB IDs
+
+	This patch re-enables support for colorhug devices with a
+	legacy USB vendor/product ID (04d8:f8da) in colorhug-ccmx.
+
+Signed-off-by: Thilo Fromm <github at thilo-fromm.de>
+Signed-off-by: Richard Hughes <richard at hughsie.com>
+---
+ src/ch-ccmx.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/ch-ccmx.c b/src/ch-ccmx.c
+index 957b8d0..cec4620 100644
+--- a/src/ch-ccmx.c
++++ b/src/ch-ccmx.c
+@@ -1572,7 +1572,8 @@ ch_ccmx_device_added_cb (GUsbDeviceList *list,
+ 	g_debug ("Added: %i:%i",
+ 		 g_usb_device_get_vid (device),
+ 		 g_usb_device_get_pid (device));
+-	if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE) {
++	if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE ||
++	    ch_device_get_mode (device) == CH_DEVICE_MODE_LEGACY) {
+ 		priv->device = g_object_ref (device);
+ 		ch_ccmx_got_device (priv);
+ 	}
+@@ -1589,7 +1590,8 @@ ch_ccmx_device_removed_cb (GUsbDeviceList *list,
+ 	g_debug ("Removed: %i:%i",
+ 		 g_usb_device_get_vid (device),
+ 		 g_usb_device_get_pid (device));
+-	if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE) {
++	if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE ||
++	    ch_device_get_mode (device) == CH_DEVICE_MODE_LEGACY) {
+ 		if (priv->device != NULL)
+ 			g_object_unref (priv->device);
+ 		priv->device = NULL;
+-- 
+1.7.10.2
+
diff --git a/colorhug-client.spec b/colorhug-client.spec
index 1e23dd7..bcf7f5d 100644
--- a/colorhug-client.spec
+++ b/colorhug-client.spec
@@ -1,10 +1,11 @@
 Summary:   Tools for the Hughski Colorimeter
 Name:      colorhug-client
 Version:   0.1.9
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 URL:       http://www.hughski.com/
 Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
+Patch0:    0001-colorhug-ccmx-re-enable-support-for-legacy-USB-IDs.patch
 
 BuildRequires: gettext
 BuildRequires: glib2-devel
@@ -37,6 +38,7 @@ GLib headers and libraries for colorhug-client.
 
 %prep
 %setup -q
+%patch0 -p1 -b .ccmx-old-vid-pid
 
 %build
 %configure --disable-static
@@ -92,6 +94,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gir-1.0/ColorHug-1.0.gir
 
 %changelog
+* Wed May 23 2012 Richard Hughes <richard at hughsie.com> 0.1.9-2
+- Allow people using the legacy VID/PID to use colorhug-ccmx.
+
 * Tue May 22 2012 Richard Hughes <richard at hughsie.com> 0.1.9-1
 - Add commands to get and set the remote profile hash on the device
 - Add support for the new self-test command