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

Revert "[Meson] Fix all deprecation warnings"

Browse source 
This reverts commit f7e1175ef0.
This commit is contained in:
Nils Tonnätt 2021-08-06 16:23:12 +02:00 • committed by Wim Taymans
parent 090aaa4fb0
commit dd12910769
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.project_build_root() / 'src' / 'examples' / 'pipewire-media-session')
meson.build_root() / 'src' / 'examples' / 'pipewire-media-session')
conf_config_uninstalled.set('pipewire_path',
meson.project_build_root() / 'src' / 'daemon' / 'pipewire')
meson.build_root() / 'src' / 'daemon' / 'pipewire')
conf_config_uninstalled.set('pipewire_pulse_path',
meson.project_build_root() / 'src' / 'daemon' / 'pipewire-pulse')
meson.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.project_source_root() / 'subprojects' / 'wireplumber' / 'wp-uninstalled.sh')
meson.source_root() / 'subprojects' / 'wireplumber' / 'wp-uninstalled.sh')
conf_config_uninstalled.set('session_manager_args',
'-b ' + meson.project_build_root() / 'subprojects' / 'wireplumber' + ' wireplumber')
'-b ' + meson.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.project_build_root() + '/@INPUT@', '@OUTPUT@'],
command: [ln, '-fs', meson.build_root() + '/@INPUT@', '@OUTPUT@'],
)
#desktop_file = i18n.merge_file(

2
src/daemon/systemd/system/meson.build
View file

@ -1,4 +1,4 @@
systemd_system_services_dir = systemd.get_variable(pkgconfig : 'systemdsystemunitdir', pkgconfig_define : [ 'prefix', prefix])
systemd_system_services_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir', define_variable : [ 'prefix', prefix])
install_data(sources : 'pipewire.socket',
install_dir : systemd_system_services_dir)

2
src/daemon/systemd/user/meson.build
View file

@ -1,4 +1,4 @@
systemd_user_services_dir = systemd.get_variable(pkgconfig : 'systemduserunitdir', pkgconfig_define : [ 'prefix', prefix])
systemd_user_services_dir = systemd.get_pkgconfig_variable('systemduserunitdir', define_variable : [ 'prefix', prefix])
if get_option('systemd-user-unit-dir') != ''
systemd_user_services_dir = get_option('systemd-user-unit-dir')
endif

6
src/modules/meson.build
View file

@ -307,9 +307,9 @@ test('pw-test-protocol-native',
install : installed_tests_enabled,
install_dir : installed_tests_execdir),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root())
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
])
if installed_tests_enabled

6
src/tests/meson.build
View file

@ -13,9 +13,9 @@ foreach a : test_apps
install : installed_tests_enabled,
install_dir : installed_tests_execdir),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root())
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
])
if installed_tests_enabled