Accepting request 861559 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/861559
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/colord?expand=0&rev=82
This commit is contained in:
Dominique Leuenberger 2021-01-11 16:10:26 +00:00 committed by Git OBS Bridge
commit 2af83dd6a0
7 changed files with 41 additions and 59 deletions

View File

@ -1,37 +0,0 @@
diff --git a/lib/colord/cd-enum.c b/lib/colord/cd-enum.c
index b1ced1c..00b6e16 100644
--- a/lib/colord/cd-enum.c
+++ b/lib/colord/cd-enum.c
@@ -71,6 +71,7 @@ static const CdEnumMatch enum_sensor_kind[] = {
{CD_SENSOR_KIND_SPYDER3, "spyder3"},
{CD_SENSOR_KIND_SPYDER4, "spyder4"},
{CD_SENSOR_KIND_SPYDER5, "spyder5"},
+ {CD_SENSOR_KIND_SPYDERX, "spyderX"},
{CD_SENSOR_KIND_SPYDER, "spyder"},
{CD_SENSOR_KIND_SPARK, "spark"},
{0, NULL}
diff --git a/lib/colord/cd-enum.h b/lib/colord/cd-enum.h
index f311d26..c9d015b 100644
--- a/lib/colord/cd-enum.h
+++ b/lib/colord/cd-enum.h
@@ -193,6 +193,7 @@ typedef enum {
CD_SENSOR_KIND_COLORHUG2, /* Since: 1.2.2 */
CD_SENSOR_KIND_SPYDER5, /* Since: 1.2.11 */
CD_SENSOR_KIND_SPARK, /* Since: 1.2.11 */
+ CD_SENSOR_KIND_SPYDERX, /* Since: 1.4.5 */
/*< private >*/
CD_SENSOR_KIND_LAST
} CdSensorKind;
diff --git a/src/sensors/argyll/cd-sensor-argyll.c b/src/sensors/argyll/cd-sensor-argyll.c
index ef8456d..21b354b 100644
--- a/src/sensors/argyll/cd-sensor-argyll.c
+++ b/src/sensors/argyll/cd-sensor-argyll.c
@@ -334,6 +334,8 @@ cd_sensor_to_argyll_name (CdSensor *sensor)
return "Datacolor Spyder4";
case CD_SENSOR_KIND_SPYDER5:
return "Datacolor Spyder5";
+ case CD_SENSOR_KIND_SPYDERX:
+ return "Datacolor SpyderX";
case CD_SENSOR_KIND_HUEY:
return "GretagMacbeth Huey";
case CD_SENSOR_KIND_COLORHUG:

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5
size 1855696

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEFj61ARkiXbPfj0nqF6y6jfqXDhcFAlyCY5UACgkQF6y6jfqX
DhfX9Qf/SMa0r9eLqdOCCIGmF0Ek/2HE4sO/peXZfcKA5p2wdM2Cir1j8jE0ysd5
NIjmYAR4w6RP2WR4qTMHZMroV+mphcluuFrr2jJ00JMbw/DXmEHHTWaOHHAcVj9c
W1uMWyqf8C5dcVnThCo5ivbdFSvngySX2/Gnl1ICjB6/KrQLC/qIunxkpu9E94+o
0a0ahD16T2QPQnyADO6vWg8wc+E2rqWtEQ1giAbc7Wom1J7ACXj4GZPbMbK/jLoO
bdDKO9msSY35v5lu2kV3DIQaCepofl6DtHZJ3+43XpZLggC5NQvvAlW+iUFv6MXG
irHgQ/fHfunfisseDTy3SAItb6FQBw==
=SJ8I
-----END PGP SIGNATURE-----

3
colord-1.4.5.tar.xz Normal file
View File

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

11
colord-1.4.5.tar.xz.asc Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEFj61ARkiXbPfj0nqF6y6jfqXDhcFAl+f5Z0ACgkQF6y6jfqX
DhfWLQf/V1Bvy1MkBrUyscTmdPBtPWXAnA8tu9YTxCfXZ3pRVeVfTVo4OWjcgIaF
zIEuwMm2zcV/+SbxjmU4PpPTpPBtQPtuernDpixf4H9JtZfcmIfZFqLzNNlLCZc5
3qe78HBs/mhbF5B/PZtE+lfZCzaKwzx4BU0gBlTd3R8NepFngi35+NMR9/ygYc4s
Xg/QoOIzd4R1hJjJBQS0RRy1nm+MiBllZJxPWvMfjekfvcIjU58TN1Vr6POPkYrQ
VJUhnO0EKkE6KKHrB9hGHxbaLSwOPKdVOI8prgqBNOgl4RsJtWQ6V9u17vq6JwG4
pMdp4wIxogOAVmp49W9Dfgb3xUlk4g==
=Et7c
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Jan 7 17:30:04 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 1.4.5:
+ New Features:
- Add cd_icc_create_default_full
- Add cd_icc_utils_get_adaptation_matrix
- Add cd_mat33_is_finite
- Add support for datacolor SpyderX
+ Bugfixes:
- Check for errors from more sqlite calls
- Fix cd_icc_load_data() annotation for the data array
- Fix cd-sensor-dummy
- Fix more annotation for data arrays
- Fix owner and permissions on existing state files
- Fix segfault due to dereferencing NULL pointer
- Make the build reproductible
- Refactor opening of mapping database and try again if fails
- Drop add-spyderx.patch: Included upstream in new release.
-------------------------------------------------------------------
Sat Jan 25 14:06:23 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
@ -6,8 +26,10 @@ Sat Jan 25 14:06:23 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
-------------------------------------------------------------------
Wed Dec 4 10:15:30 UTC 2019 - Richard Brown <rbrown@suse.com>
- Add add-spyderx.patch for datacolor SpyderX supprot (will be in version 1.4.5)
- Move colord-session.service and tmpfiles config from libcolord-devel to colord package
- Add add-spyderx.patch for datacolor SpyderX supprot (will be in
version 1.4.5).
- Move colord-session.service and tmpfiles config from
libcolord-devel to colord package.
-------------------------------------------------------------------
Wed Oct 23 19:30:25 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package colord
#
# Copyright (c) 2019 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 _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
Name: colord
Version: 1.4.4
Version: 1.4.5
Release: 0
Summary: System Daemon for Managing Color Devices
License: GPL-2.0-or-later
@ -31,8 +31,6 @@ Source2: %{name}.keyring
# Apparmor profile
Source3: usr.lib.colord
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM add-spyderx.patch -- Add SpyderX Support
Patch1: add-spyderx.patch
BuildRequires: argyllcms
BuildRequires: docbook5-xsl-stylesheets
@ -142,8 +140,7 @@ there are no users logged in.
%lang_package
%prep
%setup -q
%patch1 -p1
%autosetup -p1
%build
# Set ~2 GiB limit so that colprof is forced to work in chunks when