1 From cf7b3a0db10cf0bcd140800ef547199703fdf16e Mon Sep 17 00:00:00 2001
2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
3 Date: Thu, 24 Feb 2022 11:54:54 +0530
4 Subject: [PATCH 05/12] Revert "treewide: meson.build: get SPA_PLUGIN_DIR from
7 This reverts commit 26eb66fb5b56bb5534745a8e223bd099cf5fe4fa.
8 Upstream-Status: Inappropriate[meson version dependent]
11 spa/plugins/audioconvert/meson.build | 4 ++--
12 spa/tests/meson.build | 2 +-
13 src/modules/meson.build | 13 +++----------
14 src/tests/meson.build | 6 +++---
15 5 files changed, 11 insertions(+), 18 deletions(-)
17 diff --git a/meson.build b/meson.build
18 index 7040e39ac..1b87bd004 100644
21 @@ -448,8 +448,8 @@ srcdir = meson.project_source_root()
22 devenv.set('PIPEWIRE_CONFIG_DIR', pipewire_dep.get_variable(internal: 'confdatadir'))
23 devenv.set('PIPEWIRE_MODULE_DIR', pipewire_dep.get_variable(internal: 'moduledir'))
25 -devenv.set('SPA_PLUGIN_DIR', spa_dep.get_variable(internal: 'plugindir'))
26 -devenv.set('SPA_DATA_DIR', spa_dep.get_variable(internal: 'datadir'))
27 + devenv.set('SPA_PLUGIN_DIR', builddir / 'spa' / 'plugins')
28 + devenv.set('SPA_DATA_DIR', srcdir / 'spa' / 'plugins')
30 devenv.set('GST_PLUGIN_PATH', builddir / 'src'/ 'gst')
32 diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
33 index 42332a538..3aa0f3846 100644
34 --- a/spa/plugins/audioconvert/meson.build
35 +++ b/spa/plugins/audioconvert/meson.build
36 @@ -140,7 +140,7 @@ foreach a : test_apps
37 install : installed_tests_enabled,
38 install_dir : installed_tests_execdir / 'audioconvert'),
40 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
41 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
44 if installed_tests_enabled
45 @@ -170,7 +170,7 @@ foreach a : benchmark_apps
46 install : installed_tests_enabled,
47 install_dir : installed_tests_execdir / 'audioconvert'),
49 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
50 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
53 if installed_tests_enabled
54 diff --git a/spa/tests/meson.build b/spa/tests/meson.build
55 index 0b26fdf02..d995cfaa4 100644
56 --- a/spa/tests/meson.build
57 +++ b/spa/tests/meson.build
58 @@ -42,7 +42,7 @@ foreach a : benchmark_apps
59 install_dir : installed_tests_execdir,
62 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
63 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
67 diff --git a/src/modules/meson.build b/src/modules/meson.build
68 index c1225e3e0..bd7d3f711 100644
69 --- a/src/modules/meson.build
70 +++ b/src/modules/meson.build
71 @@ -140,12 +140,6 @@ pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ],
72 install_rpath: modules_install_dir,
73 dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep],
76 -# TODO: This serves as a temporary alias to prevent breaking existing setups
77 -# while `module-rtkit` is being migrated to `module-rt`
78 -pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rt.c' ],
79 - include_directories : [configinc],
82 summary({'rt': build_module_rt}, bool_yn: true, section: 'Optional Modules')
84 @@ -153,7 +147,6 @@ build_module_rtkit = dbus_dep.found()
86 pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit.c' ],
87 include_directories : [configinc, spa_inc],
88 ->>>>>>> Revert "treewide: meson.build: use dependency variable for SPA"
90 install_dir : modules_install_dir,
91 install_rpath: modules_install_dir,
92 @@ -372,9 +365,9 @@ test('pw-test-protocol-native',
93 install_dir : installed_tests_execdir,
96 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
97 - 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')),
98 - 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')),
99 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
100 + 'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()),
101 + 'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root())
105 diff --git a/src/tests/meson.build b/src/tests/meson.build
106 index 3e8d05012..9a595d431 100644
107 --- a/src/tests/meson.build
108 +++ b/src/tests/meson.build
109 @@ -13,9 +13,9 @@ foreach a : test_apps
110 install : installed_tests_enabled,
111 install_dir : installed_tests_execdir),
113 - 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
114 - 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')),
115 - 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')),
116 + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
117 + 'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()),
118 + 'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root())
121 if installed_tests_enabled