[colord/f17] Backport a patch to accept a full HID buffer which is used on

[Richard Hughes]

commit e2a3c5c4a9300e9decad0ca231cbe874618e5022
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Sep 3 17:30:36 2012 +0100

    Backport a patch to accept a full HID buffer which is used on
    
      unreleased versions of the firmware.

 ...d-support-for-firmware-1.2.0-by-accepting.patch |   43 ++++++++++++++++++++
 colord.spec                                        |   10 ++++-
 2 files changed, 52 insertions(+), 1 deletions(-)
---
diff --git a/0001-colorhug-Add-support-for-firmware-1.2.0-by-accepting.patch b/0001-colorhug-Add-support-for-firmware-1.2.0-by-accepting.patch
new file mode 100644
index 0000000..755ee7a
--- /dev/null
+++ b/0001-colorhug-Add-support-for-firmware-1.2.0-by-accepting.patch
@@ -0,0 +1,43 @@
+From c68e7a7b44aef8ecb4a8db798ae3e1cb6cc0557d Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 3 Sep 2012 17:22:05 +0100
+Subject: [PATCH] colorhug: Add support for firmware >= 1.2.0 by accepting a
+ full HID buffer
+
+This is needed for OS-X and Windows compatibility.
+---
+ src/sensors/cd-sensor-colorhug-private.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/sensors/cd-sensor-colorhug-private.c b/src/sensors/cd-sensor-colorhug-private.c
+index 0a65c85..5a5edb5 100644
+--- a/src/sensors/cd-sensor-colorhug-private.c
++++ b/src/sensors/cd-sensor-colorhug-private.c
+@@ -324,19 +324,20 @@ ch_device_reply_cb (GObject *source_object,
+ 	/* parse */
+ 	if (helper->buffer[CH_BUFFER_OUTPUT_RETVAL] != CH_ERROR_NONE ||
+ 	    helper->buffer[CH_BUFFER_OUTPUT_CMD] != helper->cmd ||
+-	    actual_len != helper->buffer_out_len + CH_BUFFER_OUTPUT_DATA) {
++	    (actual_len != helper->buffer_out_len + CH_BUFFER_OUTPUT_DATA &&
++	     actual_len != CH_USB_HID_EP_SIZE)) {
+ 		error_enum = helper->buffer[CH_BUFFER_OUTPUT_RETVAL];
+ 		msg = g_strdup_printf ("Invalid read: retval=0x%02x [%s] "
+ 				       "cmd=0x%02x (expected 0x%x [%s]) "
+-				       "len=%"G_GSIZE_FORMAT" "
+-				       "(expected %"G_GSIZE_FORMAT")",
++				       "len=%" G_GSIZE_FORMAT " (expected %" G_GSIZE_FORMAT " or %i)",
+ 				       error_enum,
+ 				       ch_strerror (error_enum),
+ 				       helper->buffer[CH_BUFFER_OUTPUT_CMD],
+ 				       helper->cmd,
+ 				       ch_command_to_string (helper->cmd),
+ 				       actual_len,
+-				       helper->buffer_out_len + CH_BUFFER_OUTPUT_DATA);
++				       helper->buffer_out_len + CH_BUFFER_OUTPUT_DATA,
++				       CH_USB_HID_EP_SIZE);
+ 		g_simple_async_result_set_error (helper->res, 1, 0, "%s", msg);
+ 		g_simple_async_result_complete_in_idle (helper->res);
+ 		ch_device_free_helper (helper);
+-- 
+1.7.11.4
+
diff --git a/colord.spec b/colord.spec
index 56ed7af..231278d 100644
--- a/colord.spec
+++ b/colord.spec
@@ -1,11 +1,14 @@
 Summary:   Color daemon
 Name:      colord
 Version:   0.1.23
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/colord/
 Source0:   http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
 
+# Already upstream
+Patch0:    0001-colorhug-Add-support-for-firmware-1.2.0-by-accepting.patch
+
 BuildRequires: dbus-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
@@ -55,6 +58,7 @@ when running GTK applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .new-fw
 
 %build
 %configure \
@@ -136,6 +140,10 @@ exit 0
 %{_datadir}/gtk-doc/html/colord/*
 
 %changelog
+* Mon Sep 03 2012 Richard Hughes <richard at hughsie.com> 0.1.23-2
+- Backport a patch to accept a full HID buffer which is used on
+  unreleased versions of the firmware.
+
 * Wed Aug 29 2012 Richard Hughes <richard at hughsie.com> 0.1.23-1
 - New upstream version
 - Assorted documentation fixes