pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

meson: make ‘clock’ plugin compile time optional

Browse source
This commit is contained in:
Daniel Eklöf 2022-12-14 09:28:42 +01:00
parent aeef3eca0e
commit 25e123fbe6
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -135,6 +135,7 @@ yambar = executable(
plugin_alsa_enabled ? '-DPLUGIN_ENABLED_ALSA' : [], plugin_alsa_enabled ? '-DPLUGIN_ENABLED_ALSA' : [],
plugin_backlight_enabled ? '-DPLUGIN_ENABLED_BACKLIGHT' : [], plugin_backlight_enabled ? '-DPLUGIN_ENABLED_BACKLIGHT' : [],
plugin_battery_enabled ? '-DPLUGIN_ENABLED_BATTERY' : [], plugin_battery_enabled ? '-DPLUGIN_ENABLED_BATTERY' : [],
plugin_clock_enabled ? '-DPLUGIN_ENABLED_CLOCK' : [],
plugin_dwl_enabled ? '-DPLUGIN_ENABLED_DWL' : [], plugin_dwl_enabled ? '-DPLUGIN_ENABLED_DWL' : [],
plugin_mpd_enabled ? '-DPLUGIN_ENABLED_MPD' : [], plugin_mpd_enabled ? '-DPLUGIN_ENABLED_MPD' : [],
plugin_pipewire_enabled ? '-DPLUGIN_ENABLED_PIPEWIRE' : [], plugin_pipewire_enabled ? '-DPLUGIN_ENABLED_PIPEWIRE' : [],
@ -180,6 +181,7 @@ summary(
'ALSA': plugin_alsa_enabled, 'ALSA': plugin_alsa_enabled,
'Backlight': plugin_backlight_enabled, 'Backlight': plugin_backlight_enabled,
'Battery': plugin_battery_enabled, 'Battery': plugin_battery_enabled,
'Clock': plugin_clock_enabled,
'DWL (dwm for Wayland)': plugin_dwl_enabled, 'DWL (dwm for Wayland)': plugin_dwl_enabled,
'Music Player Daemon (MPD)': plugin_mpd_enabled, 'Music Player Daemon (MPD)': plugin_mpd_enabled,
'Pipewire': plugin_pipewire_enabled, 'Pipewire': plugin_pipewire_enabled,

2
meson_options.txt
View file

@ -12,6 +12,8 @@ option('plugin-backlight', type: 'feature', value: 'auto',
description: 'Backlight support') description: 'Backlight support')
option('plugin-battery', type: 'feature', value: 'auto', option('plugin-battery', type: 'feature', value: 'auto',
description: 'Battery support') description: 'Battery support')
option('plugin-clock', type: 'feature', value: 'auto',
description: 'Clock support')
option('plugin-dwl', type: 'feature', value: 'auto', option('plugin-dwl', type: 'feature', value: 'auto',
description: 'DWL (dwm for wayland) support') description: 'DWL (dwm for wayland) support')
option('plugin-mpd', type: 'feature', value: 'auto', option('plugin-mpd', type: 'feature', value: 'auto',

7
modules/meson.build
View file

@ -16,6 +16,8 @@ plugin_backlight_enabled = udev_backlight.found()
udev_battery = dependency('libudev', required: get_option('plugin-battery')) udev_battery = dependency('libudev', required: get_option('plugin-battery'))
plugin_battery_enabled = udev_battery.found() plugin_battery_enabled = udev_battery.found()
plugin_clock_enabled = get_option('plugin-clock').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()
@ -29,7 +31,6 @@ plugin_dwl_enabled = get_option('plugin-dwl').allowed()
# Module name -> (source-list, dep-list) # Module name -> (source-list, dep-list)
mod_data = { mod_data = {
'clock': [[], []],
'cpu': [[], []], 'cpu': [[], []],
'disk-io': [[], [dynlist]], 'disk-io': [[], [dynlist]],
'mem': [[], []], 'mem': [[], []],
@ -53,6 +54,10 @@ if plugin_battery_enabled
mod_data += {'battery': [[], [udev_battery]]} mod_data += {'battery': [[], [udev_battery]]}
endif endif
if plugin_clock_enabled
mod_data += {'clock': [[], []]}
endif
if plugin_dwl_enabled if plugin_dwl_enabled
mod_data += {'dwl': [[], [dynlist]]} mod_data += {'dwl': [[], [dynlist]]}
endif endif

4
plugin.c
View file

@ -41,7 +41,9 @@ EXTERN_MODULE(backlight);
#if defined(PLUGIN_ENABLED_BATTERY) #if defined(PLUGIN_ENABLED_BATTERY)
EXTERN_MODULE(battery); EXTERN_MODULE(battery);
#endif #endif
#if defined(PLUGIN_ENABLED_CLOCK)
EXTERN_MODULE(clock); EXTERN_MODULE(clock);
#endif
EXTERN_MODULE(disk_io); EXTERN_MODULE(disk_io);
#if defined(PLUGIN_ENABLED_DWL) #if defined(PLUGIN_ENABLED_DWL)
EXTERN_MODULE(dwl); EXTERN_MODULE(dwl);
@ -139,7 +141,9 @@ init(void)
#if defined(PLUGIN_ENABLED_BATTERY) #if defined(PLUGIN_ENABLED_BATTERY)
REGISTER_CORE_MODULE(battery, battery); REGISTER_CORE_MODULE(battery, battery);
#endif #endif
#if defined(PLUGIN_ENABLED_CLOCK)
REGISTER_CORE_MODULE(clock, clock); REGISTER_CORE_MODULE(clock, clock);
#endif
REGISTER_CORE_MODULE(disk-io, disk_io); REGISTER_CORE_MODULE(disk-io, disk_io);
#if defined(PLUGIN_ENABLED_DWL) #if defined(PLUGIN_ENABLED_DWL)
REGISTER_CORE_MODULE(dwl, dwl); REGISTER_CORE_MODULE(dwl, dwl);