external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-25 13:25:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
haruInDisguise 2024-11-17 23:22:29 +01:00
parent b55d5a6739
commit 0d7a05af55
5 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

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

13
modules/dbus.h Normal file
View file

@ -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

4
modules/meson.build
View file

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

2
modules/mpris.c
View file

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

3
subprojects/basu.wrap
View file

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