Accepting request 761015 from multimedia:color_management
OBS-URL: https://build.opensuse.org/request/show/761015 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/argyllcms?expand=0&rev=22
This commit is contained in:
commit
2ee86546d0
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:4d61ae0b91686dea721d34df2e44eaf36c88da87086fd50ccc4e999a58e9ce90
|
|
||||||
size 13624924
|
|
3
Argyll_V2.1.1_src.zip
Normal file
3
Argyll_V2.1.1_src.zip
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:51269bcafc4d95679354b796685c3f0a41b44b78443cbe360cda4a2d72f32acb
|
||||||
|
size 13825860
|
@ -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 */
|
|
@ -1,3 +1,26 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jan 5 02:53:35 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
- Use pkgconfig(libpng) BuildRequires, the build system looks for
|
||||||
|
the unversioned libpng.so and falls back to its bundled version.
|
||||||
|
- Remove bundled zlib source, otherwise it is built even when the
|
||||||
|
system zlib is found. This triggers a fatal rpm check failure on
|
||||||
|
Leap 15.x due to compiler warnings.
|
||||||
|
- Also remove bundled png/tiff/axTLS sources.
|
||||||
|
- Remove pkgconfig(mxml) dependency, ArgyllCMS bundles a patched one.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
Wed Apr 24 09:16:27 UTC 2019 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package argyllcms
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -19,24 +19,23 @@
|
|||||||
%define tarname Argyll
|
%define tarname Argyll
|
||||||
|
|
||||||
Name: argyllcms
|
Name: argyllcms
|
||||||
Version: 1.9.2
|
Version: 2.1.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: ICC compatible color management system
|
Summary: ICC compatible color management system
|
||||||
License: AGPL-3.0-only AND GPL-2.0-or-later AND MIT
|
License: AGPL-3.0-only AND GPL-2.0-or-later AND MIT
|
||||||
Group: System/X11/Utilities
|
Group: System/X11/Utilities
|
||||||
Url: http://www.argyllcms.com/
|
URL: http://www.argyllcms.com/
|
||||||
Source0: http://www.argyllcms.com/%{tarname}_V%{version}_src.zip
|
Source0: http://www.argyllcms.com/%{tarname}_V%{version}_src.zip
|
||||||
Source1: 19-color.fdi
|
Source1: 19-color.fdi
|
||||||
Source2: color-device-file.policy
|
Source2: color-device-file.policy
|
||||||
Source3: ajam-2.5.2-1.3.3.tgz
|
Source3: ajam-2.5.2-1.3.3.tgz
|
||||||
Source4: %{name}.changes
|
|
||||||
Patch1: ajam-include.patch
|
Patch1: ajam-include.patch
|
||||||
Patch2: argyllcms-decl.patch
|
|
||||||
|
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: libtiff-devel
|
BuildRequires: libtiff-devel
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
|
BuildRequires: pkgconfig(libpng)
|
||||||
BuildRequires: pkgconfig(x11)
|
BuildRequires: pkgconfig(x11)
|
||||||
BuildRequires: pkgconfig(xdmcp)
|
BuildRequires: pkgconfig(xdmcp)
|
||||||
BuildRequires: pkgconfig(xext)
|
BuildRequires: pkgconfig(xext)
|
||||||
@ -73,8 +72,8 @@ viewer.
|
|||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
Summary: Argyll CMS documentation
|
Summary: Argyll CMS documentation
|
||||||
# Does not really make sense without Argyll CMS itself
|
|
||||||
Group: System/X11/Utilities
|
Group: System/X11/Utilities
|
||||||
|
# Does not really make sense without Argyll CMS itself
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}
|
||||||
|
|
||||||
%description doc
|
%description doc
|
||||||
@ -86,13 +85,13 @@ This package contains the Argyll color management system documentation.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{tarname}_V%{version} -a3
|
%setup -q -n %{tarname}_V%{version} -a3
|
||||||
%patch2 -p1
|
|
||||||
cd ajam-2.5.2-1.3.3
|
cd ajam-2.5.2-1.3.3
|
||||||
%patch1 -p1 -b .include
|
%patch1 -p1 -b .include
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
# remove unused source code
|
# 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.*}
|
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.*}
|
||||||
|
rm -fr zlib tiff png ccast/axTLS/*.c
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%define _lto_cflags %{nil}
|
%define _lto_cflags %{nil}
|
||||||
@ -117,8 +116,8 @@ install -m 0755 -D bin/* %{buildroot}/%{_bindir}
|
|||||||
install -m 0644 -D ref/* %{buildroot}/%{_datadir}/color/argyll/ref
|
install -m 0644 -D ref/* %{buildroot}/%{_datadir}/color/argyll/ref
|
||||||
rm -f %{buildroot}/%{_datadir}/color/argyll/License.txt
|
rm -f %{buildroot}/%{_datadir}/color/argyll/License.txt
|
||||||
|
|
||||||
# ensure timestamp is shipped files is not changing for each rebuild (boo#916158)
|
# ensure timestamp in shipped files is not changing for each rebuild (boo#916158)
|
||||||
TIMESTAMP=$(LC_ALL=C date -r %{SOURCE4} +%c)
|
TIMESTAMP=$(LC_ALL=C date --date=@${SOURCE_DATE_EPOCH} +%c)
|
||||||
|
|
||||||
sed -i -e 's/^CREATED .*/CREATED "$TIMESTAMP"/g' %{buildroot}%{_datadir}/color/argyll/ref/RefMediumGamut.gam
|
sed -i -e 's/^CREATED .*/CREATED "$TIMESTAMP"/g' %{buildroot}%{_datadir}/color/argyll/ref/RefMediumGamut.gam
|
||||||
|
|
||||||
@ -129,16 +128,13 @@ chmod a-x *.txt
|
|||||||
chmod a-x doc/*
|
chmod a-x doc/*
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc *.txt
|
%doc *.txt
|
||||||
|
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%dir %{_datadir}/color
|
%dir %{_datadir}/color
|
||||||
%{_datadir}/color/argyll
|
%{_datadir}/color/argyll
|
||||||
%{_udevrulesdir}/55-Argyll.rules
|
%{_udevrulesdir}/55-Argyll.rules
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc doc/*.html doc/*.jpg doc/*.txt
|
%doc doc/*.html doc/*.jpg doc/*.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user