1 From 869e53ac9ded351ce6cb47b5ce04ef345c673b48 Mon Sep 17 00:00:00 2001
2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
3 Date: Thu, 24 Feb 2022 12:16:03 +0530
4 Subject: [PATCH 06/12] Revert "meson: declare spa_dep and
5 override_dependency() for spa and pipewire"
7 This reverts commit 7ab5c35cadc075bcdf44031f1f7d95352cf9a13b.
8 Upstream-Status: Inappropriate[meson version dependent]
11 spa/meson.build | 13 +------------
12 src/pipewire/meson.build | 10 ++--------
13 3 files changed, 4 insertions(+), 21 deletions(-)
15 diff --git a/meson.build b/meson.build
16 index 1b87bd004..af60472f8 100644
20 project('pipewire', ['c' ],
22 license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
23 - meson_version : '>= 0.59.0',
24 + meson_version : '>= 0.49.0',
25 default_options : [ 'warning_level=3',
28 diff --git a/spa/meson.build b/spa/meson.build
29 index 2717b86d6..4e0f96727 100644
32 @@ -56,20 +56,9 @@ if not get_option('examples').disabled()
36 -spa_dep = declare_dependency(
37 - include_directories : [spa_inc],
38 - version : spaversion,
39 - variables : { 'plugindir' : meson.current_build_dir() / 'plugins' }
42 pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
45 description : 'Simple Plugin API',
47 - extra_cflags : '-D_REENTRANT',
48 - variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
49 - uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
52 -meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
53 + extra_cflags : '-D_REENTRANT')
54 diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
55 index f66ce8746..5cfaba3f9 100644
56 --- a/src/pipewire/meson.build
57 +++ b/src/pipewire/meson.build
58 @@ -109,12 +109,8 @@ libpipewire = shared_library(pipewire_name, pipewire_sources,
61 pipewire_dep = declare_dependency(link_with : libpipewire,
62 - include_directories : [pipewire_inc, configinc],
63 - dependencies : [pthread_lib, atomic_dep, spa_dep],
65 - 'moduledir' : meson.current_build_dir() / '..' / 'modules',
66 - 'confdatadir' : meson.current_build_dir() / '..' / 'daemon',
68 + include_directories : [pipewire_inc, configinc, spa_inc],
69 + dependencies : [pthread_lib, atomic_dep, ],
72 pkgconfig.generate(libpipewire,
73 @@ -132,6 +128,4 @@ pkgconfig.generate(libpipewire,
77 -meson.override_dependency('lib@0@'.format(pipewire_name), pipewire_dep)