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

Accepting request 754062 from GNOME:Factory

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/754062
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/colord?expand=0&rev=80
This commit is contained in:
Dominique Leuenberger 2019-12-11 11:04:46 +00:00 committed by Git OBS Bridge
commit b96c5c1ed2
3 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
add-spyderx.patch Normal file
View File

@ -0,0 +1,37 @@
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:

6
colord.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Oct 23 19:30:25 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

9
colord.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package colord
#
# 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
@ -31,6 +31,8 @@ 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,6 +144,7 @@ there are no users logged in.
%prep
%setup -q
%patch1 -p1
%build
# Set ~2 GiB limit so that colprof is forced to work in chunks when
@ -239,6 +242,8 @@ exit 0
%{_libdir}/colord-plugins/libcolord_sensor_camera.so
%{_libdir}/colord-plugins/libcolord_sensor_scanner.so
%{_sbindir}/rc%{name}
%{_userunitdir}/colord-session.service
%{_tmpfilesdir}/colord.conf
%files color-profiles
%{_datadir}/color/
@ -268,8 +273,6 @@ exit 0
%{_datadir}/vala/vapi/colord.deps
%{_datadir}/vala/vapi/colord.vapi
%{_datadir}/gtk-doc/html/colord/
%{_userunitdir}/colord-session.service
%{_tmpfilesdir}/colord.conf
%files lang -f %{name}.lang