From 722f211518e26dae95220cb8f0f5d4833b9576b8 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Mon, 10 Oct 2022 09:48:30 +0200
Subject: [PATCH] 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
---
 .gitlab-ci.yml        | 1 +
 libweston/meson.build | 8 +++++---
 meson.build           | 2 +-
 meson_options.txt     | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65ae360b..15d3bf3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -283,6 +283,7 @@ aarch64-debian-container_prep:
       -Dwerror=true
       -Dtest-skip-is-failure=true
       -Dlauncher-libseat=true
+      -Ddeprecated-launcher-logind=true
       -Ddeprecated-color-management-static=true
       -Ddeprecated-color-management-colord=true
   after_script:
diff --git a/libweston/meson.build b/libweston/meson.build
index 6bcfe037..ef984d54 100644
--- a/libweston/meson.build
+++ b/libweston/meson.build
@@ -156,15 +156,15 @@ if get_option('backend-drm')
 endif
 
 systemd_dep = dependency('', required: false)
-if get_option('launcher-logind')
+if get_option('deprecated-launcher-logind')
 	systemd_dep = dependency('libsystemd', version: '>= 209', required: false)
 	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
 
 	dbus_dep = dependency('dbus-1', version: '>= 1.6', required: false)
 	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
 
 	config_h.set('HAVE_DBUS', '1')
@@ -178,6 +178,8 @@ if get_option('launcher-logind')
 		dbus_dep,
 		systemd_dep,
 	]
+
+	warning('deprecated-launcher-logind is enabled. This will go away, see https://gitlab.freedesktop.org/wayland/weston/-/issues/488')
 endif
 if get_option('launcher-libseat')
 	libseat_dep = dependency('libseat', version: '>= 0.4')
diff --git a/meson.build b/meson.build
index 5fcd317f..3e870154 100644
--- a/meson.build
+++ b/meson.build
@@ -27,7 +27,7 @@ else
 	error('Bad versions in meson.build: libweston_major is too low')
 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')
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 055457d5..d0d1f6cd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -145,10 +145,10 @@ option(
 )
 
 option(
-	'launcher-logind',
+	'deprecated-launcher-logind',
 	type: 'boolean',
-	value: true,
-	description: 'Compositor: support systemd-logind D-Bus protocol'
+	value: false,
+	description: 'DEPRECATED: Compositor: support systemd-logind D-Bus protocol (superseded by launcher-libseat)'
 )
 
 option(