pool/argyllcms
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 479859 from multimedia:color_management

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/479859
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/argyllcms?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2017-03-18 19:48:38 +00:00 committed by Git OBS Bridge
commit 1017ed6121
7 changed files with 109 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Argyll_V1.8.3_src.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60494176785f6c2e4e4daefb9452d83859880449040b2a843ed81de3bd0c558e
size 13933565

3
Argyll_V1.9.2_src.zip Normal file
View File

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

12
argyllcms-1.4.0-warnings.patch
View File

@ -1,12 +0,0 @@
diff -up Argyll_V1.4.0/gamut/maptest.c.warning Argyll_V1.4.0/gamut/maptest.c
--- Argyll_V1.4.0/gamut/maptest.c.warning 2012-06-22 18:03:25.113289700 +0200
+++ Argyll_V1.4.0/gamut/maptest.c 2012-06-22 18:10:57.615637380 +0200
@@ -99,7 +99,7 @@ main(int argc, char *argv[]) {
else if (argv[fa][1] == 'i' || argv[fa][1] == 'I') {
if (na == NULL) usage();
fa = nfa;
- strncpy(img_name,na,MAXNAMEL); img_name[MAXNAMEL] = '\000';
+ strncpy(img_name,na,MAXNAMEL); img_name[MAXNAMEL-1] = '\000';
}
else

48
argyllcms-decl.patch
View File

@ -1,25 +1,37 @@
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 <sys/types.h>
#include <sys/stat.h>
+#include <sys/time.h>
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>
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 <dirent.h>
#include <sys/types.h>
#include <sys/stat.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 */

17
argyllcms-udev151.patch
View File

@ -1,17 +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
@@ -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 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"
-
LABEL="argyll_rules_end"

66
argyllcms.changes
View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Tue Mar 14 15:44:45 UTC 2017 - guoyunhebrave@gmail.com
- Update to version 1.9.2 and update patches
* Added CMYKOGB and CMYKRGB 7 channel ink preset, and made targen
more flexible in matching pre-conditioning profiles to targen ink
selection.
* Fix oeminst for OS X save location.
* Fix oeminst for OS X Spyder 4 CD calibration file location.
* Improved robustness of ChromeCast discovery, and added some minimal
diagnostics.
* Improved robustness of targen ofps patch generation when using less
well behaved pre-conditioning profiles.
* Fixed oeminst so that it locates cdrom's in Linuxes latest mount
point of /run/media/$USER/.
* Fixed bug in i1pro2 driver, in which strip calibration would fail
if instrument had been first calibrated with ARGYLL_DISABLE_I1PRO2_DRIVER
set, and then calibrated with ARGYLL_DISABLE_I1PRO2_DRIVER unset.
* Added option to icclib to write Output profiles using 'chad' tag if
the ARGYLL_CREATE_DISPLAY_PROFILE_WITH_CHAD environment variable is
set. This is not recommended for normal use, but may assist
compatibility with other systems.
* Added JETI spectraval support, including Bluetooth access.
* Added support for the Klein K10 connecting via a serial port.
* Fixed bug in Colormunki Smile driver that causes crash on Ubuntu
16.04.1 LTS.
* Modified "lp" intent to greatly reduce eliminate Helmholtz-Kohlrausch
appearance modelling.
* Fixed problem with targen -g, in that the corresponding XYZ values
had double the power applied, rather than none. This was causing
problems with printtarg spacer colors.
* Extensive re-write of colorimetric nearest clipping code in rspl/rev.c
to restore precision that was lost in the speedups made in V1.0.0. The
nnrev setup now takes a lot longer with high resolution CMYK profiles
though. This corrects a "green becoming too yellow" problem for mapping
from ProPhoto space with some RGB devices.
* Change dispwin to properly set X11 DirectColor and take account of
TrueColor Colormap. This fixes problem with NVidia linux driver 364.12
exposing a VideoLUT depth that is different from the frame buffer depth.
* Change icclib to automatically repair icmTextDescription strings that
have an allocation that is longer than their size.
* Added i1Pro Lamp Drift test and fix functions to spotread (-Y l|L options).
* Change colprof so that -s -S will accept general compression percentage
as an alternative to a source colorspace/image gamut.
* Added optional conversion from native Gretag-MacBeth & X-Rite reflective
calibration standards to/from XRGA.
* Changed OS X GUI support code so as not to switch to "interact with the
Dock" mode until actual GUI element is to be displayed. This prevents
batch commands with optional GUI elements from blocking normal GUI
interactions.
* Re-jigged OS X UI code to use the main thread to avoid window
creation timing issues and a warning backtrace on OS X 10.11.
* Added CMP_Digital_Target-7.cht
* Fix spec2cie to cope with .ti3 files that are missing device values,
so that it can process a wider range of input CIE reference files.
* Changed implementation of ARGYLL_NOT_INTERACTIVE on MSWin to make
it more reliable when operated progromatically.
* Fixed chartread so that if you are reading patch by patch, the
location strings can be arbitrary (i.e. they don't have to conform
to an alpha/num strip/patch pattern.)
* Added support for Sencore ColorPro V, IV & III colorimeters
(based on Sequel Chroma colorimeter.).
- Drop argyllcms-udev151.patch
- Drop argyllcms-1.4.0-warnings.patch
-------------------------------------------------------------------
Wed Apr 13 09:40:00 UTC 2016 - lnussel@suse.de

28
argyllcms.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package argyllcms
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 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
@ -19,25 +19,19 @@
%define tarname Argyll
Name: argyllcms
Version: 1.8.3
Version: 1.9.2
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.argyllcms.com/
# factory-auto doesn't like this
#Source0: http://www.argyllcms.com/%{tarname}_V%{version}_src.zip
Source0: %{tarname}_V%{version}_src.zip
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
Source99: argyllcms.changes
# drop udev-acl stuff, handled by udev directly (Mandriva)
Patch5: argyllcms-udev151.patch
Patch7: ajam-include.patch
Patch8: argyllcms-1.4.0-warnings.patch
# PATCH-FIX-UPSTREAM argyllcms-decl.patch sbrabec@suse.cz -- Add missing headers.
Patch12: argyllcms-decl.patch
Source4: %{name}.changes
Patch1: ajam-include.patch
Patch2: argyllcms-decl.patch
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
@ -72,8 +66,8 @@ viewer.
%package doc
Summary: Argyll CMS documentation
Group: System/X11/Utilities
# Does not really make sense without Argyll CMS itself
Group: System/X11/Utilities
Requires: %{name} = %{version}
%description doc
@ -85,13 +79,11 @@ This package contains the Argyll color management system documentation.
%prep
%setup -q -n %{tarname}_V%{version}
%patch5 -p1 -b .udev151
%patch8 -p1 -b .warnings
%patch12 -p1
%patch2 -p1
tar xf %{SOURCE3}
cd ajam-2.5.2-1.3.3
%patch7 -p1 -b .include
%patch1 -p1 -b .include
cd ..
# remove unused source code
@ -123,7 +115,7 @@ install -m 0644 -D ref/* %{buildroot}/%{_datadir}/color/argyll/ref
rm -f $RPM_BUILD_ROOT/%{_datadir}/color/argyll/License.txt
# ensure timestamp is shipped files is not changing for each rebuild (boo#916158)
TIMESTAMP=$(LC_ALL=C date -r %{SOURCE99} +%c)
TIMESTAMP=$(LC_ALL=C date -r %{SOURCE4} +%c)
sed -i -e 's/^CREATED .*/CREATED "$TIMESTAMP"/g' %{buildroot}%{_datadir}/color/argyll/ref/RefMediumGamut.gam