From cf34cad9819dfba473d99cc696f5aa56b86647d19421e207c0406a13836895ff Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Wed, 21 Aug 2013 22:46:14 +0000 Subject: [PATCH] Accepting request 195745 from home:sbrabec:branches:multimedia:color_management - Release 1.6.0: + Added support for JETI specbos 1211 and 1201. + Added Video profiling & 3dLut creation support for eeColor and MadVR. + Linux profile installation will use colord. + Fix ColorHug driver. + Changed instlib API ambient XYZ and spectral units to Lux. + For those instruments that support it, made ambient readings honor refresh mode measurements. + Changed spotread -ew mode to be Bradford chromatic transform rather than XYZ scaling. + Added support to xicclu to lookup colors though CAL files. + Added -Y R:rate option to spotread, dispcal, dispread & ccxxmake. + By default printtarg will create PS and EPS files with a CUPS job ticket to disable color management. + Added display update delay calibration support to i1pro and ColorMunki. + Changed dispcal & dispread so that they wait up to 0.5 seconds when reading dark patches after light ones to allow for display fall time. + Changed dispwin daemon loader mode option from -E to -X. + Changed dispcal verify option from -E to -z. + Added -E option to to dispread to encode test patch colors in Video 16-235 range. + Changed CIECAM02 Flare model to distinguish between Flare from the image itself, and Glare from ambient light. + Improved i1pro hi-res mode to improve accuracy. + Added Body Centered Cubic grid option to targen. + Added -Yn flag to dispcal and dispread. + Improve robustness of i1d3 display update measurement code. + Added support for applying calibration curves in collink. + Changed spotread so that it won't fall back to emissive spot mode if an ambient reading is requested. + Turned off B2A table clip map smoothing. + Fixed crash in ucmm/ucmm.c when loading certain profiles using dispwin. + Fixed gamut mapping intent "rl" to really use relative L*a*b* + Fix bug in cicam02 in V1.5.0 that causes some mapping problems in the red for collink -ir or -ila. + Changed cctiff so that it does lossless JPEG copy when there is no color transformation + Fix xicclu so that it works with device links. + Fixed bug in shaper/matrix profile curves that caused random bumpy black behaviour. + Don't add colorant tag to .tiff files in cctiff unless it is a non-standard space, as Photoshop will barf on such files. + Fix bug with Spyder not being able to break out of dispcal adjustment loop. + Fix bug in xicc/xicclu, -K flag not being recognised. + Fix bug in xicc/xmatrix.c introduced that prevents matrix only profiles from being created. + libusb 1.0 is now deprecated in favor of native USB drivers. OBS-URL: https://build.opensuse.org/request/show/195745 OBS-URL: https://build.opensuse.org/package/show/multimedia:color_management/argyllcms?expand=0&rev=20 --- Argyll_V1.5.1_src.zip | 3 -- Argyll_V1.6.0_src.zip | 3 ++ argyllcms-decl.patch | 25 +++++++++++++++ argyllcms-stringcompare.patch | 13 ++++++++ argyllcms-udev-builtin.patch | 13 ++++---- argyllcms-udev-hwdb.patch | 13 ++++---- argyllcms-udev151.patch | 11 +++---- argyllcms-void.patch | 13 ++++++++ argyllcms.changes | 57 +++++++++++++++++++++++++++++++++++ argyllcms.spec | 17 +++++++++-- 10 files changed, 143 insertions(+), 25 deletions(-) delete mode 100644 Argyll_V1.5.1_src.zip create mode 100644 Argyll_V1.6.0_src.zip create mode 100644 argyllcms-decl.patch create mode 100644 argyllcms-stringcompare.patch create mode 100644 argyllcms-void.patch diff --git a/Argyll_V1.5.1_src.zip b/Argyll_V1.5.1_src.zip deleted file mode 100644 index c45c43c..0000000 --- a/Argyll_V1.5.1_src.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c65055e577da5a3344b3949e52c3e66fe6339b8801bf4e0cda687e78f7808a7 -size 9693168 diff --git a/Argyll_V1.6.0_src.zip b/Argyll_V1.6.0_src.zip new file mode 100644 index 0000000..fbd2d98 --- /dev/null +++ b/Argyll_V1.6.0_src.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c15f32759003b639bd072afed9bb666f83eed052e968f06e3a7858291fe40015 +size 10240560 diff --git a/argyllcms-decl.patch b/argyllcms-decl.patch new file mode 100644 index 0000000..89565b3 --- /dev/null +++ b/argyllcms-decl.patch @@ -0,0 +1,25 @@ +gettimeofday() is declared in sys/time.h. +Index: Argyll_V1.6.0/spectro/conv.c +=================================================================== +--- Argyll_V1.6.0.orig/spectro/conv.c ++++ Argyll_V1.6.0/spectro/conv.c +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + #include + #include +Index: Argyll_V1.6.0/spectro/usbio_lx.c +=================================================================== +--- Argyll_V1.6.0.orig/spectro/usbio_lx.c ++++ Argyll_V1.6.0/spectro/usbio_lx.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/argyllcms-stringcompare.patch b/argyllcms-stringcompare.patch new file mode 100644 index 0000000..cdc031c --- /dev/null +++ b/argyllcms-stringcompare.patch @@ -0,0 +1,13 @@ +Index: Argyll_V1.6.0/spectro/dtp51.c +=================================================================== +--- Argyll_V1.6.0.orig/spectro/dtp51.c ++++ Argyll_V1.6.0/spectro/dtp51.c +@@ -123,7 +123,7 @@ dtp51_fcommand( + return icoms2dtp51_err(se); + } + rv = DTP51_OK; +- if (tc == ">" && ntc == 1) { ++ if (tc[0] == '>' && ntc == 1) { + rv = extract_ec(out); + if (rv > 0) { + rv &= inst_imask; diff --git a/argyllcms-udev-builtin.patch b/argyllcms-udev-builtin.patch index b38f43b..fdfe8db 100644 --- a/argyllcms-udev-builtin.patch +++ b/argyllcms-udev-builtin.patch @@ -1,13 +1,12 @@ -Index: Argyll_V1.5.1/usb/55-Argyll.rules +Index: Argyll_V1.6.0/usb/55-Argyll.rules =================================================================== ---- Argyll_V1.5.1.orig/usb/55-Argyll.rules -+++ Argyll_V1.5.1/usb/55-Argyll.rules -@@ -77,7 +77,7 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct - ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", ENV{COLOR_MEASUREMENT_DEVICE}="1" +--- Argyll_V1.6.0.orig/usb/55-Argyll.rules ++++ Argyll_V1.6.0/usb/55-Argyll.rules +@@ -78,6 +78,6 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct # Set ID_VENDOR and ID_MODEL acording to VID and PID --IMPORT{program}="usb-db %p" -+IMPORT{builtin}="usb-db" +-TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p" ++TEST=="/lib/udev/usb-db", IMPORT{builtin}="usb-db" LABEL="argyll_rules_end" diff --git a/argyllcms-udev-hwdb.patch b/argyllcms-udev-hwdb.patch index e6cbcfc..0138b06 100644 --- a/argyllcms-udev-hwdb.patch +++ b/argyllcms-udev-hwdb.patch @@ -1,13 +1,12 @@ -Index: Argyll_V1.5.1/usb/55-Argyll.rules +Index: Argyll_V1.6.0/usb/55-Argyll.rules =================================================================== ---- Argyll_V1.5.1.orig/usb/55-Argyll.rules -+++ Argyll_V1.5.1/usb/55-Argyll.rules -@@ -77,7 +77,7 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct - ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", ENV{COLOR_MEASUREMENT_DEVICE}="1" +--- Argyll_V1.6.0.orig/usb/55-Argyll.rules ++++ Argyll_V1.6.0/usb/55-Argyll.rules +@@ -78,6 +78,6 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct # Set ID_VENDOR and ID_MODEL acording to VID and PID --IMPORT{program}="usb-db %p" -+IMPORT{builtin}="hwdb --subsystem=usb" +-TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p" ++TEST=="/lib/udev/usb-db", IMPORT{builtin}="hwdb --subsystem=usb" LABEL="argyll_rules_end" diff --git a/argyllcms-udev151.patch b/argyllcms-udev151.patch index cad7b4b..7a8bd5f 100644 --- a/argyllcms-udev151.patch +++ b/argyllcms-udev151.patch @@ -1,8 +1,8 @@ -Index: Argyll_V1.5.1/usb/55-Argyll.rules +Index: Argyll_V1.6.0/usb/55-Argyll.rules =================================================================== ---- Argyll_V1.5.1.orig/usb/55-Argyll.rules -+++ Argyll_V1.5.1/usb/55-Argyll.rules -@@ -77,14 +77,7 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct +--- Argyll_V1.6.0.orig/usb/55-Argyll.rules ++++ Argyll_V1.6.0/usb/55-Argyll.rules +@@ -77,13 +77,6 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", ENV{COLOR_MEASUREMENT_DEVICE}="1" @@ -14,6 +14,5 @@ Index: Argyll_V1.5.1/usb/55-Argyll.rules -ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev" - # Set ID_VENDOR and ID_MODEL acording to VID and PID - IMPORT{program}="usb-db %p" + TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p" - LABEL="argyll_rules_end" diff --git a/argyllcms-void.patch b/argyllcms-void.patch new file mode 100644 index 0000000..218d27d --- /dev/null +++ b/argyllcms-void.patch @@ -0,0 +1,13 @@ +Index: Argyll_V1.6.0/xicc/xspect.c +=================================================================== +--- Argyll_V1.6.0.orig/xicc/xspect.c ++++ Argyll_V1.6.0/xicc/xspect.c +@@ -5719,7 +5719,7 @@ struct { + }; + + /* Compute 1nm sampling rse from raw table using linear interpolation */ +-static compute_rse(xspect *dst) { ++void static compute_rse(xspect *dst) { + int i; + + dst->spec_n = 221; diff --git a/argyllcms.changes b/argyllcms.changes index 90e25c0..500b1ca 100644 --- a/argyllcms.changes +++ b/argyllcms.changes @@ -1,3 +1,60 @@ +------------------------------------------------------------------- +Tue Aug 20 18:53:03 CEST 2013 - sbrabec@suse.cz + +- Release 1.6.0: + + Added support for JETI specbos 1211 and 1201. + + Added Video profiling & 3dLut creation support for eeColor and + MadVR. + + Linux profile installation will use colord. + + Fix ColorHug driver. + + Changed instlib API ambient XYZ and spectral units to Lux. + + For those instruments that support it, made ambient readings + honor refresh mode measurements. + + Changed spotread -ew mode to be Bradford chromatic transform + rather than XYZ scaling. + + Added support to xicclu to lookup colors though CAL files. + + Added -Y R:rate option to spotread, dispcal, dispread & + ccxxmake. + + By default printtarg will create PS and EPS files with a CUPS + job ticket to disable color management. + + Added display update delay calibration support to i1pro and + ColorMunki. + + Changed dispcal & dispread so that they wait up to 0.5 seconds + when reading dark patches after light ones to allow for display + fall time. + + Changed dispwin daemon loader mode option from -E to -X. + + Changed dispcal verify option from -E to -z. + + Added -E option to to dispread to encode test patch colors in + Video 16-235 range. + + Changed CIECAM02 Flare model to distinguish between Flare from + the image itself, and Glare from ambient light. + + Improved i1pro hi-res mode to improve accuracy. + + Added Body Centered Cubic grid option to targen. + + Added -Yn flag to dispcal and dispread. + + Improve robustness of i1d3 display update measurement code. + + Added support for applying calibration curves in collink. + + Changed spotread so that it won't fall back to emissive spot + mode if an ambient reading is requested. + + Turned off B2A table clip map smoothing. + + Fixed crash in ucmm/ucmm.c when loading certain profiles using + dispwin. + + Fixed gamut mapping intent "rl" to really use relative L*a*b* + + Fix bug in cicam02 in V1.5.0 that causes some mapping problems + in the red for collink -ir or -ila. + + Changed cctiff so that it does lossless JPEG copy when there is + no color transformation + + Fix xicclu so that it works with device links. + + Fixed bug in shaper/matrix profile curves that caused random + bumpy black behaviour. + + Don't add colorant tag to .tiff files in cctiff unless it is a + non-standard space, as Photoshop will barf on such files. + + Fix bug with Spyder not being able to break out of dispcal + adjustment loop. + + Fix bug in xicc/xicclu, -K flag not being recognised. + + Fix bug in xicc/xmatrix.c introduced that prevents matrix only + profiles from being created. + + libusb 1.0 is now deprecated in favor of native USB drivers. + ------------------------------------------------------------------- Wed Jul 31 17:13:06 UTC 2013 - fcrozat@suse.com diff --git a/argyllcms.spec b/argyllcms.spec index 2b69baf..61803e8 100644 --- a/argyllcms.spec +++ b/argyllcms.spec @@ -25,7 +25,7 @@ %define archivename Argyll_V%{version}%{?alphaversion}_src.zip Name: argyllcms -Version: 1.5.1 +Version: 1.6.0 Release: 0 Summary: ICC compatible color management system License: AGPL-3.0 and GPL-2.0+ and MIT @@ -45,6 +45,12 @@ Patch8: argyllcms-1.4.0-warnings.patch Patch9: argyllcms-udev-builtin.patch # PATCH-FIX-UPSTREAM argyllcms-udev-hwdb.patch fcrozat@suse.com -- usb-db is replaced by hwdb in recent udev Patch10: argyllcms-udev-hwdb.patch +# PATCH-FIX-UPSTREAM argyllcms-void.patch sbrabec@suse.cz -- Fix missing return type. +Patch11: argyllcms-void.patch +# PATCH-FIX-UPSTREAM argyllcms-decl.patch sbrabec@suse.cz -- Add missing headers. +Patch12: argyllcms-decl.patch +# PATCH-FIX-UPSTREAM argyllcms-stringcompare.patch sbrabec@suse.cz -- Fox comparison of pointer with string. +Patch13: argyllcms-stringcompare.patch BuildRequires: libjpeg-devel BuildRequires: libtiff-devel @@ -61,6 +67,10 @@ Requires: udev BuildRequires: hal Requires: hal %endif +# FIXME: The application dlopens libcolordcompat.so, which does not +# exists in openSUSE colord package. We should use Suggests +# or Recommends here, and change its name in the source code +# to not read file from colord-devel. %description The Argyll color management system supports accurate ICC profile creation for @@ -103,8 +113,11 @@ This package contains the Argyll color management system documentation. %endif %endif %patch8 -p1 -b .warnings +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 -tar xvf %{SOURCE3} +tar xf %{SOURCE3} cd ajam-2.5.2-1.3.3 %patch7 -p1 -b .include cd ..