| 1 |
tetromino 14/04/27 21:42:17 |
| 2 |
|
| 3 |
Added: colorhug-client-0.2.1-colord-1.2.patch |
| 4 |
Log: |
| 5 |
Version bump and fix bash completion paths (bug #497790, thanks to poncho). Fix build failure with colord-1.2. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/colorhug-client/files/colorhug-client-0.2.1-colord-1.2.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/colorhug-client/files/colorhug-client-0.2.1-colord-1.2.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/colorhug-client/files/colorhug-client-0.2.1-colord-1.2.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: colorhug-client-0.2.1-colord-1.2.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/src/ch-ccmx.c b/src/ch-ccmx.c |
| 18 |
index d674b16..e33e6d6 100644 |
| 19 |
--- a/src/ch-ccmx.c |
| 20 |
+++ b/src/ch-ccmx.c |
| 21 |
@@ -510,9 +510,15 @@ ch_ccmx_get_device_download_kind (ChCcmxPrivate *priv) |
| 22 |
case CH_DEVICE_MODE_FIRMWARE: |
| 23 |
str = "colorhug"; |
| 24 |
break; |
| 25 |
+#if CD_CHECK_VERSION(1,2,0) |
| 26 |
+ case CH_DEVICE_MODE_BOOTLOADER_PLUS: |
| 27 |
+ case CH_DEVICE_MODE_FIRMWARE_PLUS: |
| 28 |
+ str = "colorhug-plus"; |
| 29 |
+#else |
| 30 |
case CH_DEVICE_MODE_BOOTLOADER_SPECTRO: |
| 31 |
case CH_DEVICE_MODE_FIRMWARE_SPECTRO: |
| 32 |
str = "colorhug-spectro"; |
| 33 |
+#endif |
| 34 |
break; |
| 35 |
default: |
| 36 |
str = "unknown"; |
| 37 |
diff --git a/src/ch-flash.c b/src/ch-flash.c |
| 38 |
index 53ef123..82b2c03 100644 |
| 39 |
--- a/src/ch-flash.c |
| 40 |
+++ b/src/ch-flash.c |
| 41 |
@@ -721,9 +721,15 @@ ch_flash_get_device_download_kind (ChFlashPrivate *priv) |
| 42 |
case CH_DEVICE_MODE_FIRMWARE: |
| 43 |
str = "colorhug"; |
| 44 |
break; |
| 45 |
+#if CD_CHECK_VERSION(1,2,0) |
| 46 |
+ case CH_DEVICE_MODE_BOOTLOADER_PLUS: |
| 47 |
+ case CH_DEVICE_MODE_FIRMWARE_PLUS: |
| 48 |
+ str = "colorhug-plus"; |
| 49 |
+#else |
| 50 |
case CH_DEVICE_MODE_BOOTLOADER_SPECTRO: |
| 51 |
case CH_DEVICE_MODE_FIRMWARE_SPECTRO: |
| 52 |
str = "colorhug-spectro"; |
| 53 |
+#endif |
| 54 |
break; |
| 55 |
default: |
| 56 |
str = "unknown"; |
| 57 |
diff --git a/src/ch-spectro-util.c b/src/ch-spectro-util.c |
| 58 |
index 7f5c989..f03ed5c 100644 |
| 59 |
--- a/src/ch-spectro-util.c |
| 60 |
+++ b/src/ch-spectro-util.c |
| 61 |
@@ -476,7 +476,12 @@ ch_util_device_added_cb (GUsbDeviceList *list, |
| 62 |
g_debug ("Added: %i:%i", |
| 63 |
g_usb_device_get_vid (device), |
| 64 |
g_usb_device_get_pid (device)); |
| 65 |
+ |
| 66 |
+#if CD_CHECK_VERSION(1,2,0) |
| 67 |
+ if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_PLUS) { |
| 68 |
+#else |
| 69 |
if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_SPECTRO) { |
| 70 |
+#endif |
| 71 |
priv->device = g_object_ref (device); |
| 72 |
ch_util_got_device (priv); |
| 73 |
} |
Archives