1 From e850a4c080c80fc218224521727996062ebb9487 Mon Sep 17 00:00:00 2001
2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
3 Date: Fri, 14 Jan 2022 16:12:55 +0530
4 Subject: [PATCH 1/4] Revert "treewide: meson.build: use
5 project_{build,source}_root()"
7 This reverts commit 8ed46a283fa1f8623b940eaeb9f7cbcc52eebf0e.
8 Upstream-Status: Inappropriate[meson version dependent]
10 doc/meson.build | 34 ++++++++++++++--------------
11 meson.build | 8 +++----
12 spa/plugins/audioconvert/meson.build | 4 ++--
13 spa/tests/meson.build | 4 ++--
14 src/daemon/meson.build | 6 ++---
15 src/modules/meson.build | 6 ++---
16 src/tests/meson.build | 6 ++---
17 test/meson.build | 4 ++--
18 8 files changed, 36 insertions(+), 36 deletions(-)
20 diff --git a/doc/meson.build b/doc/meson.build
21 index 0e6d7f8e3..082780145 100644
25 doxyfile_conf = configuration_data()
26 doxyfile_conf.set('PACKAGE_NAME', meson.project_name())
27 doxyfile_conf.set('PACKAGE_VERSION', meson.project_version())
28 -doxyfile_conf.set('top_srcdir', meson.project_source_root())
29 -doxyfile_conf.set('top_builddir', meson.project_build_root())
30 +doxyfile_conf.set('top_srcdir', meson.source_root())
31 +doxyfile_conf.set('top_builddir', meson.build_root())
33 dot_found = find_program('dot', required: false).found()
34 summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs')
35 @@ -49,35 +49,35 @@ extra_docs = [
38 foreach extra : extra_docs
39 - inputs += meson.project_source_root() / 'doc' / extra
40 + inputs += meson.source_root() / 'doc' / extra
42 foreach h : pipewire_headers
43 - inputs += meson.project_source_root() / 'src' / 'pipewire' / h
44 + inputs += meson.source_root() / 'src' / 'pipewire' / h
46 foreach h : pipewire_ext_headers
47 - inputs += meson.project_source_root() / 'src' / 'pipewire' / 'extensions' / h
48 + inputs += meson.source_root() / 'src' / 'pipewire' / 'extensions' / h
50 foreach h : pipewire_ext_sm_headers
51 - inputs += meson.project_source_root() / 'src' / 'pipewire' / 'extensions' / h
52 + inputs += meson.source_root() / 'src' / 'pipewire' / 'extensions' / h
54 foreach h : pipewire_sources
55 - inputs += meson.project_source_root() / 'src' / 'pipewire' / h
56 + inputs += meson.source_root() / 'src' / 'pipewire' / h
58 foreach h : module_sources
59 - inputs += meson.project_source_root() / 'src' / 'modules' / h
60 + inputs += meson.source_root() / 'src' / 'modules' / h
62 -inputs += meson.project_source_root() / 'test' / 'pwtest.h'
63 -input_dirs = [ meson.project_source_root() / 'spa' / 'include' / 'spa' ]
64 +inputs += meson.source_root() / 'test' / 'pwtest.h'
65 +input_dirs = [ meson.source_root() / 'spa' / 'include' / 'spa' ]
68 - meson.project_source_root() / 'src',
69 - meson.project_source_root() / 'spa' / 'include',
70 - meson.project_source_root(),
71 + meson.source_root() / 'src',
72 + meson.source_root() / 'spa' / 'include',
73 + meson.source_root(),
77 - meson.project_source_root() / 'doc' / 'doxygen-awesome.css',
78 - meson.project_source_root() / 'doc' / 'custom.css'
79 + meson.source_root() / 'doc' / 'doxygen-awesome.css',
80 + meson.source_root() / 'doc' / 'custom.css'
83 # Example files (in order from simple to esoteric)
84 @@ -118,8 +118,8 @@ input_dirs += [ 'doc/examples.dox' ]
85 doxyfile_conf.set('inputs', ' '.join(inputs + input_dirs))
86 doxyfile_conf.set('cssfiles', ' '.join(cssfiles))
87 doxyfile_conf.set('path_prefixes', ' '.join(path_prefixes))
88 -doxyfile_conf.set('c_input_filter', meson.project_source_root() / 'doc' / 'input-filter.sh')
89 -doxyfile_conf.set('h_input_filter', meson.project_source_root() / 'doc' / 'input-filter-h.sh')
90 +doxyfile_conf.set('c_input_filter', meson.source_root() / 'doc' / 'input-filter.sh')
91 +doxyfile_conf.set('h_input_filter', meson.source_root() / 'doc' / 'input-filter-h.sh')
93 doxyfile = configure_file(input: 'Doxyfile.in',
95 diff --git a/meson.build b/meson.build
96 index b1ea32f7a..67e697c15 100644
99 @@ -304,9 +304,9 @@ includes_inc = include_directories('include')
100 pipewire_inc = include_directories('src')
102 makedata = configuration_data()
103 -makedata.set('BUILD_ROOT', meson.project_build_root())
104 -makedata.set('SOURCE_ROOT', meson.project_source_root())
105 -makedata.set('VERSION', pipewire_version)
106 + makedata.set('BUILD_ROOT', meson.build_root())
107 + makedata.set('SOURCE_ROOT', meson.source_root())
108 + makedata.set('VERSION', pipewire_version)
109 if version_arr.length() == 4
110 makedata.set('TAG', 'HEAD')
112 @@ -498,7 +498,7 @@ endif
113 setenv = find_program('pw-uninstalled.sh')
114 run_target('pw-uninstalled',
116 - '-b@0@'.format(meson.project_build_root()),
117 + '-b@0@'.format(meson.build_root()),
118 '-v@0@'.format(pipewire_version)]
121 diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
122 index de9f491af..4d15271f5 100644
123 --- a/spa/plugins/audioconvert/meson.build
124 +++ b/spa/plugins/audioconvert/meson.build
125 @@ -140,7 +140,7 @@ foreach a : test_apps
126 install : installed_tests_enabled,
127 install_dir : installed_tests_execdir / 'audioconvert'),
129 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
130 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
133 if installed_tests_enabled
134 @@ -170,7 +170,7 @@ foreach a : benchmark_apps
135 install : installed_tests_enabled,
136 install_dir : installed_tests_execdir / 'audioconvert'),
138 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
139 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
142 if installed_tests_enabled
143 diff --git a/spa/tests/meson.build b/spa/tests/meson.build
144 index 990df87bd..9e2a211e2 100644
145 --- a/spa/tests/meson.build
146 +++ b/spa/tests/meson.build
147 @@ -5,7 +5,7 @@ find = find_program('find', required: false)
148 summary({'find (for header testing)': find.found()}, bool_yn: true, section: 'Optional programs')
150 spa_headers = run_command(find,
151 - meson.project_source_root() / 'spa' / 'include',
152 + meson.source_root() / 'spa' / 'include',
154 '-not', '-name', 'type-info.h',
156 @@ -40,7 +40,7 @@ foreach a : benchmark_apps
157 install_dir : installed_tests_execdir,
160 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
161 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
165 diff --git a/src/daemon/meson.build b/src/daemon/meson.build
166 index 44a574337..5e64287a1 100644
167 --- a/src/daemon/meson.build
168 +++ b/src/daemon/meson.build
169 @@ -18,9 +18,9 @@ conf_config.set('pulse_comment', '#')
171 conf_config_uninstalled = conf_config
172 conf_config_uninstalled.set('pipewire_path',
173 - meson.project_build_root() / 'src' / 'daemon' / 'pipewire')
174 + meson.build_root() / 'src' / 'daemon' / 'pipewire')
175 conf_config_uninstalled.set('pipewire_pulse_path',
176 - meson.project_build_root() / 'src' / 'daemon' / 'pipewire-pulse')
177 + meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse')
178 conf_config_uninstalled.set('pulse_comment', '')
180 build_ms = 'media-session' in get_option('session-managers')
181 @@ -105,7 +105,7 @@ custom_target('pipewire-uninstalled',
183 input: pipewire_exec,
184 output: 'pipewire-uninstalled',
185 - command: [ln, '-fs', meson.project_build_root() + '/@INPUT@', '@OUTPUT@'],
186 + command: [ln, '-fs', meson.build_root() + '/@INPUT@', '@OUTPUT@'],
189 #desktop_file = i18n.merge_file(
190 diff --git a/src/modules/meson.build b/src/modules/meson.build
191 index 93dc70173..45852f3b9 100644
192 --- a/src/modules/meson.build
193 +++ b/src/modules/meson.build
194 @@ -370,9 +370,9 @@ test('pw-test-protocol-native',
195 install_dir : installed_tests_execdir,
198 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
199 - 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')),
200 - 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')),
201 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
202 + 'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
203 + 'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
207 diff --git a/src/tests/meson.build b/src/tests/meson.build
208 index 3e8d05012..1b03967fb 100644
209 --- a/src/tests/meson.build
210 +++ b/src/tests/meson.build
211 @@ -13,9 +13,9 @@ foreach a : test_apps
212 install : installed_tests_enabled,
213 install_dir : installed_tests_execdir),
215 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
216 - 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')),
217 - 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')),
218 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
219 + 'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
220 + 'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
223 if installed_tests_enabled
224 diff --git a/test/meson.build b/test/meson.build
225 index 20bdcb210..89f2bc2ec 100644
226 --- a/test/meson.build
227 +++ b/test/meson.build
228 @@ -14,8 +14,8 @@ pwtest_deps = [
232 - '-DBUILD_ROOT="@0@"'.format(meson.project_build_root()),
233 - '-DSOURCE_ROOT="@0@"'.format(meson.project_source_root()),
234 + '-DBUILD_ROOT="@0@"'.format(meson.build_root()),
235 + '-DSOURCE_ROOT="@0@"'.format(meson.source_root()),