From d5825b8551c34cefabf278a6b5ed04bc6ab0f301 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 21 Oct 2021 13:59:31 +1000 Subject: [PATCH] meson: use meson variables for the SMs' uninstalled scripts Both wireplumber and media-session have a meson variable now that represents the -uninstalled script, complete with filled-in BUILDDIR etc. Let's use those variables for pipewire-uninstalled.conf so we don't have to fill in the paths here. --- src/daemon/meson.build | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/daemon/meson.build b/src/daemon/meson.build index 648981ef5..4d01f9c16 100644 --- a/src/daemon/meson.build +++ b/src/daemon/meson.build @@ -46,21 +46,17 @@ elif default_sm == 'media-session' ms_bindir = ms_proj.get_variable('media_session_bin_dir', pipewire_bindir) conf_config.set('session_manager_path', ms_bindir / 'pipewire-media-session') - conf_config_uninstalled.set('session_manager_path', - meson.source_root() / 'subprojects' / 'media-session' / 'media-session-uninstalled.sh') - conf_config_uninstalled.set('session_manager_args', - '-b ' + meson.build_root() / 'subprojects' / 'media-session' + ' pipewire-media-session') + ms_uninstalled = ms_proj.get_variable('media_session_uninstalled') + conf_config_uninstalled.set('session_manager_path', ms_uninstalled.full_path()) + conf_config_uninstalled.set('session_manager_args', 'pipewire-media-session') conf_config_uninstalled.set('sm_comment', '') elif default_sm == 'wireplumber' wp_bindir = wp_proj.get_variable('wireplumber_bin_dir', pipewire_bindir) - 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('session_manager_args', 'wireplumber') conf_config_uninstalled.set('sm_comment', '') endif