mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 17:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: add basu as sd-bus provider

Browse source
This commit is contained in:
Simon Ser 2020-12-02 23:48:11 +01:00 committed by Brian Ashworth
parent fdbe98512a
commit a52176f830
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/swaybar/tray/tray.h
View file

@ -6,6 +6,8 @@
#include <systemd/sd-bus.h> #include <systemd/sd-bus.h>
#elif HAVE_LIBELOGIND #elif HAVE_LIBELOGIND
#include <elogind/sd-bus.h> #include <elogind/sd-bus.h>
#elif HAVE_BASU
#include <basu/sd-bus.h>
#endif #endif
#include <cairo.h> #include <cairo.h>
#include <stdint.h> #include <stdint.h>

5
meson.build
View file

@ -104,8 +104,12 @@ if get_option('sd-bus-provider') == 'auto'
sdbus = dependency('libelogind', sdbus = dependency('libelogind',
required: false, required: false,
version: '>=239', version: '>=239',
not_found_message: 'libelogind not found, trying basu',
) )
endif endif
if not sdbus.found()
sdbus = dependency('basu', required: false)
endif
else else
sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray')) sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray'))
endif endif
@ -122,6 +126,7 @@ conf_data.set10('HAVE_XWAYLAND', have_xwayland)
conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found()) conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found())
conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd') conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd')
conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind') conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind')
conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu')
conf_data.set10('HAVE_TRAY', have_tray) conf_data.set10('HAVE_TRAY', have_tray)
scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))

2
meson_options.txt
View file

@ -6,4 +6,4 @@ option('xwayland', type: 'feature', value: 'auto', description: 'Enable support
option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray') option('tray', type: 'feature', value: 'auto', description: 'Enable support for swaybar tray')
option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg') option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats in swaybg')
option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')
option('sd-bus-provider', type: 'combo', choices: ['auto', 'libsystemd', 'libelogind'], value: 'auto', description: 'Provider of the sd-bus library') option('sd-bus-provider', type: 'combo', choices: ['auto', 'libsystemd', 'libelogind', 'basu'], value: 'auto', description: 'Provider of the sd-bus library')