From 00641368e206afd7adfa0d2eff2e9b3d256a3e6a Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Fri, 1 Jul 2022 12:24:03 +0300 Subject: [PATCH] compositor: deprecate cms-static and cms-colord plugins While developing the new color management, keeping these old plugins working would require extra work. Let's deprecate these to see if anyone cares about them, pending removal after the Weston 11.0.0 release. CI will keep building these in the "Full build" configuration only. Doc and no-GL builds are no different for these plugins, so there these are no longer built. See https://gitlab.freedesktop.org/wayland/weston/-/issues/634 Signed-off-by: Pekka Paalanen --- .gitlab-ci.yml | 2 ++ compositor/meson.build | 18 +++++++++++------- meson_options.txt | 12 +++++++++--- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98261d86..dd018f83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -283,6 +283,8 @@ aarch64-debian-container_prep: -Dwerror=true -Dtest-skip-is-failure=true -Dlauncher-libseat=true + -Ddeprecated-color-management-static=true + -Ddeprecated-color-management-colord=true after_script: - ninja -C "$BUILDDIR" coverage-html > "$BUILDDIR/meson-logs/ninja-coverage-html.txt" - ninja -C "$BUILDDIR" coverage-xml diff --git a/compositor/meson.build b/compositor/meson.build index eb3c9de5..1692481c 100644 --- a/compositor/meson.build +++ b/compositor/meson.build @@ -96,14 +96,14 @@ if get_option('screenshare') env_modmap += 'screen-share.so=@0@;'.format(plugin_screenshare.full_path()) endif -if get_option('color-management-lcms') +if get_option('deprecated-color-management-static') srcs_lcms = [ 'cms-static.c', 'cms-helper.c', ] if not dep_lcms2.found() - error('cms-static requires lcms2 which was not found. Or, you can use \'-Dcolor-management-lcms=false\'.') + error('cms-static requires lcms2 which was not found. Or, you can use \'-Ddeprecated-color-management-static=false\'.') endif config_h.set('HAVE_LCMS', '1') @@ -119,11 +119,13 @@ if get_option('color-management-lcms') install_rpath: '$ORIGIN' ) env_modmap += 'cms-static.so=@0@;'.format(plugin_lcms.full_path()) + + warning('deprecated-color-management-static is enabled. This will go away, see https://gitlab.freedesktop.org/wayland/weston/-/issues/634') endif -if get_option('color-management-colord') - if not get_option('color-management-lcms') - error('LCMS must be enabled to support colord. Or, you can use \'-Dcolor-management-colord=false\'.') +if get_option('deprecated-color-management-colord') + if not get_option('deprecated-color-management-static') + error('deprecated-color-management-static must be enabled to support colord. Or, you can use \'-Ddeprecated-color-management-colord=false\'.') endif srcs_colord = [ @@ -133,7 +135,7 @@ if get_option('color-management-colord') dep_colord = dependency('colord', version: '>= 0.1.27', required: false) if not dep_colord.found() - error('cms-colord requires colord >= 0.1.27 which was not found. Or, you can use \'-Dcolor-management-colord=false\'.') + error('cms-colord requires colord >= 0.1.27 which was not found. Or, you can use \'-Ddeprecated-color-management-colord=false\'.') endif plugin_colord_deps = [ dep_libweston_public, dep_colord, dep_lcms2 ] @@ -141,7 +143,7 @@ if get_option('color-management-colord') foreach depname : [ 'glib-2.0', 'gobject-2.0' ] dep = dependency(depname, required: false) if not dep.found() - error('cms-colord requires \'@0@\' which was not found. If you rather not build this, set \'-Dcolor-management-colord=false\'.'.format(depname)) + error('cms-colord requires \'@0@\' which was not found. If you rather not build this, set \'-Ddeprecated-color-management-colord=false\'.'.format(depname)) endif plugin_colord_deps += dep endforeach @@ -156,6 +158,8 @@ if get_option('color-management-colord') install_dir: dir_module_weston ) env_modmap += 'cms-colord.so=@0@;'.format(plugin_colord.full_path()) + + warning('deprecated-color-management-colord is enabled. This will go away, see https://gitlab.freedesktop.org/wayland/weston/-/issues/634') endif if get_option('systemd') diff --git a/meson_options.txt b/meson_options.txt index b2c4a50f..055457d5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -132,10 +132,16 @@ option( description: 'Compositor color management: Little CMS' ) option( - 'color-management-colord', + 'deprecated-color-management-static', type: 'boolean', - value: true, - description: 'Compositor color management: colord (requires lcms)' + value: false, + description: 'DEPRECATED: color management plugin cms-static' +) +option( + 'deprecated-color-management-colord', + type: 'boolean', + value: false, + description: 'DEPRECATED: color management plugin cms-colord (requires cms-static)' ) option(