[gnome-settings-daemon] colord: make it optional
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] colord: make it optional
- Date: Tue, 18 Aug 2020 11:39:13 +0000 (UTC)
commit 4cd4c3f9f6c8e033e61d647bfb0bd4098a452708
Author: Samuel Thibault <samuel thibault ens-lyon org>
Date: Fri Aug 7 15:19:52 2020 +0200
colord: make it optional
colord has become completely dependent on udev, not available on
non-Linux, so make the color plugin optional to fix build there.
meson.build | 7 ++++++-
meson_options.txt | 1 +
plugins/meson.build | 4 ++++
3 files changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index b794652c..0b314c57 100644
--- a/meson.build
+++ b/meson.build
@@ -90,7 +90,6 @@ endif
add_project_arguments(common_flags + compiler_flags, language: 'c')
glib_dep = dependency('glib-2.0', version: '>=' + glib_min_version)
-colord_dep = dependency('colord', version: '>= 1.3.5')
geocode_glib_dep = dependency('geocode-glib-1.0', version: '>= 3.10.0')
gio_dep = dependency('gio-2.0', version: '>= 2.53.0')
gio_unix_dep = dependency('gio-unix-2.0')
@@ -225,6 +224,12 @@ if enable_network_manager
endif
config_h.set10('HAVE_NETWORK_MANAGER', enable_network_manager)
+# colord
+enable_colord = get_option('colord')
+if enable_colord
+ colord_dep = dependency('colord', version: '>= 1.3.5')
+endif
+
gnome = import('gnome')
i18n = import('i18n')
pkg = import('pkgconfig')
diff --git a/meson_options.txt b/meson_options.txt
index 15dd8251..3e04cf64 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -11,3 +11,4 @@ option('smartcard', type: 'boolean', value: true, description: 'build with smart
option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
+option('colord', type: 'boolean', value: true, description: 'build with colord support')
diff --git a/plugins/meson.build b/plugins/meson.build
index e8f2c4cd..c8c10db4 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -44,6 +44,10 @@ if not enable_wwan
disabled_plugins += ['wwan']
endif
+if not enable_colord
+ disabled_plugins += ['color']
+endif
+
# Specify futher required units, 'before' or 'after' may be specified if ordering is needed
plugin_gate_units = {
'xsettings': [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]