1 From 82c58fbde3d85465dc4b6e0af460124f67d1e485 Mon Sep 17 00:00:00 2001
2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
3 Date: Thu, 24 Feb 2022 11:36:15 +0530
4 Subject: [PATCH 04/12] Revert "treewide: meson.build: simplify
5 `get_variable()` calls"
7 This reverts commit ec465966bcc783203041de09dce5c315bb0a6f76.
8 Upstream-Status: Inappropriate[meson version dependent]
10 meson.build | 8 ++++----
11 spa/plugins/audioconvert/meson.build | 4 ++--
12 spa/tests/meson.build | 2 +-
13 src/daemon/systemd/system/meson.build | 2 +-
14 src/daemon/systemd/user/meson.build | 2 +-
15 src/modules/meson.build | 6 +++---
16 src/tests/meson.build | 6 +++---
17 7 files changed, 15 insertions(+), 15 deletions(-)
19 diff --git a/meson.build b/meson.build
20 index 9d806198a..7040e39ac 100644
23 @@ -445,11 +445,11 @@ devenv = environment()
24 builddir = meson.project_build_root()
25 srcdir = meson.project_source_root()
27 -devenv.set('PIPEWIRE_CONFIG_DIR', pipewire_dep.get_variable('confdatadir'))
28 -devenv.set('PIPEWIRE_MODULE_DIR', pipewire_dep.get_variable('moduledir'))
29 +devenv.set('PIPEWIRE_CONFIG_DIR', pipewire_dep.get_variable(internal: 'confdatadir'))
30 +devenv.set('PIPEWIRE_MODULE_DIR', pipewire_dep.get_variable(internal: 'moduledir'))
32 -devenv.set('SPA_PLUGIN_DIR', spa_dep.get_variable('plugindir'))
33 -devenv.set('SPA_DATA_DIR', spa_dep.get_variable('datadir'))
34 +devenv.set('SPA_PLUGIN_DIR', spa_dep.get_variable(internal: 'plugindir'))
35 +devenv.set('SPA_DATA_DIR', spa_dep.get_variable(internal: 'datadir'))
37 devenv.set('GST_PLUGIN_PATH', builddir / 'src'/ 'gst')
39 diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
40 index 55e88ccc4..42332a538 100644
41 --- a/spa/plugins/audioconvert/meson.build
42 +++ b/spa/plugins/audioconvert/meson.build
43 @@ -140,7 +140,7 @@ foreach a : test_apps
44 install : installed_tests_enabled,
45 install_dir : installed_tests_execdir / 'audioconvert'),
47 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable('plugindir')),
48 + 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
51 if installed_tests_enabled
52 @@ -170,7 +170,7 @@ foreach a : benchmark_apps
53 install : installed_tests_enabled,
54 install_dir : installed_tests_execdir / 'audioconvert'),
56 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable('plugindir')),
57 + 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
60 if installed_tests_enabled
61 diff --git a/spa/tests/meson.build b/spa/tests/meson.build
62 index ea00a2cfe..0b26fdf02 100644
63 --- a/spa/tests/meson.build
64 +++ b/spa/tests/meson.build
65 @@ -42,7 +42,7 @@ foreach a : benchmark_apps
66 install_dir : installed_tests_execdir,
69 - 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
70 + 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
74 diff --git a/src/daemon/systemd/system/meson.build b/src/daemon/systemd/system/meson.build
75 index 84ca0b068..b3e5f1f41 100644
76 --- a/src/daemon/systemd/system/meson.build
77 +++ b/src/daemon/systemd/system/meson.build
79 -systemd_system_services_dir = systemd.get_variable('systemdsystemunitdir', pkgconfig_define : [ 'rootprefix', prefix])
80 +systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir', pkgconfig_define : [ 'rootprefix', prefix])
81 if get_option('systemd-system-unit-dir') != ''
82 systemd_system_services_dir = get_option('systemd-system-unit-dir')
84 diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
85 index d17f3794f..a24f9b174 100644
86 --- a/src/daemon/systemd/user/meson.build
87 +++ b/src/daemon/systemd/user/meson.build
89 -systemd_user_services_dir = systemd.get_variable('systemduserunitdir', pkgconfig_define : [ 'prefix', prefix])
90 +systemd_user_services_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir', pkgconfig_define : [ 'prefix', prefix])
91 if get_option('systemd-user-unit-dir') != ''
92 systemd_user_services_dir = get_option('systemd-user-unit-dir')
94 diff --git a/src/modules/meson.build b/src/modules/meson.build
95 index ba30275ab..c1225e3e0 100644
96 --- a/src/modules/meson.build
97 +++ b/src/modules/meson.build
98 @@ -372,9 +372,9 @@ test('pw-test-protocol-native',
99 install_dir : installed_tests_execdir,
102 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable('plugindir')),
103 - 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable('confdatadir')),
104 - 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable('moduledir')),
105 + 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
106 + 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')),
107 + 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')),
111 diff --git a/src/tests/meson.build b/src/tests/meson.build
112 index 3e03a4c75..3e8d05012 100644
113 --- a/src/tests/meson.build
114 +++ b/src/tests/meson.build
115 @@ -13,9 +13,9 @@ foreach a : test_apps
116 install : installed_tests_enabled,
117 install_dir : installed_tests_execdir),
119 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable('plugindir')),
120 - 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable('confdatadir')),
121 - 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable('moduledir')),
122 + 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
123 + 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')),
124 + 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')),
127 if installed_tests_enabled