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 <pekka.paalanen@collabora.com>
dev
Pekka Paalanen 2 years ago committed by Pekka Paalanen
parent 18897253d4
commit 00641368e2
  1. 2
      .gitlab-ci.yml
  2. 18
      compositor/meson.build
  3. 12
      meson_options.txt

@ -283,6 +283,8 @@ aarch64-debian-container_prep:
-Dwerror=true -Dwerror=true
-Dtest-skip-is-failure=true -Dtest-skip-is-failure=true
-Dlauncher-libseat=true -Dlauncher-libseat=true
-Ddeprecated-color-management-static=true
-Ddeprecated-color-management-colord=true
after_script: after_script:
- ninja -C "$BUILDDIR" coverage-html > "$BUILDDIR/meson-logs/ninja-coverage-html.txt" - ninja -C "$BUILDDIR" coverage-html > "$BUILDDIR/meson-logs/ninja-coverage-html.txt"
- ninja -C "$BUILDDIR" coverage-xml - ninja -C "$BUILDDIR" coverage-xml

@ -96,14 +96,14 @@ if get_option('screenshare')
env_modmap += 'screen-share.so=@0@;'.format(plugin_screenshare.full_path()) env_modmap += 'screen-share.so=@0@;'.format(plugin_screenshare.full_path())
endif endif
if get_option('color-management-lcms') if get_option('deprecated-color-management-static')
srcs_lcms = [ srcs_lcms = [
'cms-static.c', 'cms-static.c',
'cms-helper.c', 'cms-helper.c',
] ]
if not dep_lcms2.found() 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 endif
config_h.set('HAVE_LCMS', '1') config_h.set('HAVE_LCMS', '1')
@ -119,11 +119,13 @@ if get_option('color-management-lcms')
install_rpath: '$ORIGIN' install_rpath: '$ORIGIN'
) )
env_modmap += 'cms-static.so=@0@;'.format(plugin_lcms.full_path()) 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 endif
if get_option('color-management-colord') if get_option('deprecated-color-management-colord')
if not get_option('color-management-lcms') if not get_option('deprecated-color-management-static')
error('LCMS must be enabled to support colord. Or, you can use \'-Dcolor-management-colord=false\'.') error('deprecated-color-management-static must be enabled to support colord. Or, you can use \'-Ddeprecated-color-management-colord=false\'.')
endif endif
srcs_colord = [ srcs_colord = [
@ -133,7 +135,7 @@ if get_option('color-management-colord')
dep_colord = dependency('colord', version: '>= 0.1.27', required: false) dep_colord = dependency('colord', version: '>= 0.1.27', required: false)
if not dep_colord.found() 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 endif
plugin_colord_deps = [ dep_libweston_public, dep_colord, dep_lcms2 ] 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' ] foreach depname : [ 'glib-2.0', 'gobject-2.0' ]
dep = dependency(depname, required: false) dep = dependency(depname, required: false)
if not dep.found() 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 endif
plugin_colord_deps += dep plugin_colord_deps += dep
endforeach endforeach
@ -156,6 +158,8 @@ if get_option('color-management-colord')
install_dir: dir_module_weston install_dir: dir_module_weston
) )
env_modmap += 'cms-colord.so=@0@;'.format(plugin_colord.full_path()) 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 endif
if get_option('systemd') if get_option('systemd')

@ -132,10 +132,16 @@ option(
description: 'Compositor color management: Little CMS' description: 'Compositor color management: Little CMS'
) )
option( option(
'color-management-colord', 'deprecated-color-management-static',
type: 'boolean', type: 'boolean',
value: true, value: false,
description: 'Compositor color management: colord (requires lcms)' 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( option(

Loading…
Cancel
Save