Applied suggestions by 'nemo' and drop 'basu' subproject

meson.build

@@ -78,8 +78,8 @@ tllist = dependency('tllist', version: '>=1.0.1', fallback: 'tllist')
 fcft = dependency('fcft', version: ['>=3.0.0', '<4.0.0'], fallback: 'fcft')
 
 # DBus dependency. Used by 'modules/mpris'
-dbus = dependency('libsystemd', version: '>=221', fallback: 'basu')
-# dbus = dependency('basu')
+sdbus_library = dependency('libsystemd', 'libelogind', 'basu', required: get_option('plugin-mpris'))
+sdbus = declare_dependency(compile_args: ['-DHAVE_' + sdbus_library.name().to_upper()], dependencies:[sdbus_library])
 
 add_project_arguments(
   cc_flags +

modules/dbus.h

@@ -0,0 +1,13 @@
+#pragma once
+
+// This header provides an generic interface for different versions of
+// systemd-sdbus.
+
+#if defined(HAVE_LIBSYSTEMD)
+#include <systemd/sd-bus.h>
+#elif defined(HAVE_LIBELOGIND)
+#include <elogind/sd-bus.h>
+#elif defined(HAVE_BASU)
+#include <basu/sd-bus.h>
+#endif
+

modules/meson.build

@@ -22,8 +22,8 @@ plugin_mem_enabled = get_option('plugin-mem').allowed()
 mpd = dependency('libmpdclient', required: get_option('plugin-mpd'))
 plugin_mpd_enabled = mpd.found()
 
-mpris = dbus
-plugin_mpris_enabled = dbus.found()
+mpris = sdbus
+plugin_mpris_enabled = sdbus.found()
 
 json_i3 = dependency('json-c', required: get_option('plugin-i3'))
 plugin_i3_enabled = json_i3.found()

modules/mpris.c

@@ -13,7 +13,7 @@
 
 #include <sys/eventfd.h>
 
-#include <systemd/sd-bus.h>
+#include "dbus.h"
 
 #define LOG_MODULE "mpris"
 #define LOG_ENABLE_DBG 1

subprojects/basu.wrap

@@ -1,3 +0,0 @@
-[wrap-git]
-url = https://git.sr.ht/~emersion/basu
-revision = v0.2.1