1 From 83b7f6457e5dca3ee2145e35f361f1520d24be42 Mon Sep 17 00:00:00 2001
2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
3 Date: Fri, 14 Jan 2022 18:30:44 +0530
4 Subject: [PATCH 3/4] Revert "meson: declare spa_dep and override_dependency()
7 This reverts commit 7ab5c35cadc075bcdf44031f1f7d95352cf9a13b.
9 Upstream-Status: Inappropriate[meson version dependent]
12 spa/meson.build | 13 +------------
13 src/pipewire/meson.build | 10 ++--------
14 3 files changed, 4 insertions(+), 21 deletions(-)
16 diff --git a/meson.build b/meson.build
17 index 67e697c15..476f722b7 100644
21 project('pipewire', ['c' ],
23 license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
24 - meson_version : '>= 0.56.0',
25 + meson_version : '>= 0.49.0',
26 default_options : [ 'warning_level=3',
29 diff --git a/spa/meson.build b/spa/meson.build
30 index 2717b86d6..4e0f96727 100644
33 @@ -56,20 +56,9 @@ if not get_option('examples').disabled()
37 -spa_dep = declare_dependency(
38 - include_directories : [spa_inc],
39 - version : spaversion,
40 - variables : { 'plugindir' : meson.current_build_dir() / 'plugins' }
43 pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
46 description : 'Simple Plugin API',
48 - extra_cflags : '-D_REENTRANT',
49 - variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
50 - uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
53 -meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
54 + extra_cflags : '-D_REENTRANT')
55 diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
56 index f66ce8746..5cfaba3f9 100644
57 --- a/src/pipewire/meson.build
58 +++ b/src/pipewire/meson.build
59 @@ -109,12 +109,8 @@ libpipewire = shared_library(pipewire_name, pipewire_sources,
62 pipewire_dep = declare_dependency(link_with : libpipewire,
63 - include_directories : [pipewire_inc, configinc],
64 - dependencies : [pthread_lib, atomic_dep, spa_dep],
66 - 'moduledir' : meson.current_build_dir() / '..' / 'modules',
67 - 'confdatadir' : meson.current_build_dir() / '..' / 'daemon',
69 + include_directories : [pipewire_inc, configinc, spa_inc],
70 + dependencies : [pthread_lib, atomic_dep, ],
73 pkgconfig.generate(libpipewire,
74 @@ -132,6 +128,4 @@ pkgconfig.generate(libpipewire,
78 -meson.override_dependency('lib@0@'.format(pipewire_name), pipewire_dep)