From 0cf0d64970b2595b08ea09ed33f406bf30b89eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 14 Dec 2022 09:50:22 +0100 Subject: [PATCH] =?UTF-8?q?meson:=20pipewire-specific=20=E2=80=98json?= =?UTF-8?q?=E2=80=99=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/meson.build | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/meson.build b/modules/meson.build index 279b050..5f34d00 100644 --- a/modules/meson.build +++ b/modules/meson.build @@ -18,6 +18,7 @@ plugin_battery_enabled = udev_battery.found() plugin_clock_enabled = get_option('plugin-clock').allowed() plugin_cpu_enabled = get_option('plugin-cpu').allowed() plugin_disk_io_enabled = get_option('plugin-disk-io').allowed() +plugin_dwl_enabled = get_option('plugin-dwl').allowed() plugin_mem_enabled = get_option('plugin-mem').allowed() mpd = dependency('libmpdclient', required: get_option('plugin-mpd')) @@ -29,18 +30,17 @@ plugin_i3_enabled = json_i3.found() plugin_label_enabled = get_option('plugin-label').allowed() plugin_network_enabled = get_option('plugin-network').allowed() -udev_removables = dependency('udev', required: get_option('plugin-removables')) -plugin_removables_enabled = udev_removables.found() - -plugin_script_enabled = get_option('plugin-script').allowed() - pipewire = dependency('libpipewire-0.3', required: get_option('plugin-pipewire')) -plugin_pipewire_enabled = pipewire.found() +json_pipewire = dependency('json-c', required: get_option('plugin-pipewire')) +plugin_pipewire_enabled = pipewire.found() and json_pipewire.found() pulse = dependency('libpulse', required: get_option('plugin-pulse')) plugin_pulse_enabled = pulse.found() -plugin_dwl_enabled = get_option('plugin-dwl').allowed() +udev_removables = dependency('udev', required: get_option('plugin-removables')) +plugin_removables_enabled = udev_removables.found() + +plugin_script_enabled = get_option('plugin-script').allowed() # Module name -> (source-list, dep-list) mod_data = { @@ -96,7 +96,7 @@ if plugin_network_enabled endif if plugin_pipewire_enabled - mod_data += {'pipewire': [[], [pipewire, dynlist, json]]} + mod_data += {'pipewire': [[], [pipewire, dynlist, json_pipewire]]} endif if plugin_pulse_enabled