rhughes pushed to argyllcms (master). "Update to 1.7.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue May 5 08:41:39 UTC 2015
>From 311e656679f61cb7945f4eac6a56c864303d0ad0 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Fri, 1 May 2015 19:15:40 +0100
Subject: Update to 1.7.0
diff --git a/.gitignore b/.gitignore
index 92210c4..ae13648 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ hargyllcms-1.1.0-20100201.tar.gz
/hargyllcms-1.6.0.tar.xz
/hargyllcms-1.6.2.tar.xz
/hargyllcms-1.6.3.tar.xz
+/hargyllcms-1.7.0.tar.xz
diff --git a/0001-Add-support-for-the-ColorHug2-sensor.patch b/0001-Add-support-for-the-ColorHug2-sensor.patch
deleted file mode 100644
index 0490d5e..0000000
--- a/0001-Add-support-for-the-ColorHug2-sensor.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From 0680d52f503248658e334b7bc73cde1c92619ed1 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard at hughsie.com>
-Date: Sun, 19 Oct 2014 22:57:29 +0100
-Subject: [PATCH] Add support for the ColorHug2 sensor
-
----
- spectro/colorhug.c | 52 ++++++++++++++++++++++++++++++++++++++++++----------
- spectro/colorhug.h | 5 +++--
- spectro/inst.c | 3 ++-
- spectro/insttypes.c | 13 +++++++++++++
- spectro/insttypes.h | 1 +
- 10 files changed, 71 insertions(+), 13 deletions(-)
-
-diff --git a/spectro/colorhug.c b/spectro/colorhug.c
-index 0152000..528f62e 100644
---- a/spectro/colorhug.c
-+++ b/spectro/colorhug.c
-@@ -6,10 +6,10 @@
- * Hughski ColorHug related functions
- *
- * Author: Richard Hughes
-- * Date: 30/11/2011
-+ * Date: 30/11/2011 - 19/10/2014
- *
- * Copyright 2006 - 2014, Graeme W. Gill
-- * Copyright 2011, Richard Hughes
-+ * Copyright 2011 - 2014, Richard Hughes
- * All rights reserved.
- *
- * (Based on huey.c)
-@@ -53,6 +53,7 @@ typedef enum {
- ch_set_mult = 0x04, /* Set multiplier value */
- ch_set_integral = 0x06, /* Set integral time */
- ch_get_firmware_version = 0x07, /* Get the Firmware version number */
-+ ch_get_hardware_version = 0x30, /* Get the hardware version number */
- ch_get_serial = 0x0b, /* Gets the serial number */
- ch_set_leds = 0x0e, /* Sets the LEDs */
- ch_take_reading = 0x22, /* Takes a raw reading minus dark offset */
-@@ -487,6 +488,26 @@ colorhug_get_firmwareversion (colorhug *p)
- return ev;
- }
-
-+/* Get the hardware version */
-+static inst_code
-+colorhug_get_hardwareversion (colorhug *p)
-+{
-+ inst_code ev;
-+ unsigned char obuf;
-+
-+ ev = colorhug_command(p, ch_get_firmware_version,
-+ NULL, 0,
-+ &obuf, 1,
-+ 2.0);
-+ if (ev != inst_ok)
-+ return ev;
-+
-+ p->hwrev = obuf;
-+ a1logd(p->log,2,"colorhug: Hardware version = %u\n", p->hwrev);
-+
-+ return ev;
-+}
-+
- /* Get the serial number */
- static inst_code
- colorhug_get_serialnumber (colorhug *p)
-@@ -577,6 +598,11 @@ colorhug_init_inst(inst *pp)
- if (ev != inst_ok)
- return ev;
-
-+ /* Get the hardware version */
-+ ev = colorhug_get_hardwareversion(p);
-+ if (ev != inst_ok)
-+ return ev;
-+
- /* Get the serial number */
- ev = colorhug_get_serialnumber(p);
- if (ev != inst_ok)
-@@ -588,16 +614,21 @@ colorhug_init_inst(inst *pp)
- return ev;
-
- /* Turn the sensor on */
-- ev = colorhug_set_multiplier(p, 0x03);
-- if (ev != inst_ok)
-- return ev;
-+ if (p->itype == instColorHug) {
-+ ev = colorhug_set_multiplier(p, 0x03);
-+ if (ev != inst_ok)
-+ return ev;
-+ }
-
- /* Set the integral time to maximum precision */
-- ev = colorhug_set_integral(p, 0xffff);
-- if (ev != inst_ok)
-- return ev;
-+ if (p->itype == instColorHug) {
-+ ev = colorhug_set_integral(p, 0xffff);
-+ if (ev != inst_ok)
-+ return ev;
-+ }
-
-- if (p->maj <= 1 && p->min <= 1 && p->uro <= 4) {
-+ if (p->itype == instColorHug &&
-+ p->maj <= 1 && p->min <= 1 && p->uro <= 4) {
-
- /* Get the post scale factor */
- ev = colorhug_get_postscale(p, &p->postscale);
-@@ -621,8 +652,9 @@ colorhug_init_inst(inst *pp)
- a1logd(p->log, 2, "colorhug_init: inited coms OK\n");
-
- a1logv(p->log,1,"Serial Number: %06u\n"
-+ "Hardware Version: %u\n"
- "Firmware Version: %d.%d.%d\n"
-- ,p->ser_no,p->maj,p->min,p->uro);
-+ ,p->ser_no,p->hwrev,p->maj,p->min,p->uro);
-
- /* Flash the LEDs */
- ev = colorhug_set_LEDs(p, 0x1);
-diff --git a/spectro/colorhug.h b/spectro/colorhug.h
-index a591608..46460a3 100644
---- a/spectro/colorhug.h
-+++ b/spectro/colorhug.h
-@@ -6,10 +6,10 @@
- * Hughski ColorHug related defines
- *
- * Author: Richard Hughes
-- * Date: 30/11/2011
-+ * Date: 30/11/2011 - 19/10/2014
- *
- * Copyright 2006 - 2013, Graeme W. Gill
-- * Copyright 2011, Richard Hughes
-+ * Copyright 2011 - 2014, Richard Hughes
- * All rights reserved.
- *
- * (Based on huey.h)
-@@ -68,6 +68,7 @@ struct _colorhug {
- inst_opt_type trig; /* Reading trigger mode */
-
- int maj, min, uro; /* Version number */
-+ int hwrev; /* Hardware revision */
- int ser_no; /* Serial number */
-
- inst_disptypesel *dtlist; /* Display Type list */
-diff --git a/spectro/inst.c b/spectro/inst.c
-index a910750..7c216f2 100644
---- a/spectro/inst.c
-+++ b/spectro/inst.c
-@@ -600,7 +600,8 @@ void *cntx /* Context for callback */
- p = (inst *)new_huey(icom, itype);
- else if (itype == instSmile)
- p = (inst *)new_i1disp(icom, itype);
-- else if (itype == instColorHug)
-+ else if (itype == instColorHug ||
-+ itype == instColorHug2)
- p = (inst *)new_colorhug(icom, itype);
- #endif /* ENABLE_USB */
-
-diff --git a/spectro/insttypes.c b/spectro/insttypes.c
-index d70bc71..235ae5e 100644
---- a/spectro/insttypes.c
-+++ b/spectro/insttypes.c
-@@ -92,6 +92,8 @@ char *inst_sname(instType itype) {
- return "specbos";
- case instColorHug:
- return "ColorHug";
-+ case instColorHug2:
-+ return "ColorHug2";
- default:
- break;
- }
-@@ -153,6 +155,8 @@ char *inst_name(instType itype) {
- return "JETI specbos";
- case instColorHug:
- return "Hughski ColorHug";
-+ case instColorHug2:
-+ return "Hughski ColorHug2";
- default:
- break;
- }
-@@ -219,6 +223,8 @@ instType inst_enum(char *name) {
- return instSpecbos;
- else if (strcmp(name, "Hughski ColorHug") == 0)
- return instColorHug;
-+ else if (strcmp(name, "Hughski ColorHug2") == 0)
-+ return instColorHug2;
-
-
- return instUnknown;
-@@ -297,6 +303,12 @@ int nep) { /* Number of end points */
- || (idVendor == 0x273f && idProduct == 0x1001)) { /* Hughski & ColorHug Fmw. >= 0.1.20 */
- return instColorHug;
- }
-+
-+ if (idVendor == 0x273f && idProduct == 0x1004) {
-+ /* Hughski ColorHug */
-+ return instColorHug2;
-+ }
-+
- /* Add other instruments here */
-
-
-@@ -391,6 +403,7 @@ int inst_illuminant(xspect *sp, instType itype) {
- return 1; /* Not applicable */
-
- case instColorHug:
-+ case instColorHug2:
- return 1; /* Not applicable */
-
-
-diff --git a/spectro/insttypes.h b/spectro/insttypes.h
-index ff86cc5..6b0c787 100644
---- a/spectro/insttypes.h
-+++ b/spectro/insttypes.h
-@@ -52,6 +52,7 @@ typedef enum {
- instSpecbos1201, /* JETI specbos 1201 */
- instSpecbos, /* JETI specbos XXXX */
- instColorHug, /* Hughski ColorHug */
-+ instColorHug2, /* Hughski ColorHug2 */
-
-
- instFakeDisp = 9998, /* Fake display & instrument device id */
diff --git a/argyllcms.spec b/argyllcms.spec
index ac1be5d..a49dd16 100644
--- a/argyllcms.spec
+++ b/argyllcms.spec
@@ -1,20 +1,18 @@
Name: argyllcms
-Version: 1.6.3
-Release: 4%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
Summary: ICC compatible color management system
Group: User Interface/X
License: GPLv3 and MIT
URL: http://gitorious.org/hargyllcms
Source0: http://people.freedesktop.org/~hughsient/releases/hargyllcms-%{version}.tar.xz
-# already sent upstream; pending a new release
-Patch0: 0001-Add-support-for-the-ColorHug2-sensor.patch
-
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: libtiff-devel
BuildRequires: libjpeg-turbo-devel
+BuildRequires: libpng-devel
BuildRequires: libusb1-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
@@ -54,7 +52,6 @@ This package contains the Argyll color management system documentation.
%prep
%setup -q -n hargyllcms-%{version}
-%patch0 -p1 -b .colorhug2
# we're not allowed to refer to acquisition devices as scanners
./legal.sh
autoreconf --force --install
@@ -67,8 +64,8 @@ make
make install DESTDIR=%{buildroot}
# We don't want other programs to use these
-rm -f $RPM_BUILD_ROOT%{_libdir}/libargyll*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libargyll*.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.so
# rely on colord to provide ENV{COLOR_MEASUREMENT_DEVICE}="1"
rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/55-Argyll.rules
@@ -80,7 +77,7 @@ rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/55-Argyll.rules
%attr(0755,root,root) %{_bindir}/*
%{_datadir}/color/argyll
%{_datadir}/color/argyll/ref
-%{_libdir}/libargyll*.so.*
+%{_libdir}/lib*.so.*
%exclude %{_datadir}/doc
@@ -93,6 +90,23 @@ rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/55-Argyll.rules
%doc doc/*.html doc/*.jpg doc/*.txt
%changelog
+* Fri May 01 2015 Richard Hughes <rhughes at redhat.com> - 1.7.0-1
+- Update to 1.7.0
+- Add better cross compatibility with non-Argyll ICC profiles
+- Added a dispread & fakeread -Z option to set the number of bits to quantize
+- Added a -P prune option to profcheck
+- Added dispcal and collink -b black point hack
+- Added histogram plot option -h to both profcheck and verify.
+- Added IRIDAS .cube 3DLut format support to collink
+- Added preset list of display techologies to select from in ccxxmake.
+- Add support for DataColor Spyder 5.
+- Add support for Klein K10-A colorimeter.
+- Add X3D and X3DOM support as an alternative to VRML
+- Fix various instrument communications problems for DTP20, DTP92 & DTP94
+- Fix very major bug in illumread
+- Ignore any patches that have zero values for creating Display profiles
+- Improved gamut mapping to reduce unnecessary changes to less saturated colors
+
* Fri Oct 24 2014 Richard Hughes <rhughes at redhat.com> - 1.6.3-4
- Add experimental ColorHug2 driver, which has already been sent upstream.
diff --git a/sources b/sources
index 3750148..3db01ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5952a715a61f0a0796122d78f202ccb hargyllcms-1.6.3.tar.xz
+61de9f1604c3116acbedfb756f161c64 hargyllcms-1.7.0.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/argyllcms.git/commit/?h=master&id=311e656679f61cb7945f4eac6a56c864303d0ad0
More information about the scm-commits
mailing list