diff --git a/Argyll_V1.6.3_src.zip b/Argyll_V1.6.3_src.zip deleted file mode 100644 index 7034881..0000000 --- a/Argyll_V1.6.3_src.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84 -size 10338488 diff --git a/Argyll_V1.8.3_src.zip b/Argyll_V1.8.3_src.zip new file mode 100644 index 0000000..1594e58 --- /dev/null +++ b/Argyll_V1.8.3_src.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60494176785f6c2e4e4daefb9452d83859880449040b2a843ed81de3bd0c558e +size 13933565 diff --git a/argyllcms-udev-builtin.patch b/argyllcms-udev-builtin.patch deleted file mode 100644 index fdfe8db..0000000 --- a/argyllcms-udev-builtin.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: Argyll_V1.6.0/usb/55-Argyll.rules -=================================================================== ---- 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 --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 deleted file mode 100644 index 0138b06..0000000 --- a/argyllcms-udev-hwdb.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: Argyll_V1.6.0/usb/55-Argyll.rules -=================================================================== ---- 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 --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 7a8bd5f..82b9376 100644 --- a/argyllcms-udev151.patch +++ b/argyllcms-udev151.patch @@ -2,17 +2,16 @@ Index: Argyll_V1.6.0/usb/55-Argyll.rules =================================================================== --- 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" - +@@ -113,11 +113,4 @@ + # Debian has + # ...., TAG+="uaccess", TAG+="udev-acl" # Debian, but should be in 70-uaccess.rules -# Let udev-acl manage these devices, if it's available -TEST=="/var/run/ConsoleKit/database", ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1" - --# Otherwise, restrict access to members of the plugdev group, --# which the user may have to add to the system. --ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev" +-# Otherwise, restrict access to members of the colord group, +-# which the user may have to add to the system and add themselves to. +-ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="colord" - - # Set ID_VENDOR and ID_MODEL acording to VID and PID - TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p" + LABEL="argyll_rules_end" diff --git a/argyllcms.changes b/argyllcms.changes index 9cdc062..dee240a 100644 --- a/argyllcms.changes +++ b/argyllcms.changes @@ -1,3 +1,136 @@ +------------------------------------------------------------------- +Wed Apr 13 09:40:00 UTC 2016 - lnussel@suse.de + +- BuildRequire systemd-rpm-macros which defines _udevrulesdir for us + +------------------------------------------------------------------- +Tue Nov 24 20:16:44 UTC 2015 - p.drouand@gmail.com + +- Update to version 1.8.3 + * Added SpyderCheckr24 scaning .cht and .cie files. + * Fixed USB problem with i1pro (Rev B & D ?), where communications + would occasionally break down on fast systems. + * Added another fixed display intergration time to i1pro non-adaptive + emission mode to cope with higher brightness displays. + * Added workaround for i1d3 Rev. B status code 0x83 on very low + light measurement + * Fixed minor bug in i1d3.c that truncated serial number string. + * Fixed bug in Klein K10 driver - adaptive measurement wasn't properly + using all the extra measurements. + * Improved Klein K10 driver to be more robust when lights off command + returns bogus error codes, or causes a cascade of bogus measurement + errors. + * Added workaround for OS X 10.9+ "App Nap" problem. + * Added maximum sensor frequency check for Spyder & i1d3 drivers, + so that erronious readings due to excessive brightness can't be missed. + * Changed chartread so that it doesn't warn of a possible wrong strip + being read, nor allows bi-directional strip reading, if "printtarg -r" + was used. A warning will be issued if "printtarg -r" was used, and + "chartread -B" wasn't used. + * Fixed collink for eeColor Full range RGB to use output curve + ("second" 1D curves) to compensate for cLUT being wired for 1.0 + output from 1.0 input. + * Added "lp" gamut mapping intent :- Luminance Preserving Perceptual, + for Photographers concerned with maintaining tonal variations. + * Fixed bugs in image specific gamut mapping that were degrading + the accuracy of the result. + * Re-wrote gamut smoothing code, and re-tuned it to behave similarly + to the V1.8.2 release. + * Changed default viewing condition glare to 5%, to smooth out shadow tone curve. + * Reduced the level of Helmholtz-Kohlrausch effect in CIECAM02 + implementation in the light of visual experiments. +- Changes from version 1.8.2 + * Fixed endless loop bug in alternate calibration selectors code. +- Changes from version 1.8.1 + * Fixed bug in "spec2cie -n" wrong field indexes were being used. + * Fixed colorimeter calibration selectors to add in alternate + selectors if the letters are free. +- Changes from version 1.8.0 + * Added support for the Image Engineering EX1 spectroradiometer. + * Added support for the SwatchMate Cube reflective colorimeter, + with improved accuracy. + * Added Added Television Lighting Consistency Index (EBU TLCI-2012 Qa) + to spotread and specplot output. + * Added R9 value to CRI value in spotread and specplot output. + * Added workaround for JETI specbos having been calibrated by + a 3rd party, and its calibrated range being out of sync with + its claimed range. + * Added support for "EMISINPUT" type .ti3 file. + * Build using OpenSSL rather than axTLS if it is built on Linux. + * Fixed stack space problem in OS X UI programs by expanding main + thread proxy to have 8MB instead of the default 512K. + * Updated built in libtiff to V4.0.4beta. + * Changed CGATS format to not emit unknown keyword declaration ("KEYWORD") + by default. + * Added inst_calc_cond_mask to inst.h to allow for flags in calibration + conditions. A consequence of this is that calc needs to be masked with + this when comparing against a specific condition, and the inst_calc_optional_flag + should be cleared if it is set, before callint inst->calibrate() if the + user wants to proceed with a particular calibration. + * Fixed bug with dispcal -e N + * Fixed bug in xicclu -fg and -kp + * Added dispcal -x x option to allow reading a chart and manually entering + the XYZ values. + * Fix spyder4 & 5 bug where some display types were set as refresh + when they shouldn't be. + * Fix collink "Warning :- RGB black hack trigger more than once!" + when -b is used with input video encoding (-e). + * Changed colprof so that the default ICC description is the base + filename rather than the whole file path. + * Fix technology type and display type selector "uniqueification" + bug that shows up in "ccxxmake -??". + * Add OEM field to ccmx and ccss files to mark files that have + been installed from OEM disk, so that custom ccmx & ccss files + can be given suggested selector letter priority (+ ref/CRT.ccss). + * Tweak CGATS write format to avoid scientific notation until the + numbers are bigger and smaller (i.e until e6 and e-6 are needed). +- Changes from version 1.7.0 + * Improved gamut mapping to reduce unnecessary changes to less + saturated colors such as skin tones. + * Add support for DataColor Spyder 5. + * Add support for ColorHug2 colorimeter. + * Add support for Klein K10-A colorimeter. + * Added Google ChromeCast as a test patch generator for Video displays. + * Added ls2ti3 tool to convert LightSpace .bcs files to .ti3. + * Added IRIDAS .cube 3DLut format support to collink. + * Add X3D and X3DOM support as an alternative to VRML, and make X3DOM + the default. + * Add better cross compatibility with non-Argyll ICC profiles using + ArgyllCMS 'arts' tag to mark 'wtpt' Absolute Colorimetric chromaticity + transform, as well as implement proper absolute colorimetric intent + for Display profiles use the 'chad' tag. Note that the standard + ICC profiles provided by ArgyllCMS in the ref directory (such as sRGB etc.) + now include an 'arts' tag. + * Ignore any patches that have zero values for creating Display profiles, + unless they are for device zero. + * Fix various instrument communications problems for JETI specbos, + DTP20, DTP92 & DTP94. + * Fix gestaltSystemVersion warning on OS X 10.10. + * Fix very major bug in illumread. It wasn't actually working at all + since V1.4.0. + * Added collink -I[gG][:p.p]:x.x options that allows an output offset + gamma curve be targetted instead of BT1886. + * Added dispcal and collink -b black point hack. This forces the input + zero to map to the output zero for well behaved displays, reducing + dependence on the instrument accuracy for a very dark black point. + * Added preset list of display techologies to select from in ccxxmake. + * Added a -P prune option to profcheck, that creates a .ti3 file pruned + of any patches that have a delta E fit error greater than a threshold. + This may be of use in eliminating bad reading values from a measurement set. + * Added histogram plot option -h to both profcheck and verify. + * Added a dispread & fakeread -Z option to set the number of bits to + quantize the test values to. + * Fixed bug in targen - the -V dark emphasis wasn't being applied to OFPS + generated points. + * Make sure that if an instrument display reading is interrupted by a + forced calibration, that the user is asked to place it back on the + display before resuming the measurements. +- Remove obsolete patches + * argyllcms-udev-builtin.patch + * argyllcms-udev-hwdb.patch +- Some specfile cleanups and improvements +- Update argyllcms-udev151.patch + ------------------------------------------------------------------- Tue Feb 24 15:00:24 UTC 2015 - rguenther@suse.com diff --git a/argyllcms.spec b/argyllcms.spec index ca0e42a..11bb14e 100644 --- a/argyllcms.spec +++ b/argyllcms.spec @@ -1,7 +1,7 @@ # # spec file for package argyllcms # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,18 @@ # -%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d - -%define archivename Argyll_V%{version}%{?alphaversion}_src.zip +%define tarname Argyll Name: argyllcms -Version: 1.6.3 +Version: 1.8.3 Release: 0 Summary: ICC compatible color management system License: AGPL-3.0 and GPL-2.0+ and MIT Group: System/X11/Utilities - -Url: http://www.%{name}.com/ - -Source0: %{url}%{archivename} +Url: http://www.argyllcms.com/ +# factory-auto doesn't like this +#Source0: http://www.argyllcms.com/%{tarname}_V%{version}_src.zip +Source0: %{tarname}_V%{version}_src.zip Source1: 19-color.fdi Source2: color-device-file.policy Source3: ajam-2.5.2-1.3.3.tgz @@ -38,10 +36,6 @@ Source99: argyllcms.changes Patch5: argyllcms-udev151.patch Patch7: ajam-include.patch Patch8: argyllcms-1.4.0-warnings.patch -# PATCH-FIX-UPSTREAM argyllcms-udev-builtin.patch fcrozat@suse.com -- usb-db is now builtin in udev -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-decl.patch sbrabec@suse.cz -- Add missing headers. Patch12: argyllcms-decl.patch @@ -52,14 +46,10 @@ BuildRequires: unzip BuildRequires: xorg-x11-devel #needed for ajam BuildRequires: bison -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(udev) Requires: udev -%if 0%{?suse_version} < 1120 -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 @@ -94,17 +84,8 @@ displays. This package contains the Argyll color management system documentation. %prep -%setup -q -n Argyll_V%{version} -%if 0%{?suse_version} >= 1120 +%setup -q -n %{tarname}_V%{version} %patch5 -p1 -b .udev151 -%if 0%{?suse_version} >= 1220 -%if 0%{?suse_version} >= 1310 -%patch10 -p1 -b .hwdb -%else -%patch9 -p1 -b .builtin -%endif -%endif -%endif %patch8 -p1 -b .warnings %patch12 -p1 @@ -146,23 +127,11 @@ TIMESTAMP=$(LC_ALL=C date -r %{SOURCE99} +%c) sed -i -e 's/^CREATED .*/CREATED "$TIMESTAMP"/g' %{buildroot}%{_datadir}/color/argyll/ref/RefMediumGamut.gam -%if 0%{?suse_version} < 1120 -# Do some device permission magic -install -d -m 0755 %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/ -install -p -m 0644 %{SOURCE1} \ - %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/ - -install -d -m 0755 %{buildroot}%{_datadir}/PolicyKit/policy/ -install -p -m 0644 %{SOURCE2} \ - %{buildroot}%{_datadir}/PolicyKit/policy/ -%else install -d -m 0755 %{buildroot}%{_udevrulesdir} install -p -m 0644 usb/55-Argyll.rules \ %{buildroot}%{_udevrulesdir} -%endif - -%clean -rm -rf %{buildroot} +chmod a-x *.txt +chmod a-x doc/* %files %defattr(-,root,root,-) @@ -171,13 +140,7 @@ rm -rf %{buildroot} %{_bindir}/* %dir %{_datadir}/color %{_datadir}/color/argyll - -%if 0%{?suse_version} < 1120 -%{_datadir}/hal/fdi/policy/10osvendor/19-color.fdi -%{_datadir}/PolicyKit/policy/color-device-file.policy -%else %{_udevrulesdir}/55-Argyll.rules -%endif %files doc %defattr(-,root,root,-)