treewide: meson.build: use dependency variable for SPA

Use `spa_dep` everywhere instead of `spa_inc`,
and remove `spa_inc` altogether.

spa/examples/meson.build

@@ -23,8 +23,8 @@ foreach c : spa_examples
     executable(
       c,
       c + '.c',
-      include_directories : [configinc, spa_inc],
-      dependencies : [dl_lib, pthread_lib, mathlib] + deps,
+      include_directories : [configinc],
+      dependencies : [spa_dep, dl_lib, pthread_lib, mathlib] + deps,
       install : installed_tests_enabled,
       install_dir : installed_tests_execdir / 'examples' / 'spa'
     )

spa/meson.build

@@ -5,7 +5,25 @@
 #pthread_lib = dependencies('threads')
 #mathlib = cc.find_library('m', required : false)
 
-spa_inc = include_directories('include')
+spa_dep = declare_dependency(
+  include_directories : [
+    include_directories('include'),
+  ],
+  version : spaversion,
+  variables : { 'plugindir' : meson.current_build_dir() / 'plugins' }
+)
+
+meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
+
+pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
+  name : 'libspa',
+  subdirs : spa_name,
+  description : 'Simple Plugin API',
+  version : spaversion,
+  extra_cflags : '-D_REENTRANT',
+  variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
+  uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
+)
 
 subdir('include')
 
@@ -62,21 +80,3 @@ subdir('tests')
 if not get_option('examples').disabled()
   subdir('examples')
 endif
-
-spa_dep = declare_dependency(
-  include_directories : [spa_inc],
-  version : spaversion,
-  variables : { 'plugindir' : meson.current_build_dir() / 'plugins' }
-)
-
-pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
-  name : 'libspa',
-  subdirs : spa_name,
-  description : 'Simple Plugin API',
-  version : spaversion,
-  extra_cflags : '-D_REENTRANT',
-  variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
-  uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
-)
-
-meson.override_dependency('lib@0@'.format(spa_name), spa_dep)

spa/plugins/alsa/acp/meson.build

@@ -16,7 +16,7 @@ acp_lib = static_library(
   'acp',
   acp_sources,
   c_args : acp_c_args,
-  include_directories : [configinc, spa_inc, includes_inc ],
-  dependencies : [ alsa_dep, mathlib, ]
+  include_directories : [configinc, includes_inc ],
+  dependencies : [ spa_dep, alsa_dep, mathlib, ]
   )
 acp_dep = declare_dependency(link_with: acp_lib)

spa/plugins/alsa/meson.build

@@ -16,8 +16,8 @@ spa_alsa = shared_library(
   'spa-alsa',
   [ spa_alsa_sources ],
   c_args : acp_c_args,
-  include_directories : [spa_inc, configinc],
-  dependencies : [ alsa_dep, libudev_dep, mathlib, epoll_shim_dep, libinotify_dep ],
+  include_directories : [configinc],
+  dependencies : [ spa_dep, alsa_dep, libudev_dep, mathlib, epoll_shim_dep, libinotify_dep ],
   link_with : [ acp_lib ],
   install : true,
   install_dir : spa_plugindir / 'alsa'
@@ -30,8 +30,7 @@ alsa_udevrules = [
 executable('spa-acp-tool',
   [ 'acp-tool.c' ],
   c_args : acp_c_args,
-  include_directories : [spa_inc ],
-  dependencies : [ alsa_dep, mathlib, acp_dep ],
+  dependencies : [ spa_dep, alsa_dep, mathlib, acp_dep ],
   install : true,
 )
 

spa/plugins/audioconvert/meson.build

@@ -17,7 +17,7 @@ if have_sse
       'volume-ops-sse.c',
       'channelmix-ops-sse.c' ],
     c_args : [sse_args, '-O3', '-DHAVE_SSE'],
-    include_directories : [spa_inc],
+    dependencies : [ spa_dep ],
     install : false
     )
   simd_cargs += ['-DHAVE_SSE']
@@ -27,7 +27,7 @@ if have_sse2
   audioconvert_sse2 = static_library('audioconvert_sse2',
     ['fmt-ops-sse2.c' ],
     c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
-    include_directories : [spa_inc],
+    dependencies : [ spa_dep ],
     install : false
     )
   simd_cargs += ['-DHAVE_SSE2']
@@ -38,7 +38,7 @@ if have_ssse3
     ['fmt-ops-ssse3.c',
       'resample-native-ssse3.c' ],
     c_args : [ssse3_args, '-O3', '-DHAVE_SSSE3'],
-    include_directories : [spa_inc],
+    dependencies : [ spa_dep ],
     install : false
     )
   simd_cargs += ['-DHAVE_SSSE3']
@@ -48,7 +48,7 @@ if have_sse41
   audioconvert_sse41 = static_library('audioconvert_sse41',
     ['fmt-ops-sse41.c'],
     c_args : [sse41_args, '-O3', '-DHAVE_SSE41'],
-    include_directories : [spa_inc],
+    dependencies : [ spa_dep ],
     install : false
     )
   simd_cargs += ['-DHAVE_SSE41']
@@ -58,7 +58,7 @@ if have_avx and have_fma
   audioconvert_avx = static_library('audioconvert_avx',
     ['resample-native-avx.c'],
     c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
-    include_directories : [spa_inc],
+    dependencies : [ spa_dep ],
     install : false
     )
   simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
@@ -68,7 +68,7 @@ if have_avx2
   audioconvert_avx2 = static_library('audioconvert_avx2',
     ['fmt-ops-avx2.c'],
     c_args : [avx2_args, '-O3', '-DHAVE_AVX2'],
-    include_directories : [spa_inc],
+    dependencies : [ spa_dep ],
     install : false
     )
   simd_cargs += ['-DHAVE_AVX2']
@@ -80,7 +80,7 @@ if have_neon
     ['resample-native-neon.c',
       'fmt-ops-neon.c' ],
     c_args : [neon_args, '-O3', '-DHAVE_NEON'],
-    include_directories : [spa_inc],
+    dependencies : [ spa_dep ],
     install : false
     )
   simd_cargs += ['-DHAVE_NEON']
@@ -100,7 +100,8 @@ audioconvert_lib = static_library('audioconvert',
     'volume-ops-c.c' ],
   c_args : [ simd_cargs, '-O3'],
   link_with : simd_dependencies,
-  include_directories : [configinc, spa_inc],
+  include_directories : [configinc],
+  dependencies : [ spa_dep ],
   install : false
   )
 audioconvert_dep = declare_dependency(link_with: audioconvert_lib)
@@ -108,8 +109,7 @@ audioconvert_dep = declare_dependency(link_with: audioconvert_lib)
 spa_audioconvert_lib = shared_library('spa-audioconvert',
   audioconvert_sources,
   c_args : simd_cargs,
-  include_directories : [spa_inc],
-  dependencies : [ mathlib, audioconvert_dep ],
+  dependencies : [ spa_dep, mathlib, audioconvert_dep ],
   install : true,
   install_dir : spa_plugindir / 'audioconvert')
 spa_audioconvert_dep = declare_dependency(link_with: spa_audioconvert_lib)
@@ -117,7 +117,7 @@ spa_audioconvert_dep = declare_dependency(link_with: spa_audioconvert_lib)
 test_lib = static_library('test_lib',
   ['test-source.c' ],
   c_args : ['-O3'],
-  include_directories : [spa_inc],
+  dependencies : [ spa_dep ],
   install : false
   )
 
@@ -132,8 +132,8 @@ test_apps = [
 foreach a : test_apps
   test(a,
     executable(a, a + '.c',
-      dependencies : [ dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
-      include_directories : [ configinc, spa_inc ],
+      dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
+      include_directories : [ configinc ],
       link_with : [ test_lib ],
       install_rpath : spa_plugindir / 'audioconvert',
       c_args : [ simd_cargs ],
@@ -163,8 +163,8 @@ benchmark_apps = [
 foreach a : benchmark_apps
   benchmark(a,
     executable(a, a + '.c',
-      dependencies : [ dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
-      include_directories : [ configinc, spa_inc ],
+      dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib, audioconvert_dep, spa_audioconvert_dep ],
+      include_directories : [ configinc ],
       c_args : [ simd_cargs ],
       install_rpath : spa_plugindir / 'audioconvert',
       install : installed_tests_enabled,
@@ -192,9 +192,8 @@ if sndfile_dep.found()
   executable('spa-resample',
     sparesample_sources,
     c_args : [ simd_cargs ],
-    include_directories : [spa_inc ],
     link_with : [ test_lib ],
-    dependencies : [sndfile_dep, mathlib, audioconvert_dep],
+    dependencies : [ spa_dep, sndfile_dep, mathlib, audioconvert_dep ],
     install : true,
     )
 endif

spa/plugins/audiomixer/meson.build

@@ -11,7 +11,7 @@ simd_dependencies = []
 audiomixer_c = static_library('audiomixer_c',
   ['mix-ops-c.c' ],
   c_args : ['-O3'],
-  include_directories : [spa_inc],
+  dependencies : [ spa_dep ],
   install : false
 )
 simd_dependencies += audiomixer_c
@@ -20,7 +20,7 @@ if have_sse
   audiomixer_sse = static_library('audiomixer_sse',
     ['mix-ops-sse.c' ],
     c_args : [sse_args, '-O3', '-DHAVE_SSE'],
-    include_directories : [spa_inc],
+    dependencies : [ spa_dep ],
     install : false
   )
   simd_cargs += ['-DHAVE_SSE']
@@ -30,7 +30,7 @@ if have_sse2
   audiomixer_sse2 = static_library('audiomixer_sse2',
     ['mix-ops-sse2.c' ],
     c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
-    include_directories : [spa_inc],
+    dependencies : [ spa_dep ],
     install : false
   )
   simd_cargs += ['-DHAVE_SSE2']
@@ -40,7 +40,7 @@ if have_avx and have_fma
   audiomixer_avx = static_library('audiomixer_avx',
     ['mix-ops-avx.c'],
     c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
-    include_directories : [spa_inc],
+    dependencies : [ spa_dep ],
     install : false
   )
   simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
@@ -51,8 +51,7 @@ audiomixerlib = shared_library('spa-audiomixer',
   audiomixer_sources,
   c_args : simd_cargs,
   link_with : simd_dependencies,
-  include_directories : [spa_inc],
-  dependencies : [ mathlib ],
+  dependencies : [ spa_dep, mathlib ],
   install : true,
   install_dir : spa_plugindir / 'audiomixer'
 )

spa/plugins/audiotestsrc/meson.build

@@ -2,7 +2,6 @@ audiotestsrc_sources = ['audiotestsrc.c', 'plugin.c']
 
 audiotestsrclib = shared_library('spa-audiotestsrc',
                           audiotestsrc_sources,
-                          include_directories : [spa_inc],
-                          dependencies : [mathlib, ],
+                          dependencies : [ spa_dep, mathlib ],
                           install : true,
                           install_dir : spa_plugindir / 'audiotestsrc')

spa/plugins/bluez5/meson.build

@@ -56,8 +56,8 @@ endif
 
 bluez5lib = shared_library('spa-bluez5',
   bluez5_sources,
-  include_directories : [ spa_inc, configinc ],
-  dependencies : bluez5_deps,
+  include_directories : [ configinc ],
+  dependencies : [ spa_dep, bluez5_deps ],
   install : true,
   install_dir : spa_plugindir / 'bluez5')
 
@@ -65,26 +65,26 @@ codec_args = [ '-DCODEC_PLUGIN' ]
 
 bluez_codec_sbc = shared_library('spa-codec-bluez5-sbc',
   [ 'a2dp-codec-sbc.c', 'a2dp-codecs.c' ],
-  include_directories : [ spa_inc, configinc ],
+  include_directories : [ configinc ],
   c_args : codec_args,
-  dependencies : sbc_dep,
+  dependencies : [ spa_dep, sbc_dep ],
   install : true,
   install_dir : spa_plugindir / 'bluez5')
 
 bluez_codec_faststream = shared_library('spa-codec-bluez5-faststream',
   [ 'a2dp-codec-faststream.c', 'a2dp-codecs.c' ],
-  include_directories : [ spa_inc, configinc ],
+  include_directories : [ configinc ],
   c_args : codec_args,
-  dependencies : sbc_dep,
+  dependencies : [ spa_dep, sbc_dep ],
   install : true,
   install_dir : spa_plugindir / 'bluez5')
 
 if fdk_aac_dep.found()
   bluez_codec_aac = shared_library('spa-codec-bluez5-aac',
     [ 'a2dp-codec-aac.c', 'a2dp-codecs.c' ],
-    include_directories : [ spa_inc, configinc ],
+    include_directories : [ configinc ],
     c_args : codec_args,
-    dependencies : fdk_aac_dep,
+    dependencies : [ spa_dep, fdk_aac_dep ],
     install : true,
     install_dir : spa_plugindir / 'bluez5')
 endif
@@ -92,9 +92,9 @@ endif
 if aptx_dep.found()
   bluez_codec_aptx = shared_library('spa-codec-bluez5-aptx',
     [ 'a2dp-codec-aptx.c', 'a2dp-codecs.c' ],
-    include_directories : [ spa_inc, configinc ],
+    include_directories : [ configinc ],
     c_args : codec_args,
-    dependencies : [ aptx_dep, sbc_dep ],
+    dependencies : [ spa_dep, aptx_dep, sbc_dep ],
     install : true,
     install_dir : spa_plugindir / 'bluez5')
 endif
@@ -108,9 +108,9 @@ if ldac_dep.found()
   endif
   bluez_codec_ldac = shared_library('spa-codec-bluez5-ldac',
     [ 'a2dp-codec-ldac.c', 'a2dp-codecs.c' ],
-    include_directories : [ spa_inc, configinc ],
+    include_directories : [ configinc ],
     c_args : ldac_args,
-    dependencies : ldac_dep,
+    dependencies : [ spa_dep, ldac_dep ],
     install : true,
     install_dir : spa_plugindir / 'bluez5')
 endif

spa/plugins/control/meson.build

@@ -5,7 +5,6 @@ control_sources = [
 
 controllib = shared_library('spa-control',
   control_sources,
-  include_directories : [spa_inc],
-  dependencies : [ mathlib ],
+  dependencies : [ spa_dep, mathlib ],
   install : true,
   install_dir : spa_plugindir / 'control')

spa/plugins/ffmpeg/meson.build

@@ -4,7 +4,6 @@ ffmpeg_sources = ['ffmpeg.c',
 
 ffmpeglib = shared_library('spa-ffmpeg',
                           ffmpeg_sources,
-                          include_directories : [spa_inc],
-                          dependencies : [avcodec_dep],
+                          dependencies : [ spa_dep, avcodec_dep ],
                           install : true,
                           install_dir : spa_plugindir / 'ffmpeg')

spa/plugins/jack/meson.build

@@ -7,7 +7,6 @@ spa_jack_sources = [
 
 spa_jack = shared_library('spa-jack',
   spa_jack_sources,
-  include_directories : [spa_inc],
-  dependencies : [ jack_dep, mathlib ],
+  dependencies : [ spa_dep, jack_dep, mathlib ],
   install : true,
   install_dir : spa_plugindir / 'jack')

spa/plugins/libcamera/meson.build

@@ -11,8 +11,7 @@ summary({'libdrm': libdrm_dep.found()}, bool_yn: true, section: 'Backend')
 if libdrm_dep.found()
   libcameralib = shared_library('spa-libcamera',
     libcamera_sources,
-    include_directories : [ spa_inc ],
-    dependencies : [ libudev_dep, libcamera_dep, pthread_lib, libdrm_dep  ],
+    dependencies : [ spa_dep, libudev_dep, libcamera_dep, pthread_lib, libdrm_dep  ],
     install : true,
     install_dir : spa_plugindir / 'libcamera')
 endif

spa/plugins/support/meson.build

@@ -17,14 +17,12 @@ endif
 
 spa_support_lib = shared_library('spa-support',
   spa_support_sources,
-  include_directories : [ spa_inc ],
   c_args : [ simd_cargs ],
-  dependencies : [ pthread_lib, epoll_shim_dep ],
+  dependencies : [ spa_dep, pthread_lib, epoll_shim_dep ],
   install : true,
   install_dir : spa_plugindir / 'support')
 spa_support_dep = declare_dependency(link_with: spa_support_lib)
 
-
 if not get_option('evl').disabled()
   evl_inc = include_directories('/usr/evl/include')
   evl_lib = cc.find_library('evl',
@@ -35,8 +33,8 @@ if not get_option('evl').disabled()
 
   spa_evl_lib = shared_library('spa-evl',
     spa_evl_sources,
-    include_directories : [ spa_inc, evl_inc],
-    dependencies : [ pthread_lib, evl_lib],
+    include_directories : [ evl_inc],
+    dependencies : [ spa_dep, pthread_lib, evl_lib ],
     install : true,
     install_dir : spa_plugindir / 'support')
 endif
@@ -46,8 +44,7 @@ if dbus_dep.found()
 
   spa_dbus_lib = shared_library('spa-dbus',
     spa_dbus_sources,
-    include_directories : [ spa_inc],
-    dependencies : [dbus_dep, ],
+    dependencies : [ spa_dep, dbus_dep ],
     install : true,
     install_dir : spa_plugindir / 'support')
   spa_dbus_dep = declare_dependency(link_with: spa_dbus_lib)
@@ -64,8 +61,7 @@ if systemd_dep.found()
 
   spa_journal_lib = shared_library('spa-journal',
     spa_journal_sources,
-    include_directories : spa_inc,
-    dependencies : systemd_dep,
+    dependencies : [ spa_dep, systemd_dep ],
     install : true,
     install_dir : spa_plugindir / 'support')
   spa_journal_dep = declare_dependency(link_with: spa_journal_lib)

spa/plugins/test/meson.build

@@ -2,7 +2,6 @@ test_sources = ['fakesrc.c', 'fakesink.c', 'plugin.c']
 
 testlib = shared_library('spa-test',
                           test_sources,
-                          include_directories : [ spa_inc],
-                          dependencies : [pthread_lib, ],
+                          dependencies : [ spa_dep, pthread_lib ],
                           install : true,
                           install_dir : spa_plugindir / 'test')

spa/plugins/v4l2/meson.build

@@ -5,7 +5,6 @@ v4l2_sources = ['v4l2.c',
 
 v4l2lib = shared_library('spa-v4l2',
                           v4l2_sources,
-                          include_directories : [ spa_inc ],
-                          dependencies : [ libudev_dep, libinotify_dep ],
+                          dependencies : [ spa_dep, libudev_dep, libinotify_dep ],
                           install : true,
                           install_dir : spa_plugindir / 'v4l2')

spa/plugins/videoconvert/meson.build

@@ -9,8 +9,7 @@ simd_dependencies = []
 videoconvertlib = shared_library('spa-videoconvert',
   videoconvert_sources,
   c_args : simd_cargs,
-  include_directories : [spa_inc],
-  dependencies : [ mathlib ],
+  dependencies : [ spa_dep, mathlib ],
   link_with : simd_dependencies,
   install : true,
   install_dir : spa_plugindir / 'videoconvert')

spa/plugins/videotestsrc/meson.build

@@ -2,7 +2,6 @@ videotestsrc_sources = ['videotestsrc.c', 'plugin.c']
 
 videotestsrclib = shared_library('spa-videotestsrc',
   videotestsrc_sources,
-  include_directories : [ spa_inc],
-  dependencies : [pthread_lib, ],
+  dependencies : [ spa_dep, pthread_lib ],
   install : true,
   install_dir : spa_plugindir / 'videotestsrc')

spa/plugins/volume/meson.build

@@ -2,6 +2,6 @@ volume_sources = ['volume.c', 'plugin.c']
 
 volumelib = shared_library('spa-volume',
   volume_sources,
-  include_directories : [spa_inc],
+  dependencies : [ spa_dep ],
   install : true,
   install_dir : spa_plugindir / 'volume')

spa/plugins/vulkan/meson.build

@@ -6,7 +6,6 @@ spa_vulkan_sources = [
 
 spa_vulkan = shared_library('spa-vulkan',
   spa_vulkan_sources,
-  include_directories : [spa_inc],
-  dependencies : [ vulkan_dep, mathlib ],
+  dependencies : [ spa_dep, vulkan_dep, mathlib ],
   install : true,
   install_dir : spa_plugindir / 'vulkan')

spa/tests/meson.build

@@ -20,7 +20,7 @@ if find.found()
                           configuration: c)
       executable('spa-include-test-@0@'.format(spa_header.underscorify()),
                  src,
-                 include_directories: [spa_inc],
+                 dependencies: [ spa_dep ],
                  install: false)
     endif
   endforeach
@@ -35,8 +35,7 @@ benchmark_apps = [
 foreach a : benchmark_apps
   benchmark('spa-' + a,
     executable('spa-' + a, a + '.c',
-      dependencies : [dl_lib, pthread_lib, mathlib ],
-      include_directories : [spa_inc ],
+      dependencies : [ spa_dep, dl_lib, pthread_lib, mathlib ],
       install : installed_tests_enabled,
       install_dir : installed_tests_execdir,
     ),

spa/tools/meson.build

@@ -1,14 +1,11 @@
 executable('spa-inspect', 'spa-inspect.c',
-           include_directories : [spa_inc],
-           dependencies : [dl_lib, ],
+           dependencies : [ spa_dep, dl_lib ],
            install : true)
 
 executable('spa-monitor', 'spa-monitor.c',
-           include_directories : [spa_inc],
-           dependencies : [dl_lib, ],
+           dependencies : [ spa_dep, dl_lib ],
            install : true)
 
 executable('spa-json-dump', 'spa-json-dump.c',
-           include_directories : [spa_inc],
-           dependencies : [dl_lib, ],
+           dependencies : [ spa_dep, dl_lib, ],
            install : true)