Commit 975572c1 authored by Peter Hutterer's avatar Peter Hutterer
Browse files

daemon: fetch the wireplumber setup through meson

Rather than re-building the various paths, use the objects provided by
wireplumber's meson files.
parent c630438e
Pipeline #422238 passed with stages
in 4 minutes and 35 seconds
......@@ -43,15 +43,12 @@ elif default_sm == 'media-session'
conf_config_uninstalled.set('session_manager_path', pipewire_media_session.full_path())
conf_config_uninstalled.set('sm_comment', '')
elif default_sm == 'wireplumber'
wireplumber = wp_proj.get_variable('wireplumber')
wp_bindir = wp_proj.get_variable('wireplumber_bin_dir', pipewire_bindir)
conf_config.set('session_manager_path', wp_bindir / wireplumber.name())
conf_config.set('session_manager_path', wp_bindir / 'wireplumber')
# wp-uninstalled.sh -b path/to/wp/build/root wireplumber
conf_config_uninstalled.set('session_manager_path',
meson.source_root() / 'subprojects' / 'wireplumber' / 'wp-uninstalled.sh')
conf_config_uninstalled.set('session_manager_args',
'-b ' + meson.build_root() / 'subprojects' / 'wireplumber' + ' wireplumber')
wp_uninstalled = wp_proj.get_variable('wireplumber_uninstalled')
conf_config_uninstalled.set('session_manager_path', wp_uninstalled.full_path())
conf_config_uninstalled.set('sm_comment', '')
endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment