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

[Meson] Fix all deprecation warnings

Browse source
This commit is contained in:
Nils Tonnätt 2021-08-01 19:43:05 +02:00 • committed by Wim Taymans
parent a5e3d3f7a7
commit f7e1175ef0
11 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/daemon/meson.build
View file

@ -17,11 +17,11 @@ conf_config.set('comment', '#')
conf_config_uninstalled = conf_config
conf_config_uninstalled.set('session_manager_path',
meson.build_root() / 'src' / 'examples' / 'pipewire-media-session')
meson.project_build_root() / 'src' / 'examples' / 'pipewire-media-session')
conf_config_uninstalled.set('pipewire_path',
meson.build_root() / 'src' / 'daemon' / 'pipewire')
meson.project_build_root() / 'src' / 'daemon' / 'pipewire')
conf_config_uninstalled.set('pipewire_pulse_path',
meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse')
meson.project_build_root() / 'src' / 'daemon' / 'pipewire-pulse')
conf_config_uninstalled.set('comment', '')
build_ms = get_option('session-managers').contains('media-session')
@ -48,9 +48,9 @@ elif build_wp
# 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')
meson.project_source_root() / 'subprojects' / 'wireplumber' / 'wp-uninstalled.sh')
conf_config_uninstalled.set('session_manager_args',
'-b ' + meson.build_root() / 'subprojects' / 'wireplumber' + ' wireplumber')
'-b ' + meson.project_build_root() / 'subprojects' / 'wireplumber' + ' wireplumber')
endif
endif
@ -96,7 +96,7 @@ custom_target('pipewire-uninstalled',
install: false,
input: pipewire_exec,
output: 'pipewire-uninstalled',
command: [ln, '-fs', meson.build_root() + '/@INPUT@', '@OUTPUT@'],
command: [ln, '-fs', meson.project_build_root() + '/@INPUT@', '@OUTPUT@'],
)
#desktop_file = i18n.merge_file(