diff --git a/Argyll_V2.1.2_src.zip b/Argyll_V2.1.2_src.zip deleted file mode 100644 index a62b07c..0000000 --- a/Argyll_V2.1.2_src.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be378ca836b17b8684db05e9feaab138d711835ef00a04a76ac0ceacd386a3e3 -size 13837056 diff --git a/Argyll_V2.2.0_src.zip b/Argyll_V2.2.0_src.zip new file mode 100644 index 0000000..bf3d431 --- /dev/null +++ b/Argyll_V2.2.0_src.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c612a2e49fd51e089616cd27b6d4717d0f20fc8edbd906462f0d0dbbabbc711c +size 14020205 diff --git a/argyllcms--gcc--fno-common.patch b/argyllcms--gcc--fno-common.patch deleted file mode 100644 index d4241f4..0000000 --- a/argyllcms--gcc--fno-common.patch +++ /dev/null @@ -1,133 +0,0 @@ -argyllcms: Fix compilation with GCC 10 - -A common mistake in C is omitting extern when declaring a global variable -in a header file. If the header is included by several files it results -in multiple definitions of the same variable. In previous GCC versions -this error is ignored. GCC 10 defaults to -fno-common, which means a -linker error will now be reported. To fix this, use extern in header -files when declaring global variables, and ensure each global is defined -in exactly one C file. As a workaround, legacy C code can be compiled -with -fcommon. - - int x; // tentative definition - avoid in header files - extern int y; // correct declaration in a header file - -References: -https://bugzilla.opensuse.org/show_bug.cgi?id=1160244 -https://bugzilla.opensuse.org/show_bug.cgi?id=1160256 - -In case of vinflate.c and inflate.c, both files define local variables -with the same name as global. It is no more possible with GCC 10. To -prevent sharing variables across files, add "static" to all local -variables. - -Index: Argyll_V2.1.2/gamut/gamut.h -=================================================================== ---- Argyll_V2.1.2.orig/gamut/gamut.h -+++ Argyll_V2.1.2/gamut/gamut.h -@@ -36,7 +36,7 @@ - #define MAXGAMN 10 /* Maximum gamut point neighbors returned */ - #define NSLOTS 6 /* Number of maximum direction slots */ - --struct _vrml *wrl; /* Declared in vrml.h, which may be #included after this */ -+struct _vrml; /* Declared in vrml.h, which may be #included after this */ - - /* ------------------------------------ */ - #define NODE_STRUCT \ -Index: Argyll_V2.1.2/spectro/vinflate.c -=================================================================== ---- Argyll_V2.1.2.orig/spectro/vinflate.c -+++ Argyll_V2.1.2/spectro/vinflate.c -@@ -92,7 +92,7 @@ int vinflate(void); - */ - - #define WSIZE 0x8000 --unsigned int wp; /* current position in slide */ -+static unsigned int wp; /* current position in slide */ - uch slide[32768]; - - static int vflush_output(unsigned int w) { -@@ -160,8 +160,8 @@ static ush cpdext[] = { /* Extra - the stream. - */ - --ulg bb; /* bit buffer */ --unsigned bk; /* bits in bit buffer */ -+static ulg bb; /* bit buffer */ -+static unsigned bk; /* bits in bit buffer */ - - ush vmask_bits[] = { - 0x0000, -@@ -230,8 +230,8 @@ ush vmask_bits[] = { - */ - - --int vlbits = 9; /* bits in base literal/length lookup table */ --int vdbits = 6; /* bits in base distance lookup table */ -+static int vlbits = 9; /* bits in base literal/length lookup table */ -+static int vdbits = 6; /* bits in base distance lookup table */ - - - /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ -@@ -239,7 +239,7 @@ int vdbits = 6; /* bits in base - #define N_MAX 288 /* maximum number of codes in any set */ - - --unsigned hufts; /* track memory usage */ -+static unsigned hufts; /* track memory usage */ - - /* Given a list of code lengths and a maximum table size, make a set of - tables to decode that set of codes. Return zero on success, one if -Index: Argyll_V2.1.2/spectro/inflate.c -=================================================================== ---- Argyll_V2.1.2.orig/spectro/inflate.c -+++ Argyll_V2.1.2/spectro/inflate.c -@@ -49,7 +49,7 @@ typedef unsigned int ulg; - the next table, which codes e - 16 bits, and lastly e == 99 indicates - an unused code. If a code with e == 99 is looked up, this implies an - error in the data. */ --struct huft { -+static struct huft { - uch e; /* number of extra bits or operation */ - uch b; /* number of bits in this code or subcode */ - union { -@@ -87,7 +87,7 @@ int inflate(void); - /* unsigned wp; current position in slide */ - - #define WSIZE 0x8000 --unsigned int wp; /* current position in slide */ -+static unsigned int wp; /* current position in slide */ - uch slide[32768]; - - static int flush_output(unsigned int w) { -@@ -155,8 +155,8 @@ static ush cpdext[] = { /* Extra - the stream. - */ - --ulg bb; /* bit buffer */ --unsigned bk; /* bits in bit buffer */ -+static ulg bb; /* bit buffer */ -+static unsigned bk; /* bits in bit buffer */ - - ush mask_bits[] = { - 0x0000, -@@ -201,8 +201,8 @@ ush mask_bits[] = { - */ - - --int lbits = 9; /* bits in base literal/length lookup table */ --int dbits = 6; /* bits in base distance lookup table */ -+static int lbits = 9; /* bits in base literal/length lookup table */ -+static int dbits = 6; /* bits in base distance lookup table */ - - - /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ -@@ -210,7 +210,7 @@ int dbits = 6; /* bits in base - #define N_MAX 288 /* maximum number of codes in any set */ - - --unsigned hufts; /* track memory usage */ -+static unsigned hufts; /* track memory usage */ - - - static int huft_build(b, n, s, d, e, t, m) diff --git a/argyllcms.changes b/argyllcms.changes index 97eeab1..a7139b0 100644 --- a/argyllcms.changes +++ b/argyllcms.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Sep 7 19:33:45 UTC 2021 - Stanislav Brabec + +- Update to version 2.2.0: + * Added native i1Pro3 and i1Pro3 Plus driver. + * Fix bug in applycal.c where it gets an "Error - Write file: 1, + icmTextDescription_write: ascii string is shorter" error on + replacing one calibration with another. + * Improved i1pro & Munki patch recognition to work much more + reliably with a slow swipe speed. + * Fixed oeminst to work with spyder V5.5. setup.exe + * Fixed bug in oemdld that prevented HTML encoded characters in + download file decoding properly, which prevented certain + filenames from working. + * Fixed bug in ccxxmake -S -f where save error wasn't being fully + reported, and display technology presence check was faulty. + * Fixed typo in display technology, VPA -> PVA. + * Made Klein K10A "Lights Off" command timeout a soft error. For + some reason this command doesn't seem to be implemented on some + K10A's. + * Added CIE dE2000 to spotread output. + * Fixed accidental global "wrl" in gamut/gamut.h that cases + compile warnings. + * For more see http://www.argyllcms.com/doc/ChangesSummary.html +- Drop argyllcms--gcc--fno-common.patch (upstreamed with exception + of static declaration of struct huft, which is not required). + ------------------------------------------------------------------- Tue Mar 10 02:08:52 UTC 2020 - Stanislav Brabec diff --git a/argyllcms.spec b/argyllcms.spec index b5a8a2b..627f855 100644 --- a/argyllcms.spec +++ b/argyllcms.spec @@ -1,7 +1,7 @@ # # spec file for package argyllcms # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define tarname Argyll Name: argyllcms -Version: 2.1.2 +Version: 2.2.0 Release: 0 Summary: ICC compatible color management system License: AGPL-3.0-only AND GPL-2.0-or-later AND MIT @@ -30,8 +30,6 @@ Source1: 19-color.fdi Source2: color-device-file.policy Source3: ajam-2.5.2-1.3.3.tgz Patch1: ajam-include.patch -# PATCH-FIX-OPENSUSE argyllcms--gcc--fno-common.patch boo1160256 sbrabec@suse.com -- Fix build with GCC 10. -Patch2: argyllcms--gcc--fno-common.patch BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: libtool @@ -89,7 +87,6 @@ This package contains the Argyll color management system documentation. cd ajam-2.5.2-1.3.3 %patch1 -p1 -b .include cd .. -%patch2 -p1 # remove unused source code rm -fr usb/{*.inf,*.rtf,*.inf,*.cat,*.vcproj,*.sys,*.dsw,*.sln,*.dsp,*template*,WinCo*,winsub*,*kext*,KDRIVER_LICENSE,README_MSVC.txt,msvc,*.cmd,bin,driver,binfiles.*}