mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-08 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: use meson variables for the SMs' uninstalled scripts

Browse source 
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.
This commit is contained in:
Peter Hutterer 2021-10-21 13:59:31 +10:00 • committed by Wim Taymans
parent 1ac57e6e15
commit d5825b8551
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/daemon/meson.build
View file

@ -46,21 +46,17 @@ elif default_sm == 'media-session'
ms_bindir = ms_proj.get_variable('media_session_bin_dir', pipewire_bindir) 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.set('session_manager_path', ms_bindir / 'pipewire-media-session')
conf_config_uninstalled.set('session_manager_path', ms_uninstalled = ms_proj.get_variable('media_session_uninstalled')
meson.source_root() / 'subprojects' / 'media-session' / 'media-session-uninstalled.sh') conf_config_uninstalled.set('session_manager_path', ms_uninstalled.full_path())
conf_config_uninstalled.set('session_manager_args', conf_config_uninstalled.set('session_manager_args', 'pipewire-media-session')
'-b ' + meson.build_root() / 'subprojects' / 'media-session' + ' pipewire-media-session')
conf_config_uninstalled.set('sm_comment', '') conf_config_uninstalled.set('sm_comment', '')
elif default_sm == 'wireplumber' elif default_sm == 'wireplumber'
wp_bindir = wp_proj.get_variable('wireplumber_bin_dir', pipewire_bindir) wp_bindir = wp_proj.get_variable('wireplumber_bin_dir', pipewire_bindir)
conf_config.set('session_manager_path', wp_bindir / 'wireplumber') conf_config.set('session_manager_path', wp_bindir / 'wireplumber')
# wp-uninstalled.sh -b path/to/wp/build/root wireplumber wp_uninstalled = wp_proj.get_variable('wireplumber_uninstalled')
conf_config_uninstalled.set('session_manager_path', conf_config_uninstalled.set('session_manager_path', wp_uninstalled.full_path())
meson.source_root() / 'subprojects' / 'wireplumber' / 'wp-uninstalled.sh') conf_config_uninstalled.set('session_manager_args', 'wireplumber')
conf_config_uninstalled.set('session_manager_args',
'-b ' + meson.build_root() / 'subprojects' / 'wireplumber' + ' wireplumber')
conf_config_uninstalled.set('sm_comment', '') conf_config_uninstalled.set('sm_comment', '')
endif endif