mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: deprecate launcher-logind 

Deprecate launcher-logind and disable it by default.

launcher-libseat supports logind, so this shouldn't cause any
regression.

Signed-off-by: Simon Ser <contact@emersion.fr>
References: https://gitlab.freedesktop.org/wayland/weston/-/issues/488
This commit is contained in:
Simon Ser 2022-10-10 09:48:30 +02:00
parent ff459f0273
commit 722f211518
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -283,6 +283,7 @@ 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-launcher-logind=true
-Ddeprecated-color-management-static=true -Ddeprecated-color-management-static=true
-Ddeprecated-color-management-colord=true -Ddeprecated-color-management-colord=true
after_script: after_script:

8
libweston/meson.build
View File

@ -156,15 +156,15 @@ if get_option('backend-drm')
endif endif
systemd_dep = dependency('', required: false) systemd_dep = dependency('', required: false)
if get_option('launcher-logind') if get_option('deprecated-launcher-logind')
systemd_dep = dependency('libsystemd', version: '>= 209', required: false) systemd_dep = dependency('libsystemd', version: '>= 209', required: false)
if not systemd_dep.found() if not systemd_dep.found()
error('logind support requires libsystemd >= 209. Or, you can use \'-Dlauncher-logind=false\'') error('logind support requires libsystemd >= 209. Or, you can use \'-Ddeprecated-launcher-logind=false\'')
endif endif
dbus_dep = dependency('dbus-1', version: '>= 1.6', required: false) dbus_dep = dependency('dbus-1', version: '>= 1.6', required: false)
if not dbus_dep.found() if not dbus_dep.found()
error('logind support requires dbus-1 >= 1.6 which was not found. Or, you can use \'-Dlauncher-logind=false\'') error('logind support requires dbus-1 >= 1.6 which was not found. Or, you can use \'-Ddeprecated-launcher-logind=false\'')
endif endif
config_h.set('HAVE_DBUS', '1') config_h.set('HAVE_DBUS', '1')
@ -178,6 +178,8 @@ if get_option('launcher-logind')
dbus_dep, dbus_dep,
systemd_dep, systemd_dep,
] ]
warning('deprecated-launcher-logind is enabled. This will go away, see https://gitlab.freedesktop.org/wayland/weston/-/issues/488')
endif endif
if get_option('launcher-libseat') if get_option('launcher-libseat')
libseat_dep = dependency('libseat', version: '>= 0.4') libseat_dep = dependency('libseat', version: '>= 0.4')

2
meson.build
View File

@ -27,7 +27,7 @@ else
error('Bad versions in meson.build: libweston_major is too low') error('Bad versions in meson.build: libweston_major is too low')
endif endif
if not (get_option('launcher-logind') or get_option('launcher-libseat')) if not (get_option('deprecated-launcher-logind') or get_option('launcher-libseat'))
error('At least one launcher must be enabled') error('At least one launcher must be enabled')
endif endif

6
meson_options.txt
View File

@ -145,10 +145,10 @@ option(
) )
option( option(
'launcher-logind', 'deprecated-launcher-logind',
type: 'boolean', type: 'boolean',
value: true, value: false,
description: 'Compositor: support systemd-logind D-Bus protocol' description: 'DEPRECATED: Compositor: support systemd-logind D-Bus protocol (superseded by launcher-libseat)'
) )
option( option(