Accepting request 754106 from home:RBrownSUSE:branches:multimedia:color_management

- Update to v2.1.1
  * Added SpyderX support
  * Changed spotread -E option to work with all the spectral instruments
  * Improvements and bug fixes to oeminst and oemdnld
  * Increased maximum render channels to 16
  * Added -O option to collink to allow creating a link purely from calibration file
  * Added -w parameter to spotread, to use the -i parameter illuminant for L*a*b* calculation
- Remove obsolete patch argyllcms-decl.patch

OBS-URL: https://build.opensuse.org/request/show/754106
OBS-URL: https://build.opensuse.org/package/show/multimedia:color_management/argyllcms?expand=0&rev=43

Argyll_V1.9.2_src.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d61ae0b91686dea721d34df2e44eaf36c88da87086fd50ccc4e999a58e9ce90
-size 13624924

Argyll_V2.1.1_src.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51269bcafc4d95679354b796685c3f0a41b44b78443cbe360cda4a2d72f32acb
+size 13825860

argyllcms-decl.patch

@@ -1,37 +0,0 @@
-diff -ruN Argyll_V1.9.2.orig/spectro/conv.c Argyll_V1.9.2/spectro/conv.c
---- Argyll_V1.9.2.orig/spectro/conv.c	2016-09-28 05:59:09.000000000 +0300
-+++ Argyll_V1.9.2/spectro/conv.c	2017-03-14 17:25:20.767520365 +0200
-@@ -19,7 +19,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
--#include <time.h>
-+#include <sys/time.h>
- 
- #ifdef NT
- # if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0501
-diff -ruN Argyll_V1.9.2.orig/spectro/usbio_lx.c Argyll_V1.9.2/spectro/usbio_lx.c
---- Argyll_V1.9.2.orig/spectro/usbio_lx.c	2016-10-12 06:05:27.000000000 +0300
-+++ Argyll_V1.9.2/spectro/usbio_lx.c	2017-03-14 17:24:58.667519820 +0200
-@@ -22,6 +22,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <sys/time.h>
- #include <linux/usbdevice_fs.h>
- 
- /* select() defined, but not poll(), so emulate poll() */
-diff -ruN Argyll_V1.9.2.orig/zlib/gzread.c Argyll_V1.9.2/zlib/gzread.c
---- Argyll_V1.9.2.orig/zlib/gzread.c	2016-09-28 05:59:28.000000000 +0300
-+++ Argyll_V1.9.2/zlib/gzread.c	2017-03-14 17:25:41.655520880 +0200
-@@ -3,6 +3,10 @@
-  * For conditions of distribution and use, see copyright notice in zlib.h
-  */
- 
-+#include "string.h"
-+#include "stdio.h"
-+#include "unistd.h"
-+#include "sys/socket.h"
- #include "gzguts.h"
- 
- /* Local functions */

argyllcms.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Dec  4 17:06:10 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- Update to v2.1.1
+  * Added SpyderX support
+  * Changed spotread -E option to work with all the spectral instruments
+  * Improvements and bug fixes to oeminst and oemdnld
+  * Increased maximum render channels to 16
+  * Added -O option to collink to allow creating a link purely from calibration file
+  * Added -w parameter to spotread, to use the -i parameter illuminant for L*a*b* calculation
+- Remove obsolete patch argyllcms-decl.patch 
+
 -------------------------------------------------------------------
 Wed Apr 24 09:16:27 UTC 2019 - Martin Liška <mliska@suse.cz>
 

argyllcms.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package argyllcms
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,24 +19,25 @@
 %define tarname Argyll
 
 Name:           argyllcms
-Version:        1.9.2
+Version:        2.1.1
 Release:        0
 Summary:        ICC compatible color management system
 License:        AGPL-3.0-only AND GPL-2.0-or-later AND MIT
 Group:          System/X11/Utilities
-Url:            http://www.argyllcms.com/
+URL:            http://www.argyllcms.com/
 Source0:        http://www.argyllcms.com/%{tarname}_V%{version}_src.zip
 Source1:        19-color.fdi
 Source2:        color-device-file.policy
 Source3:        ajam-2.5.2-1.3.3.tgz
 Source4:        %{name}.changes
 Patch1:         ajam-include.patch
-Patch2:         argyllcms-decl.patch
 
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libtool
 BuildRequires:  unzip
+BuildRequires:  pkgconfig(libpng12)
+BuildRequires:  pkgconfig(mxml)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xdmcp)
 BuildRequires:  pkgconfig(xext)
@@ -86,7 +87,6 @@ This package contains the Argyll color management system documentation.
 
 %prep
 %setup -q -n %{tarname}_V%{version} -a3
-%patch2 -p1
 cd ajam-2.5.2-1.3.3
 %patch1 -p1 -b .include
 cd ..