1 From cbe87dc5390c91523a9f0bc3eb126fa500c351e2 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 2/4] 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 | 41 +++++++-------
13 spa/plugins/alsa/acp/meson.build | 4 +-
14 spa/plugins/alsa/meson.build | 7 +--
15 spa/plugins/audioconvert/meson.build | 33 ++++++------
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 | 80 ++++++++++++++--------------
35 src/modules/spa/meson.build | 16 +++---
36 src/pipewire/meson.build | 4 +-
37 test/meson.build | 11 ++--
38 27 files changed, 160 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 4ad37cdb4..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 - version : spaversion,
69 - 'plugindir' : meson.current_build_dir() / 'plugins',
70 - 'datadir' : meson.current_source_dir() / 'plugins',
74 -meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
76 -pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
79 - description : 'Simple Plugin API',
80 - version : spaversion,
81 - extra_cflags : '-D_REENTRANT',
82 - variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
83 - uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
85 +spa_inc = include_directories('include')
89 @@ -76,3 +55,21 @@ subdir('tests')
90 if not get_option('examples').disabled()
94 +spa_dep = declare_dependency(
95 + include_directories : [spa_inc],
96 + version : spaversion,
97 + variables : { 'plugindir' : meson.current_build_dir() / 'plugins' }
100 +pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
102 + subdirs : spa_name,
103 + description : 'Simple Plugin API',
104 + version : spaversion,
105 + extra_cflags : '-D_REENTRANT',
106 + variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
107 + uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
110 +meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
111 diff --git a/spa/plugins/alsa/acp/meson.build b/spa/plugins/alsa/acp/meson.build
112 index 0ec97e2b4..3686aec82 100644
113 --- a/spa/plugins/alsa/acp/meson.build
114 +++ b/spa/plugins/alsa/acp/meson.build
115 @@ -16,7 +16,7 @@ acp_lib = static_library(
119 - include_directories : [configinc, includes_inc ],
120 - dependencies : [ spa_dep, alsa_dep, mathlib, ]
121 + include_directories : [configinc, spa_inc, includes_inc ],
122 + dependencies : [ alsa_dep, mathlib, ]
124 acp_dep = declare_dependency(link_with: acp_lib)
125 diff --git a/spa/plugins/alsa/meson.build b/spa/plugins/alsa/meson.build
126 index e3fa6f0d7..402d93486 100644
127 --- a/spa/plugins/alsa/meson.build
128 +++ b/spa/plugins/alsa/meson.build
129 @@ -16,8 +16,8 @@ spa_alsa = shared_library(
131 [ spa_alsa_sources ],
133 - include_directories : [configinc],
134 - dependencies : [ spa_dep, alsa_dep, libudev_dep, mathlib, epoll_shim_dep, libinotify_dep ],
135 + include_directories : [spa_inc, configinc],
136 + dependencies : [ alsa_dep, libudev_dep, mathlib, epoll_shim_dep, libinotify_dep ],
137 link_with : [ acp_lib ],
139 install_dir : spa_plugindir / 'alsa'
140 @@ -30,7 +30,8 @@ alsa_udevrules = [
141 executable('spa-acp-tool',
144 - dependencies : [ spa_dep, alsa_dep, mathlib, acp_dep ],
145 + include_directories : [spa_inc ],
146 + dependencies : [ alsa_dep, mathlib, acp_dep ],
150 diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build
151 index 4d15271f5..6f4fd968b 100644
152 --- a/spa/plugins/audioconvert/meson.build
153 +++ b/spa/plugins/audioconvert/meson.build
154 @@ -17,7 +17,7 @@ if have_sse
156 'channelmix-ops-sse.c' ],
157 c_args : [sse_args, '-O3', '-DHAVE_SSE'],
158 - dependencies : [ spa_dep ],
159 + include_directories : [spa_inc],
162 simd_cargs += ['-DHAVE_SSE']
163 @@ -27,7 +27,7 @@ if have_sse2
164 audioconvert_sse2 = static_library('audioconvert_sse2',
166 c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
167 - dependencies : [ spa_dep ],
168 + include_directories : [spa_inc],
171 simd_cargs += ['-DHAVE_SSE2']
172 @@ -38,7 +38,7 @@ if have_ssse3
174 'resample-native-ssse3.c' ],
175 c_args : [ssse3_args, '-O3', '-DHAVE_SSSE3'],
176 - dependencies : [ spa_dep ],
177 + include_directories : [spa_inc],
180 simd_cargs += ['-DHAVE_SSSE3']
181 @@ -48,7 +48,7 @@ if have_sse41
182 audioconvert_sse41 = static_library('audioconvert_sse41',
184 c_args : [sse41_args, '-O3', '-DHAVE_SSE41'],
185 - dependencies : [ spa_dep ],
186 + include_directories : [spa_inc],
189 simd_cargs += ['-DHAVE_SSE41']
190 @@ -58,7 +58,7 @@ if have_avx and have_fma
191 audioconvert_avx = static_library('audioconvert_avx',
192 ['resample-native-avx.c'],
193 c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
194 - dependencies : [ spa_dep ],
195 + include_directories : [spa_inc],
198 simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
199 @@ -68,7 +68,7 @@ if have_avx2
200 audioconvert_avx2 = static_library('audioconvert_avx2',
202 c_args : [avx2_args, '-O3', '-DHAVE_AVX2'],
203 - dependencies : [ spa_dep ],
204 + include_directories : [spa_inc],
207 simd_cargs += ['-DHAVE_AVX2']
208 @@ -80,7 +80,7 @@ if have_neon
209 ['resample-native-neon.c',
211 c_args : [neon_args, '-O3', '-DHAVE_NEON'],
212 - dependencies : [ spa_dep ],
213 + include_directories : [spa_inc],
216 simd_cargs += ['-DHAVE_NEON']
217 @@ -100,8 +100,7 @@ audioconvert_lib = static_library('audioconvert',
219 c_args : [ simd_cargs, '-O3'],
220 link_with : simd_dependencies,
221 - include_directories : [configinc],
222 - dependencies : [ spa_dep ],
223 + include_directories : [configinc, spa_inc],
226 audioconvert_dep = declare_dependency(link_with: audioconvert_lib)
227 @@ -109,7 +108,8 @@ audioconvert_dep = declare_dependency(link_with: audioconvert_lib)
228 spa_audioconvert_lib = shared_library('spa-audioconvert',
229 audioconvert_sources,
231 - dependencies : [ spa_dep, mathlib, audioconvert_dep ],
232 + include_directories : [spa_inc],
233 + dependencies : [ mathlib, audioconvert_dep ],
235 install_dir : spa_plugindir / 'audioconvert')
236 spa_audioconvert_dep = declare_dependency(link_with: spa_audioconvert_lib)
237 @@ -117,7 +117,7 @@ spa_audioconvert_dep = declare_dependency(link_with: spa_audioconvert_lib)
238 test_lib = static_library('test_lib',
241 - dependencies : [ spa_dep ],
242 + include_directories : [spa_inc],
246 @@ -132,8 +132,8 @@ test_apps = [
247 foreach a : test_apps
249 executable(a, a + '.c',
250 - dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
251 - include_directories : [ configinc ],
252 + dependencies : [ dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
253 + include_directories : [ configinc, spa_inc ],
254 link_with : [ test_lib ],
255 install_rpath : spa_plugindir / 'audioconvert',
256 c_args : [ simd_cargs ],
257 @@ -163,8 +163,8 @@ benchmark_apps = [
258 foreach a : benchmark_apps
260 executable(a, a + '.c',
261 - dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
262 - include_directories : [ configinc ],
263 + dependencies : [ dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
264 + include_directories : [ configinc, spa_inc ],
265 c_args : [ simd_cargs ],
266 install_rpath : spa_plugindir / 'audioconvert',
267 install : installed_tests_enabled,
268 @@ -192,8 +192,9 @@ if sndfile_dep.found()
269 executable('spa-resample',
271 c_args : [ simd_cargs ],
272 + include_directories : [spa_inc ],
273 link_with : [ test_lib ],
274 - dependencies : [ spa_dep, sndfile_dep, mathlib, audioconvert_dep ],
275 + dependencies : [sndfile_dep, mathlib, audioconvert_dep],
279 diff --git a/spa/plugins/audiomixer/meson.build b/spa/plugins/audiomixer/meson.build
280 index 9e1d12d59..214c2a887 100644
281 --- a/spa/plugins/audiomixer/meson.build
282 +++ b/spa/plugins/audiomixer/meson.build
283 @@ -11,7 +11,7 @@ simd_dependencies = []
284 audiomixer_c = static_library('audiomixer_c',
287 - dependencies : [ spa_dep ],
288 + include_directories : [spa_inc],
291 simd_dependencies += audiomixer_c
292 @@ -20,7 +20,7 @@ if have_sse
293 audiomixer_sse = static_library('audiomixer_sse',
295 c_args : [sse_args, '-O3', '-DHAVE_SSE'],
296 - dependencies : [ spa_dep ],
297 + include_directories : [spa_inc],
300 simd_cargs += ['-DHAVE_SSE']
301 @@ -30,7 +30,7 @@ if have_sse2
302 audiomixer_sse2 = static_library('audiomixer_sse2',
304 c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
305 - dependencies : [ spa_dep ],
306 + include_directories : [spa_inc],
309 simd_cargs += ['-DHAVE_SSE2']
310 @@ -40,7 +40,7 @@ if have_avx and have_fma
311 audiomixer_avx = static_library('audiomixer_avx',
313 c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
314 - dependencies : [ spa_dep ],
315 + include_directories : [spa_inc],
318 simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
319 @@ -51,7 +51,8 @@ audiomixerlib = shared_library('spa-audiomixer',
322 link_with : simd_dependencies,
323 - dependencies : [ spa_dep, mathlib ],
324 + include_directories : [spa_inc],
325 + dependencies : [ mathlib ],
327 install_dir : spa_plugindir / 'audiomixer'
329 diff --git a/spa/plugins/audiotestsrc/meson.build b/spa/plugins/audiotestsrc/meson.build
330 index d1b22428d..8011ee883 100644
331 --- a/spa/plugins/audiotestsrc/meson.build
332 +++ b/spa/plugins/audiotestsrc/meson.build
333 @@ -2,6 +2,7 @@ audiotestsrc_sources = ['audiotestsrc.c', 'plugin.c']
335 audiotestsrclib = shared_library('spa-audiotestsrc',
336 audiotestsrc_sources,
337 - dependencies : [ spa_dep, mathlib ],
338 + include_directories : [spa_inc],
339 + dependencies : [mathlib, ],
341 install_dir : spa_plugindir / 'audiotestsrc')
342 diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build
343 index b13e23cf4..eca9c9eb5 100644
344 --- a/spa/plugins/bluez5/meson.build
345 +++ b/spa/plugins/bluez5/meson.build
346 @@ -56,8 +56,8 @@ endif
348 bluez5lib = shared_library('spa-bluez5',
350 - include_directories : [ configinc ],
351 - dependencies : [ spa_dep, bluez5_deps ],
352 + include_directories : [ spa_inc, configinc ],
353 + dependencies : bluez5_deps,
355 install_dir : spa_plugindir / 'bluez5')
357 @@ -65,26 +65,26 @@ codec_args = [ '-DCODEC_PLUGIN' ]
359 bluez_codec_sbc = shared_library('spa-codec-bluez5-sbc',
360 [ 'a2dp-codec-sbc.c', 'a2dp-codecs.c' ],
361 - include_directories : [ configinc ],
362 + include_directories : [ spa_inc, configinc ],
364 - dependencies : [ spa_dep, sbc_dep ],
365 + dependencies : sbc_dep,
367 install_dir : spa_plugindir / 'bluez5')
369 bluez_codec_faststream = shared_library('spa-codec-bluez5-faststream',
370 [ 'a2dp-codec-faststream.c', 'a2dp-codecs.c' ],
371 - include_directories : [ configinc ],
372 + include_directories : [ spa_inc, configinc ],
374 - dependencies : [ spa_dep, sbc_dep ],
375 + dependencies : sbc_dep,
377 install_dir : spa_plugindir / 'bluez5')
379 if fdk_aac_dep.found()
380 bluez_codec_aac = shared_library('spa-codec-bluez5-aac',
381 [ 'a2dp-codec-aac.c', 'a2dp-codecs.c' ],
382 - include_directories : [ configinc ],
383 + include_directories : [ spa_inc, configinc ],
385 - dependencies : [ spa_dep, fdk_aac_dep ],
386 + dependencies : fdk_aac_dep,
388 install_dir : spa_plugindir / 'bluez5')
390 @@ -92,9 +92,9 @@ endif
392 bluez_codec_aptx = shared_library('spa-codec-bluez5-aptx',
393 [ 'a2dp-codec-aptx.c', 'a2dp-codecs.c' ],
394 - include_directories : [ configinc ],
395 + include_directories : [ spa_inc, configinc ],
397 - dependencies : [ spa_dep, aptx_dep, sbc_dep ],
398 + dependencies : [ aptx_dep, sbc_dep ],
400 install_dir : spa_plugindir / 'bluez5')
402 @@ -108,9 +108,9 @@ if ldac_dep.found()
404 bluez_codec_ldac = shared_library('spa-codec-bluez5-ldac',
405 [ 'a2dp-codec-ldac.c', 'a2dp-codecs.c' ],
406 - include_directories : [ configinc ],
407 + include_directories : [ spa_inc, configinc ],
409 - dependencies : [ spa_dep, ldac_dep ],
410 + dependencies : ldac_dep,
412 install_dir : spa_plugindir / 'bluez5')
414 diff --git a/spa/plugins/control/meson.build b/spa/plugins/control/meson.build
415 index adabdfab3..10f9cfeda 100644
416 --- a/spa/plugins/control/meson.build
417 +++ b/spa/plugins/control/meson.build
418 @@ -5,6 +5,7 @@ control_sources = [
420 controllib = shared_library('spa-control',
422 - dependencies : [ spa_dep, mathlib ],
423 + include_directories : [spa_inc],
424 + dependencies : [ mathlib ],
426 install_dir : spa_plugindir / 'control')
427 diff --git a/spa/plugins/ffmpeg/meson.build b/spa/plugins/ffmpeg/meson.build
428 index 0e41ecb6e..2aec258da 100644
429 --- a/spa/plugins/ffmpeg/meson.build
430 +++ b/spa/plugins/ffmpeg/meson.build
431 @@ -4,6 +4,7 @@ ffmpeg_sources = ['ffmpeg.c',
433 ffmpeglib = shared_library('spa-ffmpeg',
435 - dependencies : [ spa_dep, avcodec_dep ],
436 + include_directories : [spa_inc],
437 + dependencies : [avcodec_dep],
439 install_dir : spa_plugindir / 'ffmpeg')
440 diff --git a/spa/plugins/jack/meson.build b/spa/plugins/jack/meson.build
441 index 312a54061..b1732acd6 100644
442 --- a/spa/plugins/jack/meson.build
443 +++ b/spa/plugins/jack/meson.build
444 @@ -7,6 +7,7 @@ spa_jack_sources = [
446 spa_jack = shared_library('spa-jack',
448 - dependencies : [ spa_dep, jack_dep, mathlib ],
449 + include_directories : [spa_inc],
450 + dependencies : [ jack_dep, mathlib ],
452 install_dir : spa_plugindir / 'jack')
453 diff --git a/spa/plugins/libcamera/meson.build b/spa/plugins/libcamera/meson.build
454 index abb1a42cf..02ac2d9c2 100644
455 --- a/spa/plugins/libcamera/meson.build
456 +++ b/spa/plugins/libcamera/meson.build
457 @@ -11,7 +11,8 @@ summary({'libdrm': libdrm_dep.found()}, bool_yn: true, section: 'Backend')
458 if libdrm_dep.found()
459 libcameralib = shared_library('spa-libcamera',
461 - dependencies : [ spa_dep, libudev_dep, libcamera_dep, pthread_lib, libdrm_dep ],
462 + include_directories : [ spa_inc ],
463 + dependencies : [ libudev_dep, libcamera_dep, pthread_lib, libdrm_dep ],
465 install_dir : spa_plugindir / 'libcamera')
467 diff --git a/spa/plugins/support/meson.build b/spa/plugins/support/meson.build
468 index b810b283c..15010a51e 100644
469 --- a/spa/plugins/support/meson.build
470 +++ b/spa/plugins/support/meson.build
471 @@ -17,12 +17,14 @@ endif
473 spa_support_lib = shared_library('spa-support',
475 + include_directories : [ spa_inc ],
476 c_args : [ simd_cargs ],
477 - dependencies : [ spa_dep, pthread_lib, epoll_shim_dep ],
478 + dependencies : [ pthread_lib, epoll_shim_dep ],
480 install_dir : spa_plugindir / 'support')
481 spa_support_dep = declare_dependency(link_with: spa_support_lib)
484 if not get_option('evl').disabled()
485 evl_inc = include_directories('/usr/evl/include')
486 evl_lib = cc.find_library('evl',
487 @@ -33,8 +35,8 @@ if not get_option('evl').disabled()
489 spa_evl_lib = shared_library('spa-evl',
491 - include_directories : [ evl_inc],
492 - dependencies : [ spa_dep, pthread_lib, evl_lib ],
493 + include_directories : [ spa_inc, evl_inc],
494 + dependencies : [ pthread_lib, evl_lib],
496 install_dir : spa_plugindir / 'support')
498 @@ -44,7 +46,8 @@ if dbus_dep.found()
500 spa_dbus_lib = shared_library('spa-dbus',
502 - dependencies : [ spa_dep, dbus_dep ],
503 + include_directories : [ spa_inc],
504 + dependencies : [dbus_dep, ],
506 install_dir : spa_plugindir / 'support')
507 spa_dbus_dep = declare_dependency(link_with: spa_dbus_lib)
508 @@ -61,7 +64,8 @@ if systemd_dep.found()
510 spa_journal_lib = shared_library('spa-journal',
512 - dependencies : [ spa_dep, systemd_dep ],
513 + include_directories : spa_inc,
514 + dependencies : systemd_dep,
516 install_dir : spa_plugindir / 'support')
517 spa_journal_dep = declare_dependency(link_with: spa_journal_lib)
518 diff --git a/spa/plugins/test/meson.build b/spa/plugins/test/meson.build
519 index 950ee7c38..e824450f6 100644
520 --- a/spa/plugins/test/meson.build
521 +++ b/spa/plugins/test/meson.build
522 @@ -2,6 +2,7 @@ test_sources = ['fakesrc.c', 'fakesink.c', 'plugin.c']
524 testlib = shared_library('spa-test',
526 - dependencies : [ spa_dep, pthread_lib ],
527 + include_directories : [ spa_inc],
528 + dependencies : [pthread_lib, ],
530 install_dir : spa_plugindir / 'test')
531 diff --git a/spa/plugins/v4l2/meson.build b/spa/plugins/v4l2/meson.build
532 index 648583f32..297a62b16 100644
533 --- a/spa/plugins/v4l2/meson.build
534 +++ b/spa/plugins/v4l2/meson.build
535 @@ -5,6 +5,7 @@ v4l2_sources = ['v4l2.c',
537 v4l2lib = shared_library('spa-v4l2',
539 - dependencies : [ spa_dep, libudev_dep, libinotify_dep ],
540 + include_directories : [ spa_inc ],
541 + dependencies : [ libudev_dep, libinotify_dep ],
543 install_dir : spa_plugindir / 'v4l2')
544 diff --git a/spa/plugins/videoconvert/meson.build b/spa/plugins/videoconvert/meson.build
545 index 24673a541..17d860d5a 100644
546 --- a/spa/plugins/videoconvert/meson.build
547 +++ b/spa/plugins/videoconvert/meson.build
548 @@ -9,7 +9,8 @@ simd_dependencies = []
549 videoconvertlib = shared_library('spa-videoconvert',
550 videoconvert_sources,
552 - dependencies : [ spa_dep, mathlib ],
553 + include_directories : [spa_inc],
554 + dependencies : [ mathlib ],
555 link_with : simd_dependencies,
557 install_dir : spa_plugindir / 'videoconvert')
558 diff --git a/spa/plugins/videotestsrc/meson.build b/spa/plugins/videotestsrc/meson.build
559 index 01a33ee29..f6f3dca56 100644
560 --- a/spa/plugins/videotestsrc/meson.build
561 +++ b/spa/plugins/videotestsrc/meson.build
562 @@ -2,6 +2,7 @@ videotestsrc_sources = ['videotestsrc.c', 'plugin.c']
564 videotestsrclib = shared_library('spa-videotestsrc',
565 videotestsrc_sources,
566 - dependencies : [ spa_dep, pthread_lib ],
567 + include_directories : [ spa_inc],
568 + dependencies : [pthread_lib, ],
570 install_dir : spa_plugindir / 'videotestsrc')
571 diff --git a/spa/plugins/volume/meson.build b/spa/plugins/volume/meson.build
572 index 2445e2bbd..e10f89563 100644
573 --- a/spa/plugins/volume/meson.build
574 +++ b/spa/plugins/volume/meson.build
575 @@ -2,6 +2,6 @@ volume_sources = ['volume.c', 'plugin.c']
577 volumelib = shared_library('spa-volume',
579 - dependencies : [ spa_dep ],
580 + include_directories : [spa_inc],
582 install_dir : spa_plugindir / 'volume')
583 diff --git a/spa/plugins/vulkan/meson.build b/spa/plugins/vulkan/meson.build
584 index b79bca2cf..9683b41ea 100644
585 --- a/spa/plugins/vulkan/meson.build
586 +++ b/spa/plugins/vulkan/meson.build
587 @@ -6,6 +6,7 @@ spa_vulkan_sources = [
589 spa_vulkan = shared_library('spa-vulkan',
591 - dependencies : [ spa_dep, vulkan_dep, mathlib ],
592 + include_directories : [spa_inc],
593 + dependencies : [ vulkan_dep, mathlib ],
595 install_dir : spa_plugindir / 'vulkan')
596 diff --git a/spa/tests/meson.build b/spa/tests/meson.build
597 index 9e2a211e2..146cfe08a 100644
598 --- a/spa/tests/meson.build
599 +++ b/spa/tests/meson.build
600 @@ -20,7 +20,7 @@ if find.found()
602 executable('spa-include-test-@0@'.format(spa_header.underscorify()),
604 - dependencies: [ spa_dep ],
605 + include_directories: [spa_inc],
609 @@ -35,7 +35,8 @@ benchmark_apps = [
610 foreach a : benchmark_apps
611 benchmark('spa-' + a,
612 executable('spa-' + a, a + '.c',
613 - dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib ],
614 + dependencies : [dl_lib, pthread_lib, mathlib ],
615 + include_directories : [spa_inc ],
616 install : installed_tests_enabled,
617 install_dir : installed_tests_execdir,
619 diff --git a/spa/tools/meson.build b/spa/tools/meson.build
620 index 6f12e9c8f..e4df6c3ac 100644
621 --- a/spa/tools/meson.build
622 +++ b/spa/tools/meson.build
624 executable('spa-inspect', 'spa-inspect.c',
625 - dependencies : [ spa_dep, dl_lib ],
626 + include_directories : [spa_inc],
627 + dependencies : [dl_lib, ],
630 executable('spa-monitor', 'spa-monitor.c',
631 - dependencies : [ spa_dep, dl_lib ],
632 + include_directories : [spa_inc],
633 + dependencies : [dl_lib, ],
636 executable('spa-json-dump', 'spa-json-dump.c',
637 - dependencies : [ spa_dep, dl_lib, ],
638 + include_directories : [spa_inc],
639 + dependencies : [dl_lib, ],
641 diff --git a/src/daemon/meson.build b/src/daemon/meson.build
642 index 5e64287a1..104a6dbf3 100644
643 --- a/src/daemon/meson.build
644 +++ b/src/daemon/meson.build
645 @@ -86,16 +86,16 @@ pipewire_exec = executable('pipewire',
646 pipewire_daemon_sources,
648 c_args : pipewire_c_args,
649 - include_directories : [ configinc ],
650 - dependencies : [ spa_dep, pipewire_dep, ],
651 + include_directories : [configinc, spa_inc],
652 + dependencies : [pipewire_dep, ],
655 executable('pipewire-pulse',
656 pipewire_daemon_sources,
658 c_args : pipewire_c_args,
659 - include_directories : [ configinc ],
660 - dependencies : [ spa_dep, pipewire_dep, ],
661 + include_directories : [configinc, spa_inc],
662 + dependencies : [pipewire_dep, ],
665 ln = find_program('ln')
666 diff --git a/src/gst/meson.build b/src/gst/meson.build
667 index 709dc0f1c..b91b33dc9 100644
668 --- a/src/gst/meson.build
669 +++ b/src/gst/meson.build
670 @@ -24,8 +24,8 @@ pipewire_gst_headers = [
672 pipewire_gst = shared_library('gstpipewire',
673 pipewire_gst_sources,
674 - include_directories : [ configinc ],
675 - dependencies : [ spa_dep, gst_dep, pipewire_dep ],
676 + include_directories : [configinc, spa_inc],
677 + dependencies : [gst_dep, pipewire_dep],
679 install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
681 diff --git a/src/modules/meson.build b/src/modules/meson.build
682 index 45852f3b9..61a53bd6f 100644
683 --- a/src/modules/meson.build
684 +++ b/src/modules/meson.build
685 @@ -30,20 +30,20 @@ module_sources = [
688 pipewire_module_access = shared_library('pipewire-module-access', [ 'module-access.c' ],
689 - include_directories : [configinc],
690 + include_directories : [configinc, spa_inc],
692 install_dir : modules_install_dir,
693 install_rpath: modules_install_dir,
694 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
695 + dependencies : [mathlib, dl_lib, pipewire_dep],
698 pipewire_module_loopback = shared_library('pipewire-module-loopback',
699 [ 'module-loopback.c' ],
700 - include_directories : [configinc],
701 + include_directories : [configinc, spa_inc],
703 install_dir : modules_install_dir,
704 install_rpath: modules_install_dir,
705 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
706 + dependencies : [mathlib, dl_lib, pipewire_dep],
710 @@ -53,7 +53,7 @@ if have_sse
711 pffft_sse = static_library('pffft_sse',
712 ['module-filter-chain/pffft.c' ],
713 c_args : [sse_args, '-O3', '-DHAVE_SSE'],
714 - dependencies : [ spa_dep ],
715 + include_directories : [spa_inc],
718 simd_cargs += ['-DHAVE_SSE']
719 @@ -63,7 +63,7 @@ if have_neon
720 pffft_neon = static_library('pffft_neon',
721 ['module-filter-chain/pffft.c' ],
722 c_args : [neon_args, '-O3', '-DHAVE_NEON'],
723 - dependencies : [ spa_dep ],
724 + include_directories : [spa_inc],
727 simd_cargs += ['-DHAVE_NEON']
728 @@ -73,7 +73,7 @@ endif
729 pffft_c = static_library('pffft_c',
730 ['module-filter-chain/pffft.c' ],
731 c_args : [simd_cargs, '-O3', '-DPFFFT_SIMD_DISABLE'],
732 - dependencies : [ spa_dep ],
733 + include_directories : [spa_inc],
736 simd_dependencies += pffft_c
737 @@ -99,7 +99,7 @@ endif
739 pipewire_module_filter_chain = shared_library('pipewire-module-filter-chain',
740 filter_chain_sources,
741 - include_directories : [configinc],
742 + include_directories : [configinc, spa_inc],
744 install_dir : modules_install_dir,
745 install_rpath: modules_install_dir,
746 @@ -120,7 +120,7 @@ endif
748 pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
749 pipewire_module_echo_cancel_sources,
750 - include_directories : [configinc],
751 + include_directories : [configinc, spa_inc],
753 install_dir : modules_install_dir,
754 install_rpath: modules_install_dir,
755 @@ -130,17 +130,17 @@ pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
756 pipewire_module_profiler = shared_library('pipewire-module-profiler',
757 [ 'module-profiler.c',
758 'module-profiler/protocol-native.c', ],
759 - include_directories : [configinc],
760 + include_directories : [configinc, spa_inc],
762 install_dir : modules_install_dir,
763 install_rpath: modules_install_dir,
764 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
765 + dependencies : [mathlib, dl_lib, pipewire_dep],
768 build_module_rt = build_machine.system() == 'linux'
770 pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ],
771 - include_directories : [configinc],
772 + include_directories : [configinc, spa_inc],
774 install_dir : modules_install_dir,
775 install_rpath: modules_install_dir,
776 @@ -152,7 +152,7 @@ summary({'rt': build_module_rt}, bool_yn: true, section: 'Optional Modules')
777 build_module_rtkit = dbus_dep.found()
778 if build_module_rtkit
779 pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rtkit.c' ],
780 - include_directories : [configinc],
781 + include_directories : [configinc, spa_inc],
783 install_dir : modules_install_dir,
784 install_rpath: modules_install_dir,
785 @@ -164,7 +164,7 @@ summary({'rtkit': build_module_rtkit}, bool_yn: true, section: 'Optional Modules
786 build_module_portal = dbus_dep.found()
787 if build_module_portal
788 pipewire_module_portal = shared_library('pipewire-module-portal', [ 'module-portal.c' ],
789 - include_directories : [configinc],
790 + include_directories : [configinc, spa_inc],
792 install_dir : modules_install_dir,
793 install_rpath: modules_install_dir,
794 @@ -178,20 +178,20 @@ pipewire_module_client_device = shared_library('pipewire-module-client-device',
795 'module-client-device/resource-device.c',
796 'module-client-device/proxy-device.c',
797 'module-client-device/protocol-native.c', ],
798 - include_directories : [configinc],
799 + include_directories : [configinc, spa_inc],
801 install_dir : modules_install_dir,
802 install_rpath: modules_install_dir,
803 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
804 + dependencies : [mathlib, dl_lib, pipewire_dep],
807 pipewire_module_link_factory = shared_library('pipewire-module-link-factory',
808 [ 'module-link-factory.c' ],
809 - include_directories : [configinc],
810 + include_directories : [configinc, spa_inc],
812 install_dir : modules_install_dir,
813 install_rpath: modules_install_dir,
814 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
815 + dependencies : [mathlib, dl_lib, pipewire_dep],
818 pipewire_module_protocol_deps = [mathlib, dl_lib, pipewire_dep]
819 @@ -207,7 +207,7 @@ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-nativ
820 'module-protocol-native/protocol-native.c',
821 'module-protocol-native/v0/protocol-native.c',
822 'module-protocol-native/connection.c' ],
823 - include_directories : [configinc],
824 + include_directories : [configinc, spa_inc],
826 install_dir : modules_install_dir,
827 install_rpath: modules_install_dir,
828 @@ -281,7 +281,7 @@ endif
830 pipewire_module_protocol_pulse = shared_library('pipewire-module-protocol-pulse',
831 pipewire_module_protocol_pulse_sources,
832 - include_directories : [configinc],
833 + include_directories : [configinc, spa_inc],
835 install_dir : modules_install_dir,
836 install_rpath: modules_install_dir,
837 @@ -293,7 +293,7 @@ if build_module_pulse_tunnel
838 pipewire_module_pulse_tunnel = shared_library('pipewire-module-pulse-tunnel',
839 [ 'module-pulse-tunnel.c',
840 'module-protocol-pulse/format.c' ],
841 - include_directories : [configinc],
842 + include_directories : [configinc, spa_inc],
844 install_dir : modules_install_dir,
845 install_rpath: modules_install_dir,
846 @@ -304,7 +304,7 @@ summary({'pulse-tunnel': build_module_pulse_tunnel}, bool_yn: true, section: 'Op
848 pipewire_module_protocol_simple = shared_library('pipewire-module-protocol-simple',
849 [ 'module-protocol-simple.c' ],
850 - include_directories : [configinc],
851 + include_directories : [configinc, spa_inc],
853 install_dir : modules_install_dir,
854 install_rpath: modules_install_dir,
855 @@ -313,20 +313,20 @@ pipewire_module_protocol_simple = shared_library('pipewire-module-protocol-simpl
857 pipewire_module_example_sink = shared_library('pipewire-module-example-sink',
858 [ 'module-example-sink.c' ],
859 - include_directories : [configinc],
860 + include_directories : [configinc, spa_inc],
862 install_dir : modules_install_dir,
863 install_rpath: modules_install_dir,
864 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
865 + dependencies : [mathlib, dl_lib, pipewire_dep],
868 pipewire_module_example_sink = shared_library('pipewire-module-example-source',
869 [ 'module-example-source.c' ],
870 - include_directories : [configinc],
871 + include_directories : [configinc, spa_inc],
873 install_dir : modules_install_dir,
874 install_rpath: modules_install_dir,
875 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
876 + dependencies : [mathlib, dl_lib, pipewire_dep],
879 pipewire_module_client_node = shared_library('pipewire-module-client-node',
880 @@ -338,12 +338,12 @@ pipewire_module_client_node = shared_library('pipewire-module-client-node',
881 'module-client-node/v0/transport.c',
882 'module-client-node/v0/protocol-native.c',
884 - include_directories : [configinc],
885 + include_directories : [configinc, spa_inc],
886 link_with : pipewire_module_protocol_native,
888 install_dir : modules_install_dir,
889 install_rpath: modules_install_dir,
890 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
891 + dependencies : [mathlib, dl_lib, pipewire_dep],
894 pipewire_module_metadata = shared_library('pipewire-module-metadata',
895 @@ -351,12 +351,12 @@ pipewire_module_metadata = shared_library('pipewire-module-metadata',
896 'module-metadata/proxy-metadata.c',
897 'module-metadata/metadata.c',
898 'module-metadata/protocol-native.c'],
899 - include_directories : [configinc],
900 + include_directories : [configinc, spa_inc],
901 link_with : pipewire_module_protocol_native,
903 install_dir : modules_install_dir,
904 install_rpath: modules_install_dir,
905 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
906 + dependencies : [mathlib, dl_lib, pipewire_dep],
909 test('pw-test-protocol-native',
910 @@ -364,8 +364,8 @@ test('pw-test-protocol-native',
911 [ 'module-protocol-native/test-connection.c',
912 'module-protocol-native/connection.c' ],
913 c_args : libpipewire_c_args,
914 - include_directories : [configinc ],
915 - dependencies : [spa_dep, pipewire_dep],
916 + include_directories : [configinc, spa_inc ],
917 + dependencies : [pipewire_dep],
918 install : installed_tests_enabled,
919 install_dir : installed_tests_execdir,
921 @@ -391,7 +391,7 @@ pipewire_module_adapter = shared_library('pipewire-module-adapter',
922 [ 'module-adapter.c',
923 'module-adapter/adapter.c',
925 - include_directories : [configinc],
926 + include_directories : [configinc, spa_inc],
928 install_dir : modules_install_dir,
929 install_rpath: modules_install_dir,
930 @@ -413,11 +413,11 @@ pipewire_module_session_manager = shared_library('pipewire-module-session-manage
931 'module-session-manager/proxy-session-manager.c',
932 'module-session-manager/session.c',
934 - include_directories : [configinc],
935 + include_directories : [configinc, spa_inc],
937 install_dir : modules_install_dir,
938 install_rpath: modules_install_dir,
939 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
940 + dependencies : [mathlib, dl_lib, pipewire_dep],
943 build_module_zeroconf_discover = avahi_dep.found()
944 @@ -426,7 +426,7 @@ pipewire_module_zeroconf_discover = shared_library('pipewire-module-zeroconf-dis
945 [ 'module-zeroconf-discover.c',
946 'module-protocol-pulse/format.c',
947 'module-zeroconf-discover/avahi-poll.c' ],
948 - include_directories : [configinc],
949 + include_directories : [configinc, spa_inc],
951 install_dir : modules_install_dir,
952 install_rpath: modules_install_dir,
953 @@ -440,7 +440,7 @@ if build_module_raop_discover
954 pipewire_module_raop_discover = shared_library('pipewire-module-raop-discover',
955 [ 'module-raop-discover.c',
956 'module-zeroconf-discover/avahi-poll.c' ],
957 - include_directories : [configinc],
958 + include_directories : [configinc, spa_inc],
960 install_dir : modules_install_dir,
961 install_rpath: modules_install_dir,
962 @@ -454,7 +454,7 @@ if build_module_raop
963 pipewire_module_raop_sink = shared_library('pipewire-module-raop-sink',
964 [ 'module-raop-sink.c',
965 'module-raop/rtsp-client.c' ],
966 - include_directories : [configinc],
967 + include_directories : [configinc, spa_inc],
969 install_dir : modules_install_dir,
970 install_rpath: modules_install_dir,
971 @@ -470,7 +470,7 @@ build_module_roc = roc_lib.found()
973 pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink',
974 [ 'module-roc-sink.c' ],
975 - include_directories : [configinc],
976 + include_directories : [configinc, spa_inc],
978 install_dir : modules_install_dir,
979 install_rpath: modules_install_dir,
980 @@ -479,7 +479,7 @@ pipewire_module_roc_sink = shared_library('pipewire-module-roc-sink',
982 pipewire_module_roc_source = shared_library('pipewire-module-roc-source',
983 [ 'module-roc-source.c' ],
984 - include_directories : [configinc],
985 + include_directories : [configinc, spa_inc],
987 install_dir : modules_install_dir,
988 install_rpath: modules_install_dir,
989 diff --git a/src/modules/spa/meson.build b/src/modules/spa/meson.build
990 index 8332910b5..ab4fac18d 100644
991 --- a/src/modules/spa/meson.build
992 +++ b/src/modules/spa/meson.build
994 pipewire_module_spa_node = shared_library('pipewire-module-spa-node',
995 [ 'module-node.c', 'spa-node.c' ],
996 - include_directories : [configinc],
997 + include_directories : [configinc, spa_inc],
999 install_dir : modules_install_dir,
1000 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
1001 + dependencies : [mathlib, dl_lib, pipewire_dep],
1004 pipewire_module_spa_device = shared_library('pipewire-module-spa-device',
1005 [ 'module-device.c', 'spa-device.c' ],
1006 - include_directories : [configinc],
1007 + include_directories : [configinc, spa_inc],
1009 install_dir : modules_install_dir,
1010 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
1011 + dependencies : [mathlib, dl_lib, pipewire_dep],
1014 pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-factory',
1015 [ 'module-node-factory.c', 'spa-node.c' ],
1016 - include_directories : [configinc],
1017 + include_directories : [configinc, spa_inc],
1019 install_dir : modules_install_dir,
1020 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
1021 + dependencies : [mathlib, dl_lib, pipewire_dep],
1024 pipewire_module_spa_device_factory = shared_library('pipewire-module-spa-device-factory',
1025 [ 'module-device-factory.c', 'spa-device.c' ],
1026 - include_directories : [configinc],
1027 + include_directories : [configinc, spa_inc],
1029 install_dir : modules_install_dir,
1030 - dependencies : [spa_dep, mathlib, dl_lib, pipewire_dep],
1031 + dependencies : [mathlib, dl_lib, pipewire_dep],
1033 diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
1034 index 969f50b22..f66ce8746 100644
1035 --- a/src/pipewire/meson.build
1036 +++ b/src/pipewire/meson.build
1037 @@ -103,9 +103,9 @@ libpipewire = shared_library(pipewire_name, pipewire_sources,
1038 version : libversion,
1039 soversion : soversion,
1040 c_args : libpipewire_c_args,
1041 - include_directories : [pipewire_inc, configinc, includes_inc],
1042 + include_directories : [pipewire_inc, configinc, spa_inc, includes_inc],
1044 - dependencies : [spa_dep, dl_lib, mathlib, pthread_lib, libintl_dep, atomic_dep, ],
1045 + dependencies : [dl_lib, mathlib, pthread_lib, libintl_dep, atomic_dep, ],
1048 pipewire_dep = declare_dependency(link_with : libpipewire,
1049 diff --git a/test/meson.build b/test/meson.build
1050 index 89f2bc2ec..87e211431 100644
1051 --- a/test/meson.build
1052 +++ b/test/meson.build
1053 @@ -19,6 +19,7 @@ pwtest_c_args = [
1061 @@ -36,7 +37,6 @@ test('test-pwtest',
1062 executable('test-pwtest',
1064 include_directories: pwtest_inc,
1065 - dependencies: [ spa_dep ],
1066 link_with: pwtest_lib)
1069 @@ -45,7 +45,6 @@ test('test-pwtest',
1070 executable('test-example',
1072 include_directories: pwtest_inc,
1073 - dependencies: [ spa_dep ],
1074 link_with: pwtest_lib)
1076 test('test-pw-utils',
1077 @@ -55,7 +54,6 @@ test('test-pw-utils',
1080 include_directories: pwtest_inc,
1081 - dependencies: [ spa_dep ],
1082 link_with: pwtest_lib)
1085 @@ -63,7 +61,6 @@ test('test-lib',
1086 executable('test-lib',
1088 include_directories: pwtest_inc,
1089 - dependencies: [ spa_dep ],
1090 link_with: pwtest_lib)
1093 @@ -71,7 +68,6 @@ test('test-client',
1094 executable('test-client',
1096 include_directories: pwtest_inc,
1097 - dependencies: [ spa_dep ],
1098 link_with: pwtest_lib)
1101 @@ -80,7 +76,7 @@ test('test-context',
1104 include_directories: pwtest_inc,
1105 - dependencies: [spa_dep, spa_support_dep, spa_dbus_dep],
1106 + dependencies: [spa_support_dep, spa_dbus_dep],
1107 link_with: [pwtest_lib,
1108 pipewire_module_protocol_native,
1109 pipewire_module_client_node,
1110 @@ -95,7 +91,7 @@ test('test-support',
1113 include_directories: pwtest_inc,
1114 - dependencies: [spa_dep, systemd_dep, spa_support_dep, spa_journal_dep],
1115 + dependencies: [systemd_dep, spa_support_dep, spa_journal_dep],
1116 link_with: [pwtest_lib])
1119 @@ -107,7 +103,6 @@ test('test-spa',
1122 include_directories: pwtest_inc,
1123 - dependencies: [ spa_dep ],
1124 link_with: pwtest_lib)