1 From 7bf582601f73c5f796b23a7cc2868424b03a0fd1 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 01/12] 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/tests/meson.build | 4 ++--
13 src/daemon/meson.build | 6 +++---
14 test/meson.build | 4 ++--
15 5 files changed, 28 insertions(+), 28 deletions(-)
17 diff --git a/doc/meson.build b/doc/meson.build
18 index 7e876bce5..95fecffc2 100644
22 doxyfile_conf = configuration_data()
23 doxyfile_conf.set('PACKAGE_NAME', meson.project_name())
24 doxyfile_conf.set('PACKAGE_VERSION', meson.project_version())
25 -doxyfile_conf.set('top_srcdir', meson.project_source_root())
26 -doxyfile_conf.set('top_builddir', meson.project_build_root())
27 +doxyfile_conf.set('top_srcdir', meson.source_root())
28 +doxyfile_conf.set('top_builddir', meson.build_root())
30 dot_found = find_program('dot', required: false).found()
31 summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs')
32 @@ -48,35 +48,35 @@ extra_docs = [
35 foreach extra : extra_docs
36 - inputs += meson.project_source_root() / 'doc' / extra
37 + inputs += meson.source_root() / 'doc' / extra
39 foreach h : pipewire_headers
40 - inputs += meson.project_source_root() / 'src' / 'pipewire' / h
41 + inputs += meson.source_root() / 'src' / 'pipewire' / h
43 foreach h : pipewire_ext_headers
44 - inputs += meson.project_source_root() / 'src' / 'pipewire' / 'extensions' / h
45 + inputs += meson.source_root() / 'src' / 'pipewire' / 'extensions' / h
47 foreach h : pipewire_ext_sm_headers
48 - inputs += meson.project_source_root() / 'src' / 'pipewire' / 'extensions' / h
49 + inputs += meson.source_root() / 'src' / 'pipewire' / 'extensions' / h
51 foreach h : pipewire_sources
52 - inputs += meson.project_source_root() / 'src' / 'pipewire' / h
53 + inputs += meson.source_root() / 'src' / 'pipewire' / h
55 foreach h : module_sources
56 - inputs += meson.project_source_root() / 'src' / 'modules' / h
57 + inputs += meson.source_root() / 'src' / 'modules' / h
59 -inputs += meson.project_source_root() / 'test' / 'pwtest.h'
60 -input_dirs = [ meson.project_source_root() / 'spa' / 'include' / 'spa' ]
61 +inputs += meson.source_root() / 'test' / 'pwtest.h'
62 +input_dirs = [ meson.source_root() / 'spa' / 'include' / 'spa' ]
65 - meson.project_source_root() / 'src',
66 - meson.project_source_root() / 'spa' / 'include',
67 - meson.project_source_root(),
68 + meson.source_root() / 'src',
69 + meson.source_root() / 'spa' / 'include',
70 + meson.source_root(),
74 - meson.project_source_root() / 'doc' / 'doxygen-awesome.css',
75 - meson.project_source_root() / 'doc' / 'custom.css'
76 + meson.source_root() / 'doc' / 'doxygen-awesome.css',
77 + meson.source_root() / 'doc' / 'custom.css'
80 # Example files (in order from simple to esoteric)
81 @@ -141,8 +141,8 @@ input_dirs += [ 'doc/pipewire-tools.dox' ]
82 doxyfile_conf.set('inputs', ' '.join(inputs + input_dirs))
83 doxyfile_conf.set('cssfiles', ' '.join(cssfiles))
84 doxyfile_conf.set('path_prefixes', ' '.join(path_prefixes))
85 -doxyfile_conf.set('c_input_filter', meson.project_source_root() / 'doc' / 'input-filter.sh')
86 -doxyfile_conf.set('h_input_filter', meson.project_source_root() / 'doc' / 'input-filter-h.sh')
87 +doxyfile_conf.set('c_input_filter', meson.source_root() / 'doc' / 'input-filter.sh')
88 +doxyfile_conf.set('h_input_filter', meson.source_root() / 'doc' / 'input-filter-h.sh')
90 doxyfile = configure_file(input: 'Doxyfile.in',
92 diff --git a/meson.build b/meson.build
93 index 440845e37..338192073 100644
96 @@ -247,9 +247,9 @@ includes_inc = include_directories('include')
97 pipewire_inc = include_directories('src')
99 makedata = configuration_data()
100 -makedata.set('BUILD_ROOT', meson.project_build_root())
101 -makedata.set('SOURCE_ROOT', meson.project_source_root())
102 -makedata.set('VERSION', pipewire_version)
103 + makedata.set('BUILD_ROOT', meson.build_root())
104 + makedata.set('SOURCE_ROOT', meson.source_root())
105 + makedata.set('VERSION', pipewire_version)
106 if version_arr.length() == 4
107 makedata.set('TAG', 'HEAD')
109 @@ -436,7 +436,7 @@ endif
110 setenv = find_program('pw-uninstalled.sh')
111 run_target('pw-uninstalled',
113 - '-b@0@'.format(meson.project_build_root()),
114 + '-b@0@'.format(meson.build_root()),
115 '-v@0@'.format(pipewire_version)]
118 diff --git a/spa/tests/meson.build b/spa/tests/meson.build
119 index c73c887f4..9c78dcbd2 100644
120 --- a/spa/tests/meson.build
121 +++ b/spa/tests/meson.build
122 @@ -5,7 +5,7 @@ find = find_program('find', required: false)
123 summary({'find (for header testing)': find.found()}, bool_yn: true, section: 'Optional programs')
125 spa_headers = run_command(find,
126 - meson.project_source_root() / 'spa' / 'include',
127 + meson.source_root() / 'spa' / 'include',
129 '-not', '-name', 'type-info.h',
131 @@ -41,7 +41,7 @@ foreach a : benchmark_apps
132 install_dir : installed_tests_execdir,
135 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable('plugindir')),
136 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
140 diff --git a/src/daemon/meson.build b/src/daemon/meson.build
141 index a2e4c55e3..647d7393d 100644
142 --- a/src/daemon/meson.build
143 +++ b/src/daemon/meson.build
144 @@ -18,9 +18,9 @@ conf_config.set('pulse_comment', '#')
146 conf_config_uninstalled = conf_config
147 conf_config_uninstalled.set('pipewire_path',
148 - meson.project_build_root() / 'src' / 'daemon' / 'pipewire')
149 + meson.build_root() / 'src' / 'daemon' / 'pipewire')
150 conf_config_uninstalled.set('pipewire_pulse_path',
151 - meson.project_build_root() / 'src' / 'daemon' / 'pipewire-pulse')
152 + meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse')
153 conf_config_uninstalled.set('pulse_comment', '')
155 build_ms = 'media-session' in get_option('session-managers')
156 @@ -106,7 +106,7 @@ custom_target('pipewire-uninstalled',
158 input: pipewire_exec,
159 output: 'pipewire-uninstalled',
160 - command: [ln, '-fs', meson.project_build_root() + '/@INPUT@', '@OUTPUT@'],
161 + command: [ln, '-fs', meson.build_root() + '/@INPUT@', '@OUTPUT@'],
164 #desktop_file = i18n.merge_file(
165 diff --git a/test/meson.build b/test/meson.build
166 index 74908d587..eca92eb24 100644
167 --- a/test/meson.build
168 +++ b/test/meson.build
169 @@ -14,8 +14,8 @@ pwtest_deps = [
173 - '-DBUILD_ROOT="@0@"'.format(meson.project_build_root()),
174 - '-DSOURCE_ROOT="@0@"'.format(meson.project_source_root()),
175 + '-DBUILD_ROOT="@0@"'.format(meson.build_root()),
176 + '-DSOURCE_ROOT="@0@"'.format(meson.source_root()),