aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2020-12-02 23:48:11 +0100
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2020-12-09 17:39:20 -0500
commita52176f83035e98dd5487e3373ee2c52c8890c8d (patch)
treecb669041ca63b772bd09f89dabf27d26afd1f07a
parentbuild: introduce sd-bus-provider option (diff)
downloadsway-a52176f83035e98dd5487e3373ee2c52c8890c8d.tar.gz
sway-a52176f83035e98dd5487e3373ee2c52c8890c8d.tar.zst
sway-a52176f83035e98dd5487e3373ee2c52c8890c8d.zip
build: add basu as sd-bus provider
-rw-r--r--include/swaybar/tray/tray.h2
-rw-r--r--meson.build5
-rw-r--r--meson_options.txt2
3 files changed, 8 insertions, 1 deletions
diff --git a/include/swaybar/tray/tray.h b/include/swaybar/tray/tray.h
index b5df0025..a64cd9c8 100644
--- a/include/swaybar/tray/tray.h
+++ b/include/swaybar/tray/tray.h
@@ -6,6 +6,8 @@
6#include <systemd/sd-bus.h> 6#include <systemd/sd-bus.h>
7#elif HAVE_LIBELOGIND 7#elif HAVE_LIBELOGIND
8#include <elogind/sd-bus.h> 8#include <elogind/sd-bus.h>
9#elif HAVE_BASU
10#include <basu/sd-bus.h>
9#endif 11#endif
10#include <cairo.h> 12#include <cairo.h>
11#include <stdint.h> 13#include <stdint.h>
diff --git a/meson.build b/meson.build
index 9842d78a..38a55678 100644
--- a/meson.build
+++ b/meson.build
@@ -104,8 +104,12 @@ if get_option('sd-bus-provider') == 'auto'
104 sdbus = dependency('libelogind', 104 sdbus = dependency('libelogind',
105 required: false, 105 required: false,
106 version: '>=239', 106 version: '>=239',
107 not_found_message: 'libelogind not found, trying basu',
107 ) 108 )
108 endif 109 endif
110 if not sdbus.found()
111 sdbus = dependency('basu', required: false)
112 endif
109else 113else
110 sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray')) 114 sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray'))
111endif 115endif
@@ -122,6 +126,7 @@ conf_data.set10('HAVE_XWAYLAND', have_xwayland)
122conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found()) 126conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found())
123conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd') 127conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd')
124conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind') 128conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind')
129conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu')
125conf_data.set10('HAVE_TRAY', have_tray) 130conf_data.set10('HAVE_TRAY', have_tray)
126 131
127scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) 132scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
diff --git a/meson_options.txt b/meson_options.txt
index 66c6d268..e36900b6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,4 +6,4 @@ option('xwayland', type: 'feature', value: 'auto', description: 'Enable support
6option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray') 6option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray')
7option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg') 7option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg')
8option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') 8option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
9option('sd-bus-provider', type: 'combo', choices: ['auto', 'libsystemd', 'libelogind'], value: 'auto', description: 'Provider of the sd-bus library') 9option('sd-bus-provider', type: 'combo', choices: ['auto', 'libsystemd', 'libelogind', 'basu'], value: 'auto', description: 'Provider of the sd-bus library')