1 From 70e750804a700b06f62f91411d487b88e7c85fe5 Mon Sep 17 00:00:00 2001
2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
3 Date: Fri, 26 Nov 2021 06:18:04 +0530
4 Subject: [PATCH] Revert "meson: declare spa_dep and override_dependency() for
7 This reverts commit 7ab5c35cadc075bcdf44031f1f7d95352cf9a13b.
9 Upstream-Status: Inappropriate[meson version dependent]
13 spa/meson.build | 7 -------
14 src/pipewire/meson.build | 10 ++--------
15 3 files changed, 3 insertions(+), 16 deletions(-)
17 diff --git a/meson.build b/meson.build
18 index 4a572bd42..4af179c87 100644
22 project('pipewire', ['c' ],
24 license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
25 - meson_version : '>= 0.54.0',
26 + meson_version : '>= 0.49.0',
27 default_options : [ 'warning_level=3',
30 diff --git a/spa/meson.build b/spa/meson.build
31 index 483536b54..74ee5a737 100644
34 @@ -63,12 +63,6 @@ if not get_option('examples').disabled()
38 -spa_dep = declare_dependency(
39 - include_directories : [spa_inc],
40 - version : spaversion,
41 - variables : { 'plugindir' : meson.current_build_dir() / 'plugins' }
44 pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
47 @@ -79,4 +73,3 @@ pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
48 uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
51 -meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
52 diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
53 index f66ce8746..5cfaba3f9 100644
54 --- a/src/pipewire/meson.build
55 +++ b/src/pipewire/meson.build
56 @@ -109,12 +109,8 @@ libpipewire = shared_library(pipewire_name, pipewire_sources,
59 pipewire_dep = declare_dependency(link_with : libpipewire,
60 - include_directories : [pipewire_inc, configinc],
61 - dependencies : [pthread_lib, atomic_dep, spa_dep],
63 - 'moduledir' : meson.current_build_dir() / '..' / 'modules',
64 - 'confdatadir' : meson.current_build_dir() / '..' / 'daemon',
66 + include_directories : [pipewire_inc, configinc, spa_inc],
67 + dependencies : [pthread_lib, atomic_dep, ],
70 pkgconfig.generate(libpipewire,
71 @@ -132,6 +128,4 @@ pkgconfig.generate(libpipewire,
75 -meson.override_dependency('lib@0@'.format(pipewire_name), pipewire_dep)