1 From 8eda9c8d98d14dfc411e22c30e81fa32a5cb2f56 Mon Sep 17 00:00:00 2001
2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
3 Date: Fri, 14 Jan 2022 18:23:54 +0530
4 Subject: [PATCH 03/12] Revert "treewide: meson.build: use dependency variable
7 This reverts commit 2b110af36683f13f2b55064dec4ae02c1b407561.
9 Upstream-Status: Inappropriate[meson version dependent]
11 spa/examples/meson.build | 4 +-
12 spa/meson.build | 42 ++++++-------
13 spa/plugins/alsa/acp/meson.build | 4 +-
14 spa/plugins/alsa/meson.build | 7 ++-
15 spa/plugins/audioconvert/meson.build | 34 ++++++-----
16 spa/plugins/audiomixer/meson.build | 11 ++--
17 spa/plugins/audiotestsrc/meson.build | 3 +-
18 spa/plugins/bluez5/meson.build | 24 ++++----
19 spa/plugins/control/meson.build | 3 +-
20 spa/plugins/ffmpeg/meson.build | 3 +-
21 spa/plugins/jack/meson.build | 3 +-
22 spa/plugins/libcamera/meson.build | 3 +-
23 spa/plugins/support/meson.build | 14 +++--
24 spa/plugins/test/meson.build | 3 +-
25 spa/plugins/v4l2/meson.build | 3 +-
26 spa/plugins/videoconvert/meson.build | 3 +-
27 spa/plugins/videotestsrc/meson.build | 3 +-
28 spa/plugins/volume/meson.build | 2 +-
29 spa/plugins/vulkan/meson.build | 3 +-
30 spa/tests/meson.build | 5 +-
31 spa/tools/meson.build | 9 ++-
32 src/daemon/meson.build | 8 +--
33 src/gst/meson.build | 4 +-
34 src/modules/meson.build | 88 ++++++++++++++++------------
35 src/modules/spa/meson.build | 16 ++---
36 src/pipewire/meson.build | 4 +-
37 test/meson.build | 11 +---
38 27 files changed, 170 insertions(+), 147 deletions(-)
40 diff --git a/spa/examples/meson.build b/spa/examples/meson.build
41 index 7064a0643..bc04b723c 100644
42 --- a/spa/examples/meson.build
43 +++ b/spa/examples/meson.build
44 @@ -23,8 +23,8 @@ foreach c : spa_examples
48 - include_directories : [configinc],
49 - dependencies : [spa_dep, dl_lib, pthread_lib, mathlib] + deps,
50 + include_directories : [configinc, spa_inc],
51 + dependencies : [dl_lib, pthread_lib, mathlib] + deps,
52 install : installed_tests_enabled,
53 install_dir : installed_tests_execdir / 'examples' / 'spa'
55 diff --git a/spa/meson.build b/spa/meson.build
56 index 2404748df..2717b86d6 100644
60 #pthread_lib = dependencies('threads')
61 #mathlib = cc.find_library('m', required : false)
63 -spa_dep = declare_dependency(
64 - include_directories : [
65 - include_directories('include'),
67 - dependencies : [atomic_dep],
68 - version : spaversion,
70 - 'plugindir' : meson.current_build_dir() / 'plugins',
71 - 'datadir' : meson.current_source_dir() / 'plugins',
75 -meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
77 -pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
80 - description : 'Simple Plugin API',
81 - version : spaversion,
82 - extra_cflags : '-D_REENTRANT',
83 - variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
84 - uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
86 +spa_inc = include_directories('include')
90 @@ -77,3 +55,21 @@ subdir('tests')
91 if not get_option('examples').disabled()
95 +spa_dep = declare_dependency(
96 + include_directories : [spa_inc],
97 + version : spaversion,
98 + variables : { 'plugindir' : meson.current_build_dir() / 'plugins' }
101 +pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
103 + subdirs : spa_name,
104 + description : 'Simple Plugin API',
105 + version : spaversion,
106 + extra_cflags : '-D_REENTRANT',
107 + variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
108 + uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
111 +meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
112 diff --git a/spa/plugins/alsa/acp/meson.build b/spa/plugins/alsa/acp/meson.build
113 index 0ec97e2b4..3686aec82 100644
114 --- a/spa/plugins/alsa/acp/meson.build
115 +++ b/spa/plugins/alsa/acp/meson.build
116 @@ -16,7 +16,7 @@ acp_lib = static_library(
120 - include_directories : [configinc, includes_inc ],
121 - dependencies : [ spa_dep, alsa_dep, mathlib, ]
122 + include_directories : [configinc, spa_inc, includes_inc ],
123 + dependencies : [ alsa_dep, mathlib, ]
125 acp_dep = declare_dependency(link_with: acp_lib)
126 diff --git a/spa/plugins/alsa/meson.build b/spa/plugins/alsa/meson.build
127 index e3fa6f0d7..402d93486 100644
128 --- a/spa/plugins/alsa/meson.build
129 +++ b/spa/plugins/alsa/meson.build
130 @@ -16,8 +16,8 @@ spa_alsa = shared_library(
132 [ spa_alsa_sources ],
134 - include_directories : [configinc],
135 - dependencies : [ spa_dep, alsa_dep, libudev_dep, mathlib, epoll_shim_dep, libinotify_dep ],
136 + include_directories : [spa_inc, configinc],
137 + dependencies : [ alsa_dep, libudev_dep, mathlib, epoll_shim_dep, libinotify_dep ],
138 link_with : [ acp_lib ],
140 install_dir : spa_plugindir / 'alsa'
141 @@ -30,7 +30,8 @@ alsa_udevrules = [
142 executable('spa-acp-tool',
145 - dependencies : [ spa_dep, alsa_dep, mathlib, acp_dep ],
146 + include_directories : [spa_inc ],
147 + dependencies : [ alsa_dep, mathlib, acp_dep ],
151 diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
152 index 89af12671..55e88ccc4 100644
153 --- a/spa/plugins/audioconvert/meson.build
154 +++ b/spa/plugins/audioconvert/meson.build
155 @@ -17,7 +17,7 @@ if have_sse
157 'channelmix-ops-sse.c' ],
158 c_args : [sse_args, '-O3', '-DHAVE_SSE'],
159 - dependencies : [ spa_dep ],
160 + include_directories : [spa_inc],
163 simd_cargs += ['-DHAVE_SSE']
164 @@ -27,7 +27,7 @@ if have_sse2
165 audioconvert_sse2 = static_library('audioconvert_sse2',
167 c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
168 - dependencies : [ spa_dep ],
169 + include_directories : [spa_inc],
172 simd_cargs += ['-DHAVE_SSE2']
173 @@ -38,7 +38,7 @@ if have_ssse3
175 'resample-native-ssse3.c' ],
176 c_args : [ssse3_args, '-O3', '-DHAVE_SSSE3'],
177 - dependencies : [ spa_dep ],
178 + include_directories : [spa_inc],
181 simd_cargs += ['-DHAVE_SSSE3']
182 @@ -48,7 +48,7 @@ if have_sse41
183 audioconvert_sse41 = static_library('audioconvert_sse41',
185 c_args : [sse41_args, '-O3', '-DHAVE_SSE41'],
186 - dependencies : [ spa_dep ],
187 + include_directories : [spa_inc],
190 simd_cargs += ['-DHAVE_SSE41']
191 @@ -58,7 +58,7 @@ if have_avx and have_fma
192 audioconvert_avx = static_library('audioconvert_avx',
193 ['resample-native-avx.c'],
194 c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
195 - dependencies : [ spa_dep ],
196 + include_directories : [spa_inc],
199 simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
200 @@ -68,7 +68,7 @@ if have_avx2
201 audioconvert_avx2 = static_library('audioconvert_avx2',
203 c_args : [avx2_args, '-O3', '-DHAVE_AVX2'],
204 - dependencies : [ spa_dep ],
205 + include_directories : [spa_inc],
208 simd_cargs += ['-DHAVE_AVX2']
209 @@ -80,7 +80,7 @@ if have_neon
210 ['resample-native-neon.c',
212 c_args : [neon_args, '-O3', '-DHAVE_NEON'],
213 - dependencies : [ spa_dep ],
214 + include_directories : [spa_inc],
217 simd_cargs += ['-DHAVE_NEON']
218 @@ -100,8 +100,7 @@ audioconvert_lib = static_library('audioconvert',
220 c_args : [ simd_cargs, '-O3'],
221 link_with : simd_dependencies,
222 - include_directories : [configinc],
223 - dependencies : [ spa_dep ],
224 + include_directories : [configinc, spa_inc],
227 audioconvert_dep = declare_dependency(link_with: audioconvert_lib)
228 @@ -109,7 +108,8 @@ audioconvert_dep = declare_dependency(link_with: audioconvert_lib)
229 spa_audioconvert_lib = shared_library('spa-audioconvert',
230 audioconvert_sources,
232 - dependencies : [ spa_dep, mathlib, audioconvert_dep ],
233 + include_directories : [spa_inc],
234 + dependencies : [ mathlib, audioconvert_dep ],
236 install_dir : spa_plugindir / 'audioconvert')
237 spa_audioconvert_dep = declare_dependency(link_with: spa_audioconvert_lib)
238 @@ -117,7 +117,7 @@ spa_audioconvert_dep = declare_dependency(link_with: spa_audioconvert_lib)
239 test_lib = static_library('test_lib',
242 - dependencies : [ spa_dep ],
243 + include_directories : [spa_inc],
247 @@ -132,8 +132,8 @@ test_apps = [
248 foreach a : test_apps
250 executable(a, a + '.c',
251 - dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
252 - include_directories : [ configinc ],
253 + dependencies : [ dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
254 + include_directories : [ configinc, spa_inc ],
255 link_with : [ test_lib ],
256 install_rpath : spa_plugindir / 'audioconvert',
257 c_args : [ simd_cargs ],
258 @@ -163,8 +163,8 @@ benchmark_apps = [
259 foreach a : benchmark_apps
261 executable(a, a + '.c',
262 - dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
263 - include_directories : [ configinc ],
264 + dependencies : [ dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
265 + include_directories : [ configinc, spa_inc ],
266 c_args : [ simd_cargs ],
267 install_rpath : spa_plugindir / 'audioconvert',
268 install : installed_tests_enabled,
269 @@ -191,8 +191,10 @@ if sndfile_dep.found()
271 executable('spa-resample',
273 + c_args : [ simd_cargs ],
274 + include_directories : [spa_inc ],
275 link_with : [ test_lib ],
276 - dependencies : [ spa_dep, sndfile_dep, mathlib, audioconvert_dep ],
277 + dependencies : [sndfile_dep, mathlib, audioconvert_dep],
281 diff --git a/spa/plugins/audiomixer/meson.build b/spa/plugins/audiomixer/meson.build
282 index 9e1d12d59..214c2a887 100644
283 --- a/spa/plugins/audiomixer/meson.build
284 +++ b/spa/plugins/audiomixer/meson.build
285 @@ -11,7 +11,7 @@ simd_dependencies = []
286 audiomixer_c = static_library('audiomixer_c',
289 - dependencies : [ spa_dep ],
290 + include_directories : [spa_inc],
293 simd_dependencies += audiomixer_c
294 @@ -20,7 +20,7 @@ if have_sse
295 audiomixer_sse = static_library('audiomixer_sse',
297 c_args : [sse_args, '-O3', '-DHAVE_SSE'],
298 - dependencies : [ spa_dep ],
299 + include_directories : [spa_inc],
302 simd_cargs += ['-DHAVE_SSE']
303 @@ -30,7 +30,7 @@ if have_sse2
304 audiomixer_sse2 = static_library('audiomixer_sse2',
306 c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
307 - dependencies : [ spa_dep ],
308 + include_directories : [spa_inc],
311 simd_cargs += ['-DHAVE_SSE2']
312 @@ -40,7 +40,7 @@ if have_avx and have_fma
313 audiomixer_avx = static_library('audiomixer_avx',
315 c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
316 - dependencies : [ spa_dep ],
317 + include_directories : [spa_inc],
320 simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
321 @@ -51,7 +51,8 @@ audiomixerlib = shared_library('spa-audiomixer',
324 link_with : simd_dependencies,
325 - dependencies : [ spa_dep, mathlib ],
326 + include_directories : [spa_inc],
327 + dependencies : [ mathlib ],
329 install_dir : spa_plugindir / 'audiomixer'
331 diff --git a/spa/plugins/audiotestsrc/meson.build b/spa/plugins/audiotestsrc/meson.build
332 index d1b22428d..8011ee883 100644
333 --- a/spa/plugins/audiotestsrc/meson.build
334 +++ b/spa/plugins/audiotestsrc/meson.build
335 @@ -2,6 +2,7 @@ audiotestsrc_sources = ['audiotestsrc.c', 'plugin.c']
337 audiotestsrclib = shared_library('spa-audiotestsrc',
338 audiotestsrc_sources,
339 - dependencies : [ spa_dep, mathlib ],
340 + include_directories : [spa_inc],
341 + dependencies : [mathlib, ],
343 install_dir : spa_plugindir / 'audiotestsrc')
344 diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build
345 index 7a1e12ec7..ae6d8e8e0 100644
346 --- a/spa/plugins/bluez5/meson.build
347 +++ b/spa/plugins/bluez5/meson.build
348 @@ -51,8 +51,8 @@ endif
350 bluez5lib = shared_library('spa-bluez5',
352 - include_directories : [ configinc ],
353 - dependencies : [ spa_dep, bluez5_deps ],
354 + include_directories : [ spa_inc, configinc ],
355 + dependencies : bluez5_deps,
357 install_dir : spa_plugindir / 'bluez5')
359 @@ -60,26 +60,26 @@ codec_args = [ '-DCODEC_PLUGIN' ]
361 bluez_codec_sbc = shared_library('spa-codec-bluez5-sbc',
362 [ 'a2dp-codec-sbc.c', 'a2dp-codecs.c' ],
363 - include_directories : [ configinc ],
364 + include_directories : [ spa_inc, configinc ],
366 - dependencies : [ spa_dep, sbc_dep ],
367 + dependencies : sbc_dep,
369 install_dir : spa_plugindir / 'bluez5')
371 bluez_codec_faststream = shared_library('spa-codec-bluez5-faststream',
372 [ 'a2dp-codec-faststream.c', 'a2dp-codecs.c' ],
373 - include_directories : [ configinc ],
374 + include_directories : [ spa_inc, configinc ],
376 - dependencies : [ spa_dep, sbc_dep ],
377 + dependencies : sbc_dep,
379 install_dir : spa_plugindir / 'bluez5')
381 if fdk_aac_dep.found()
382 bluez_codec_aac = shared_library('spa-codec-bluez5-aac',
383 [ 'a2dp-codec-aac.c', 'a2dp-codecs.c' ],
384 - include_directories : [ configinc ],
385 + include_directories : [ spa_inc, configinc ],
387 - dependencies : [ spa_dep, fdk_aac_dep ],
388 + dependencies : fdk_aac_dep,
390 install_dir : spa_plugindir / 'bluez5')
392 @@ -87,9 +87,9 @@ endif
394 bluez_codec_aptx = shared_library('spa-codec-bluez5-aptx',
395 [ 'a2dp-codec-aptx.c', 'a2dp-codecs.c' ],
396 - include_directories : [ configinc ],
397 + include_directories : [ spa_inc, configinc ],
399 - dependencies : [ spa_dep, aptx_dep, sbc_dep ],
400 + dependencies : [ aptx_dep, sbc_dep ],
402 install_dir : spa_plugindir / 'bluez5')
404 @@ -103,9 +103,9 @@ if ldac_dep.found()
406 bluez_codec_ldac = shared_library('spa-codec-bluez5-ldac',
407 [ 'a2dp-codec-ldac.c', 'a2dp-codecs.c' ],
408 - include_directories : [ configinc ],
409 + include_directories : [ spa_inc, configinc ],
411 - dependencies : [ spa_dep, ldac_dep ],
412 + dependencies : ldac_dep,
414 install_dir : spa_plugindir / 'bluez5')
416 diff --git a/spa/plugins/control/meson.build b/spa/plugins/control/meson.build
417 index adabdfab3..10f9cfeda 100644
418 --- a/spa/plugins/control/meson.build
419 +++ b/spa/plugins/control/meson.build
420 @@ -5,6 +5,7 @@ control_sources = [
422 controllib = shared_library('spa-control',
424 - dependencies : [ spa_dep, mathlib ],
425 + include_directories : [spa_inc],
426 + dependencies : [ mathlib ],
428 install_dir : spa_plugindir / 'control')
429 diff --git a/spa/plugins/ffmpeg/meson.build b/spa/plugins/ffmpeg/meson.build
430 index 0e41ecb6e..2aec258da 100644
431 --- a/spa/plugins/ffmpeg/meson.build
432 +++ b/spa/plugins/ffmpeg/meson.build
433 @@ -4,6 +4,7 @@ ffmpeg_sources = ['ffmpeg.c',
435 ffmpeglib = shared_library('spa-ffmpeg',
437 - dependencies : [ spa_dep, avcodec_dep ],
438 + include_directories : [spa_inc],
439 + dependencies : [avcodec_dep],
441 install_dir : spa_plugindir / 'ffmpeg')
442 diff --git a/spa/plugins/jack/meson.build b/spa/plugins/jack/meson.build
443 index 312a54061..b1732acd6 100644
444 --- a/spa/plugins/jack/meson.build
445 +++ b/spa/plugins/jack/meson.build
446 @@ -7,6 +7,7 @@ spa_jack_sources = [
448 spa_jack = shared_library('spa-jack',
450 - dependencies : [ spa_dep, jack_dep, mathlib ],
451 + include_directories : [spa_inc],
452 + dependencies : [ jack_dep, mathlib ],
454 install_dir : spa_plugindir / 'jack')
455 diff --git a/spa/plugins/libcamera/meson.build b/spa/plugins/libcamera/meson.build
456 index abb1a42cf..02ac2d9c2 100644
457 --- a/spa/plugins/libcamera/meson.build
458 +++ b/spa/plugins/libcamera/meson.build
459 @@ -11,7 +11,8 @@ summary({'libdrm': libdrm_dep.found()}, bool_yn: true, section: 'Backend')
460 if libdrm_dep.found()
461 libcameralib = shared_library('spa-libcamera',
463 - dependencies : [ spa_dep, libudev_dep, libcamera_dep, pthread_lib, libdrm_dep ],
464 + include_directories : [ spa_inc ],
465 + dependencies : [ libudev_dep, libcamera_dep, pthread_lib, libdrm_dep ],
467 install_dir : spa_plugindir / 'libcamera')
469 diff --git a/spa/plugins/support/meson.build b/spa/plugins/support/meson.build
470 index b810b283c..15010a51e 100644
471 --- a/spa/plugins/support/meson.build
472 +++ b/spa/plugins/support/meson.build
473 @@ -17,12 +17,14 @@ endif
475 spa_support_lib = shared_library('spa-support',
477 + include_directories : [ spa_inc ],
478 c_args : [ simd_cargs ],
479 - dependencies : [ spa_dep, pthread_lib, epoll_shim_dep ],
480 + dependencies : [ pthread_lib, epoll_shim_dep ],
482 install_dir : spa_plugindir / 'support')
483 spa_support_dep = declare_dependency(link_with: spa_support_lib)
486 if not get_option('evl').disabled()
487 evl_inc = include_directories('/usr/evl/include')
488 evl_lib = cc.find_library('evl',
489 @@ -33,8 +35,8 @@ if not get_option('evl').disabled()
491 spa_evl_lib = shared_library('spa-evl',
493 - include_directories : [ evl_inc],
494 - dependencies : [ spa_dep, pthread_lib, evl_lib ],
495 + include_directories : [ spa_inc, evl_inc],
496 + dependencies : [ pthread_lib, evl_lib],
498 install_dir : spa_plugindir / 'support')
500 @@ -44,7 +46,8 @@ if dbus_dep.found()
502 spa_dbus_lib = shared_library('spa-dbus',
504 - dependencies : [ spa_dep, dbus_dep ],
505 + include_directories : [ spa_inc],
506 + dependencies : [dbus_dep, ],
508 install_dir : spa_plugindir / 'support')
509 spa_dbus_dep = declare_dependency(link_with: spa_dbus_lib)
510 @@ -61,7 +64,8 @@ if systemd_dep.found()
512 spa_journal_lib = shared_library('spa-journal',
514 - dependencies : [ spa_dep, systemd_dep ],
515 + include_directories : spa_inc,
516 + dependencies : systemd_dep,
518 install_dir : spa_plugindir / 'support')
519 spa_journal_dep = declare_dependency(link_with: spa_journal_lib)
520 diff --git a/spa/plugins/test/meson.build b/spa/plugins/test/meson.build
521 index 950ee7c38..e824450f6 100644
522 --- a/spa/plugins/test/meson.build
523 +++ b/spa/plugins/test/meson.build
524 @@ -2,6 +2,7 @@ test_sources = ['fakesrc.c', 'fakesink.c', 'plugin.c']
526 testlib = shared_library('spa-test',
528 - dependencies : [ spa_dep, pthread_lib ],
529 + include_directories : [ spa_inc],
530 + dependencies : [pthread_lib, ],
532 install_dir : spa_plugindir / 'test')
533 diff --git a/spa/plugins/v4l2/meson.build b/spa/plugins/v4l2/meson.build
534 index 648583f32..297a62b16 100644
535 --- a/spa/plugins/v4l2/meson.build
536 +++ b/spa/plugins/v4l2/meson.build
537 @@ -5,6 +5,7 @@ v4l2_sources = ['v4l2.c',
539 v4l2lib = shared_library('spa-v4l2',
541 - dependencies : [ spa_dep, libudev_dep, libinotify_dep ],
542 + include_directories : [ spa_inc ],
543 + dependencies : [ libudev_dep, libinotify_dep ],
545 install_dir : spa_plugindir / 'v4l2')
546 diff --git a/spa/plugins/videoconvert/meson.build b/spa/plugins/videoconvert/meson.build
547 index 24673a541..17d860d5a 100644
548 --- a/spa/plugins/videoconvert/meson.build
549 +++ b/spa/plugins/videoconvert/meson.build
550 @@ -9,7 +9,8 @@ simd_dependencies = []
551 videoconvertlib = shared_library('spa-videoconvert',
552 videoconvert_sources,
554 - dependencies : [ spa_dep, mathlib ],
555 + include_directories : [spa_inc],
556 + dependencies : [ mathlib ],
557 link_with : simd_dependencies,
559 install_dir : spa_plugindir / 'videoconvert')
560 diff --git a/spa/plugins/videotestsrc/meson.build b/spa/plugins/videotestsrc/meson.build
561 index 01a33ee29..f6f3dca56 100644
562 --- a/spa/plugins/videotestsrc/meson.build
563 +++ b/spa/plugins/videotestsrc/meson.build
564 @@ -2,6 +2,7 @@ videotestsrc_sources = ['videotestsrc.c', 'plugin.c']
566 videotestsrclib = shared_library('spa-videotestsrc',
567 videotestsrc_sources,
568 - dependencies : [ spa_dep, pthread_lib ],
569 + include_directories : [ spa_inc],
570 + dependencies : [pthread_lib, ],
572 install_dir : spa_plugindir / 'videotestsrc')
573 diff --git a/spa/plugins/volume/meson.build b/spa/plugins/volume/meson.build
574 index 2445e2bbd..e10f89563 100644
575 --- a/spa/plugins/volume/meson.build
576 +++ b/spa/plugins/volume/meson.build
577 @@ -2,6 +2,6 @@ volume_sources = ['volume.c', 'plugin.c']
579 volumelib = shared_library('spa-volume',
581 - dependencies : [ spa_dep ],
582 + include_directories : [spa_inc],
584 install_dir : spa_plugindir / 'volume')
585 diff --git a/spa/plugins/vulkan/meson.build b/spa/plugins/vulkan/meson.build
586 index b79bca2cf..9683b41ea 100644
587 --- a/spa/plugins/vulkan/meson.build
588 +++ b/spa/plugins/vulkan/meson.build
589 @@ -6,6 +6,7 @@ spa_vulkan_sources = [
591 spa_vulkan = shared_library('spa-vulkan',
593 - dependencies : [ spa_dep, vulkan_dep, mathlib ],
594 + include_directories : [spa_inc],
595 + dependencies : [ vulkan_dep, mathlib ],
597 install_dir : spa_plugindir / 'vulkan')
598 diff --git a/spa/tests/meson.build b/spa/tests/meson.build
599 index 9c78dcbd2..ea00a2cfe 100644
600 --- a/spa/tests/meson.build
601 +++ b/spa/tests/meson.build
602 @@ -21,7 +21,7 @@ if find.found()
604 executable('spa-include-test-@0@'.format(spa_header.underscorify()),
606 - dependencies: [ spa_dep ],
607 + include_directories: [spa_inc],
611 @@ -36,7 +36,8 @@ benchmark_apps = [
612 foreach a : benchmark_apps
613 benchmark('spa-' + a,
614 executable('spa-' + a, a + '.c',
615 - dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib ],
616 + dependencies : [dl_lib, pthread_lib, mathlib ],
617 + include_directories : [spa_inc ],
618 install : installed_tests_enabled,
619 install_dir : installed_tests_execdir,
621 diff --git a/spa/tools/meson.build b/spa/tools/meson.build
622 index 6f12e9c8f..e4df6c3ac 100644
623 --- a/spa/tools/meson.build
624 +++ b/spa/tools/meson.build
626 executable('spa-inspect', 'spa-inspect.c',
627 - dependencies : [ spa_dep, dl_lib ],
628 + include_directories : [spa_inc],
629 + dependencies : [dl_lib, ],
632 executable('spa-monitor', 'spa-monitor.c',
633 - dependencies : [ spa_dep, dl_lib ],
634 + include_directories : [spa_inc],
635 + dependencies : [dl_lib, ],
638 executable('spa-json-dump', 'spa-json-dump.c',
639 - dependencies : [ spa_dep, dl_lib, ],
640 + include_directories : [spa_inc],
641 + dependencies : [dl_lib, ],
643 diff --git a/src/daemon/meson.build b/src/daemon/meson.build
644 index 647d7393d..28cbe4467 100644
645 --- a/src/daemon/meson.build
646 +++ b/src/daemon/meson.build
647 @@ -87,16 +87,16 @@ pipewire_exec = executable('pipewire',
648 pipewire_daemon_sources,
650 c_args : pipewire_c_args,
651 - include_directories : [ configinc ],
652 - dependencies : [ spa_dep, pipewire_dep, ],
653 + include_directories : [configinc, spa_inc],
654 + dependencies : [pipewire_dep, ],
657 executable('pipewire-pulse',
658 pipewire_daemon_sources,
660 c_args : pipewire_c_args,
661 - include_directories : [ configinc ],
662 - dependencies : [ spa_dep, pipewire_dep, ],
663 + include_directories : [configinc, spa_inc],
664 + dependencies : [pipewire_dep, ],
667 ln = find_program('ln')
668 diff --git a/src/gst/meson.build b/src/gst/meson.build
669 index 709dc0f1c..b91b33dc9 100644
670 --- a/src/gst/meson.build
671 +++ b/src/gst/meson.build
672 @@ -24,8 +24,8 @@ pipewire_gst_headers = [
674 pipewire_gst = shared_library('gstpipewire',
675 pipewire_gst_sources,
676 - include_directories : [ configinc ],
677 - dependencies : [ spa_dep, gst_dep, pipewire_dep ],
678 + include_directories : [configinc, spa_inc],
679 + dependencies : [gst_dep, pipewire_dep],
681 install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
683 diff --git a/src/modules/meson.build b/src/modules/meson.build
684 index 2d3a800d3..ba30275ab 100644
685 --- a/src/modules/meson.build
686 +++ b/src/modules/meson.build
687 @@ -31,20 +31,20 @@ module_sources = [
690 pipewire_module_access = shared_library('pipewire-module-access', [ 'module-access.c' ],
691 - include_directories : [configinc],
692 + include_directories : [configinc, spa_inc],
694 install_dir : modules_install_dir,
695 install_rpath: modules_install_dir,
696 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
697 + dependencies : [mathlib, dl_lib, pipewire_dep],
700 pipewire_module_loopback = shared_library('pipewire-module-loopback',
701 [ 'module-loopback.c' ],
702 - include_directories : [configinc],
703 + include_directories : [configinc, spa_inc],
705 install_dir : modules_install_dir,
706 install_rpath: modules_install_dir,
707 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
708 + dependencies : [mathlib, dl_lib, pipewire_dep],
712 @@ -54,7 +54,7 @@ if have_sse
713 pffft_sse = static_library('pffft_sse',
714 ['module-filter-chain/pffft.c' ],
715 c_args : [sse_args, '-O3', '-DHAVE_SSE'],
716 - dependencies : [ spa_dep ],
717 + include_directories : [spa_inc],
720 simd_cargs += ['-DHAVE_SSE']
721 @@ -64,7 +64,7 @@ if have_neon
722 pffft_neon = static_library('pffft_neon',
723 ['module-filter-chain/pffft.c' ],
724 c_args : [neon_args, '-O3', '-DHAVE_NEON'],
725 - dependencies : [ spa_dep ],
726 + include_directories : [spa_inc],
729 simd_cargs += ['-DHAVE_NEON']
730 @@ -74,7 +74,7 @@ endif
731 pffft_c = static_library('pffft_c',
732 ['module-filter-chain/pffft.c' ],
733 c_args : [simd_cargs, '-O3', '-DPFFFT_SIMD_DISABLE'],
734 - dependencies : [ spa_dep ],
735 + include_directories : [spa_inc],
738 simd_dependencies += pffft_c
739 @@ -100,7 +100,7 @@ endif
741 pipewire_module_filter_chain = shared_library('pipewire-module-filter-chain',
742 filter_chain_sources,
743 - include_directories : [configinc],
744 + include_directories : [configinc, spa_inc],
746 install_dir : modules_install_dir,
747 install_rpath: modules_install_dir,
748 @@ -114,7 +114,7 @@ pipewire_module_echo_cancel_sources = [
750 pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
751 pipewire_module_echo_cancel_sources,
752 - include_directories : [configinc],
753 + include_directories : [configinc, spa_inc],
755 install_dir : modules_install_dir,
756 install_rpath: modules_install_dir,
757 @@ -124,26 +124,36 @@ pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
758 pipewire_module_profiler = shared_library('pipewire-module-profiler',
759 [ 'module-profiler.c',
760 'module-profiler/protocol-native.c', ],
761 - include_directories : [configinc],
762 + include_directories : [configinc, spa_inc],
764 install_dir : modules_install_dir,
765 install_rpath: modules_install_dir,
766 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
767 + dependencies : [mathlib, dl_lib, pipewire_dep],
770 build_module_rt = dbus_dep.found()
772 pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ],
773 - include_directories : [configinc],
774 + include_directories : [configinc, spa_inc],
776 install_dir : modules_install_dir,
777 install_rpath: modules_install_dir,
778 dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep],
781 # TODO: This serves as a temporary alias to prevent breaking existing setups
782 # while `module-rtkit` is being migrated to `module-rt`
783 pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rt.c' ],
784 include_directories : [configinc],
787 +summary({'rt': build_module_rt}, bool_yn: true, section: 'Optional Modules')
789 +build_module_rtkit = dbus_dep.found()
790 +if build_module_rtkit
791 +pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit.c' ],
792 + include_directories : [configinc, spa_inc],
793 +>>>>>>> Revert "treewide: meson.build: use dependency variable for SPA"
795 install_dir : modules_install_dir,
796 install_rpath: modules_install_dir,
797 @@ -155,7 +165,7 @@ summary({'rt': build_module_rt}, bool_yn: true, section: 'Optional Modules')
798 build_module_portal = dbus_dep.found()
799 if build_module_portal
800 pipewire_module_portal = shared_library('pipewire-module-portal', [ 'module-portal.c' ],
801 - include_directories : [configinc],
802 + include_directories : [configinc, spa_inc],
804 install_dir : modules_install_dir,
805 install_rpath: modules_install_dir,
806 @@ -169,20 +179,20 @@ pipewire_module_client_device = shared_library('pipewire-module-client-device',
807 'module-client-device/resource-device.c',
808 'module-client-device/proxy-device.c',
809 'module-client-device/protocol-native.c', ],
810 - include_directories : [configinc],
811 + include_directories : [configinc, spa_inc],
813 install_dir : modules_install_dir,
814 install_rpath: modules_install_dir,
815 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
816 + dependencies : [mathlib, dl_lib, pipewire_dep],
819 pipewire_module_link_factory = shared_library('pipewire-module-link-factory',
820 [ 'module-link-factory.c' ],
821 - include_directories : [configinc],
822 + include_directories : [configinc, spa_inc],
824 install_dir : modules_install_dir,
825 install_rpath: modules_install_dir,
826 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
827 + dependencies : [mathlib, dl_lib, pipewire_dep],
830 pipewire_module_protocol_deps = [mathlib, dl_lib, pipewire_dep]
831 @@ -198,7 +208,7 @@ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-nativ
832 'module-protocol-native/protocol-native.c',
833 'module-protocol-native/v0/protocol-native.c',
834 'module-protocol-native/connection.c' ],
835 - include_directories : [configinc],
836 + include_directories : [configinc, spa_inc],
838 install_dir : modules_install_dir,
839 install_rpath: modules_install_dir,
840 @@ -273,7 +283,7 @@ endif
842 pipewire_module_protocol_pulse = shared_library('pipewire-module-protocol-pulse',
843 pipewire_module_protocol_pulse_sources,
844 - include_directories : [configinc],
845 + include_directories : [configinc, spa_inc],
847 install_dir : modules_install_dir,
848 install_rpath: modules_install_dir,
849 @@ -285,7 +295,7 @@ if build_module_pulse_tunnel
850 pipewire_module_pulse_tunnel = shared_library('pipewire-module-pulse-tunnel',
851 [ 'module-pulse-tunnel.c',
852 'module-protocol-pulse/format.c' ],
853 - include_directories : [configinc],
854 + include_directories : [configinc, spa_inc],
856 install_dir : modules_install_dir,
857 install_rpath: modules_install_dir,
858 @@ -296,7 +306,7 @@ summary({'pulse-tunnel': build_module_pulse_tunnel}, bool_yn: true, section: 'Op
860 pipewire_module_protocol_simple = shared_library('pipewire-module-protocol-simple',
861 [ 'module-protocol-simple.c' ],
862 - include_directories : [configinc],
863 + include_directories : [configinc, spa_inc],
865 install_dir : modules_install_dir,
866 install_rpath: modules_install_dir,
867 @@ -305,20 +315,20 @@ pipewire_module_protocol_simple = shared_library('pipewire-module-protocol-simpl
869 pipewire_module_example_sink = shared_library('pipewire-module-example-sink',
870 [ 'module-example-sink.c' ],
871 - include_directories : [configinc],
872 + include_directories : [configinc, spa_inc],
874 install_dir : modules_install_dir,
875 install_rpath: modules_install_dir,
876 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
877 + dependencies : [mathlib, dl_lib, pipewire_dep],
880 pipewire_module_example_sink = shared_library('pipewire-module-example-source',
881 [ 'module-example-source.c' ],
882 - include_directories : [configinc],
883 + include_directories : [configinc, spa_inc],
885 install_dir : modules_install_dir,
886 install_rpath: modules_install_dir,
887 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
888 + dependencies : [mathlib, dl_lib, pipewire_dep],
891 pipewire_module_client_node = shared_library('pipewire-module-client-node',
892 @@ -330,12 +340,12 @@ pipewire_module_client_node = shared_library('pipewire-module-client-node',
893 'module-client-node/v0/transport.c',
894 'module-client-node/v0/protocol-native.c',
896 - include_directories : [configinc],
897 + include_directories : [configinc, spa_inc],
898 link_with : pipewire_module_protocol_native,
900 install_dir : modules_install_dir,
901 install_rpath: modules_install_dir,
902 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
903 + dependencies : [mathlib, dl_lib, pipewire_dep],
906 pipewire_module_metadata = shared_library('pipewire-module-metadata',
907 @@ -343,12 +353,12 @@ pipewire_module_metadata = shared_library('pipewire-module-metadata',
908 'module-metadata/proxy-metadata.c',
909 'module-metadata/metadata.c',
910 'module-metadata/protocol-native.c'],
911 - include_directories : [configinc],
912 + include_directories : [configinc, spa_inc],
913 link_with : pipewire_module_protocol_native,
915 install_dir : modules_install_dir,
916 install_rpath: modules_install_dir,
917 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
918 + dependencies : [mathlib, dl_lib, pipewire_dep],
921 test('pw-test-protocol-native',
922 @@ -356,8 +366,8 @@ test('pw-test-protocol-native',
923 [ 'module-protocol-native/test-connection.c',
924 'module-protocol-native/connection.c' ],
925 c_args : libpipewire_c_args,
926 - include_directories : [configinc ],
927 - dependencies : [spa_dep, pipewire_dep],
928 + include_directories : [configinc, spa_inc ],
929 + dependencies : [pipewire_dep],
930 install : installed_tests_enabled,
931 install_dir : installed_tests_execdir,
933 @@ -383,7 +393,7 @@ pipewire_module_adapter = shared_library('pipewire-module-adapter',
934 [ 'module-adapter.c',
935 'module-adapter/adapter.c',
937 - include_directories : [configinc],
938 + include_directories : [configinc, spa_inc],
940 install_dir : modules_install_dir,
941 install_rpath: modules_install_dir,
942 @@ -405,11 +415,11 @@ pipewire_module_session_manager = shared_library('pipewire-module-session-manage
943 'module-session-manager/proxy-session-manager.c',
944 'module-session-manager/session.c',
946 - include_directories : [configinc],
947 + include_directories : [configinc, spa_inc],
949 install_dir : modules_install_dir,
950 install_rpath: modules_install_dir,
951 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
952 + dependencies : [mathlib, dl_lib, pipewire_dep],
955 build_module_zeroconf_discover = avahi_dep.found()
956 @@ -418,7 +428,7 @@ pipewire_module_zeroconf_discover = shared_library('pipewire-module-zeroconf-dis
957 [ 'module-zeroconf-discover.c',
958 'module-protocol-pulse/format.c',
959 'module-zeroconf-discover/avahi-poll.c' ],
960 - include_directories : [configinc],
961 + include_directories : [configinc, spa_inc],
963 install_dir : modules_install_dir,
964 install_rpath: modules_install_dir,
965 @@ -432,7 +442,7 @@ if build_module_raop_discover
966 pipewire_module_raop_discover = shared_library('pipewire-module-raop-discover',
967 [ 'module-raop-discover.c',
968 'module-zeroconf-discover/avahi-poll.c' ],
969 - include_directories : [configinc],
970 + include_directories : [configinc, spa_inc],
972 install_dir : modules_install_dir,
973 install_rpath: modules_install_dir,
974 @@ -446,7 +456,7 @@ if build_module_raop
975 pipewire_module_raop_sink = shared_library('pipewire-module-raop-sink',
976 [ 'module-raop-sink.c',
977 'module-raop/rtsp-client.c' ],
978 - include_directories : [configinc],
979 + include_directories : [configinc, spa_inc],
981 install_dir : modules_install_dir,
982 install_rpath: modules_install_dir,
983 @@ -462,7 +472,7 @@ build_module_roc = roc_lib.found()
985 pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink',
986 [ 'module-roc-sink.c' ],
987 - include_directories : [configinc],
988 + include_directories : [configinc, spa_inc],
990 install_dir : modules_install_dir,
991 install_rpath: modules_install_dir,
992 @@ -471,7 +481,7 @@ pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink',
994 pipewire_module_roc_source = shared_library('pipewire-module-roc-source',
995 [ 'module-roc-source.c' ],
996 - include_directories : [configinc],
997 + include_directories : [configinc, spa_inc],
999 install_dir : modules_install_dir,
1000 install_rpath: modules_install_dir,
1001 diff --git a/src/modules/spa/meson.build b/src/modules/spa/meson.build
1002 index 8332910b5..ab4fac18d 100644
1003 --- a/src/modules/spa/meson.build
1004 +++ b/src/modules/spa/meson.build
1006 pipewire_module_spa_node = shared_library('pipewire-module-spa-node',
1007 [ 'module-node.c', 'spa-node.c' ],
1008 - include_directories : [configinc],
1009 + include_directories : [configinc, spa_inc],
1011 install_dir : modules_install_dir,
1012 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
1013 + dependencies : [mathlib, dl_lib, pipewire_dep],
1016 pipewire_module_spa_device = shared_library('pipewire-module-spa-device',
1017 [ 'module-device.c', 'spa-device.c' ],
1018 - include_directories : [configinc],
1019 + include_directories : [configinc, spa_inc],
1021 install_dir : modules_install_dir,
1022 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
1023 + dependencies : [mathlib, dl_lib, pipewire_dep],
1026 pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-factory',
1027 [ 'module-node-factory.c', 'spa-node.c' ],
1028 - include_directories : [configinc],
1029 + include_directories : [configinc, spa_inc],
1031 install_dir : modules_install_dir,
1032 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
1033 + dependencies : [mathlib, dl_lib, pipewire_dep],
1036 pipewire_module_spa_device_factory = shared_library('pipewire-module-spa-device-factory',
1037 [ 'module-device-factory.c', 'spa-device.c' ],
1038 - include_directories : [configinc],
1039 + include_directories : [configinc, spa_inc],
1041 install_dir : modules_install_dir,
1042 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
1043 + dependencies : [mathlib, dl_lib, pipewire_dep],
1045 diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
1046 index 969f50b22..f66ce8746 100644
1047 --- a/src/pipewire/meson.build
1048 +++ b/src/pipewire/meson.build
1049 @@ -103,9 +103,9 @@ libpipewire = shared_library(pipewire_name, pipewire_sources,
1050 version : libversion,
1051 soversion : soversion,
1052 c_args : libpipewire_c_args,
1053 - include_directories : [pipewire_inc, configinc, includes_inc],
1054 + include_directories : [pipewire_inc, configinc, spa_inc, includes_inc],
1056 - dependencies : [spa_dep, dl_lib, mathlib, pthread_lib, libintl_dep, atomic_dep, ],
1057 + dependencies : [dl_lib, mathlib, pthread_lib, libintl_dep, atomic_dep, ],
1060 pipewire_dep = declare_dependency(link_with : libpipewire,
1061 diff --git a/test/meson.build b/test/meson.build
1062 index eca92eb24..4108ac14b 100644
1063 --- a/test/meson.build
1064 +++ b/test/meson.build
1065 @@ -19,6 +19,7 @@ pwtest_c_args = [
1073 @@ -36,7 +37,6 @@ test('test-pwtest',
1074 executable('test-pwtest',
1076 include_directories: pwtest_inc,
1077 - dependencies: [ spa_dep ],
1078 link_with: pwtest_lib)
1081 @@ -45,7 +45,6 @@ test('test-pwtest',
1082 executable('test-example',
1084 include_directories: pwtest_inc,
1085 - dependencies: [ spa_dep ],
1086 link_with: pwtest_lib)
1088 test('test-pw-utils',
1089 @@ -55,7 +54,6 @@ test('test-pw-utils',
1092 include_directories: pwtest_inc,
1093 - dependencies: [ spa_dep ],
1094 link_with: pwtest_lib)
1097 @@ -63,7 +61,6 @@ test('test-lib',
1098 executable('test-lib',
1100 include_directories: pwtest_inc,
1101 - dependencies: [ spa_dep ],
1102 link_with: pwtest_lib)
1105 @@ -71,7 +68,6 @@ test('test-client',
1106 executable('test-client',
1108 include_directories: pwtest_inc,
1109 - dependencies: [ spa_dep ],
1110 link_with: pwtest_lib)
1113 @@ -88,7 +84,7 @@ test('test-context',
1116 include_directories: pwtest_inc,
1117 - dependencies: [spa_dep, spa_support_dep, spa_dbus_dep],
1118 + dependencies: [spa_support_dep, spa_dbus_dep],
1119 link_with: [pwtest_lib,
1120 pipewire_module_protocol_native,
1121 pipewire_module_client_node,
1122 @@ -103,7 +99,7 @@ test('test-support',
1125 include_directories: pwtest_inc,
1126 - dependencies: [spa_dep, systemd_dep, spa_support_dep, spa_journal_dep],
1127 + dependencies: [systemd_dep, spa_support_dep, spa_journal_dep],
1128 link_with: [pwtest_lib])
1131 @@ -115,7 +111,6 @@ test('test-spa',
1134 include_directories: pwtest_inc,
1135 - dependencies: [ spa_dep ],
1136 link_with: pwtest_lib)