meson: Fix build when orc is disabled

Making sure not to use the orc_dep variable in case
orc has been explicitely disabled.

diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build
index 3dee9db..58ca7dd 100644 (file)
--- a/gst-libs/gst/audio/meson.build
+++ b/gst-libs/gst/audio/meson.build
@@ -67,8 +67,10 @@ gstaudio_c = custom_target('gstaudioenum_c',
   command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@'])
 audio_gen_sources = [gstaudio_h]
 
+gstaudio_deps = [tag_dep, gst_base_dep, libm]
 orcsrc = 'gstaudiopack'
 if have_orcc
+  gstaudio_deps += [orc_dep]
   orc_h = custom_target(orcsrc + '.h',
     input : orcsrc + '.orc',
     output : orcsrc + '.h',
@@ -128,7 +130,6 @@ if have_sse41
   simd_dependencies += audio_resampler_sse41
 endif
 
-gstaudio_deps = [tag_dep, gst_base_dep, orc_dep, libm]
 gstaudio = library('gstaudio-@0@'.format(api_version),
   audio_src, gstaudio_h, gstaudio_c, orc_c, orc_h,
   c_args : gst_plugins_base_args + simd_cargs,

diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build
index ae13586..105f9cb 100644 (file)
--- a/gst-libs/gst/video/meson.build
+++ b/gst-libs/gst/video/meson.build
@@ -99,7 +99,9 @@ gstvideo_c = custom_target('gstvideoenum_c',
 video_gen_sources = [gstvideo_h]
 
 orcsrc = 'video-orc'
+gstvideo_deps = [gst_base_dep, libm]
 if have_orcc
+  gstvideo_deps += [orc_dep]
   orc_h = custom_target(orcsrc + '.h',
     input : orcsrc + '.orc',
     output : orcsrc + '.h',
@@ -117,7 +119,6 @@ else
     configuration : configuration_data())
 endif
 
-gstvideo_deps = [gst_base_dep, orc_dep, libm]
 gstvideo = library('gstvideo-@0@'.format(api_version),
   video_sources, gstvideo_h, gstvideo_c, orc_c, orc_h,
   c_args : gst_plugins_base_args,

diff --git a/gst/adder/meson.build b/gst/adder/meson.build
index 53ec31d..f02a347 100644 (file)
--- a/gst/adder/meson.build
+++ b/gst/adder/meson.build
@@ -1,5 +1,7 @@
+adder_deps = [audio_dep]
 orcsrc = 'gstadderorc'
 if have_orcc
+  adder_deps += [orc_dep]
   orc_h = custom_target(orcsrc + '.h',
     input : orcsrc + '.orc',
     output : orcsrc + '.h',
@@ -21,7 +23,7 @@ adder = library('gstadder',
   'gstadder.c', orc_c, orc_h,
   c_args: gst_plugins_base_args,
   include_directories: [configinc, libsinc],
-  dependencies : [audio_dep, orc_dep],
+  dependencies : adder_deps,
   install : true,
   install_dir : plugins_install_dir,
 )

diff --git a/gst/videotestsrc/meson.build b/gst/videotestsrc/meson.build
index 65c36cd..6f24d07 100644 (file)
--- a/gst/videotestsrc/meson.build
+++ b/gst/videotestsrc/meson.build
@@ -1,5 +1,7 @@
+videotestsrc_deps = glib_deps + [video_dep, gst_dep, gst_base_dep, libm]
 orcsrc = 'gstvideotestsrcorc'
 if have_orcc
+  videotestsrc_deps += [orc_dep]
   orc_h = custom_target(orcsrc + '.h',
     input : orcsrc + '.orc',
     output : orcsrc + '.h',
@@ -21,7 +23,7 @@ gstvideotestsrc = library('gstvideotestsrc',
   'gstvideotestsrc.c', 'videotestsrc.c', orc_c, orc_h,
   c_args : gst_plugins_base_args,
   include_directories: [configinc, libsinc],
-  dependencies : glib_deps + [video_dep, gst_dep, gst_base_dep, orc_dep, libm],
+  dependencies : videotestsrc_deps,
   install : true,
   install_dir : plugins_install_dir,
 )

diff --git a/gst/volume/meson.build b/gst/volume/meson.build
index 48ef7b3..22a1c7a 100644 (file)
--- a/gst/volume/meson.build
+++ b/gst/volume/meson.build
@@ -1,5 +1,7 @@
+volume_deps = glib_deps + [audio_dep, gst_dep, gst_base_dep]
 orcsrc = 'gstvolumeorc'
 if have_orcc
+  volume_deps += [orc_dep]
   orc_h = custom_target(orcsrc + '.h',
     input : orcsrc + '.orc',
     output : orcsrc + '.h',
@@ -20,7 +22,7 @@ endif
 gstvolume = library('gstvolume', 'gstvolume.c', orc_c, orc_h,
   c_args : gst_plugins_base_args,
   include_directories: [configinc, libsinc],
-  dependencies : glib_deps + [audio_dep, gst_dep, gst_base_dep, orc_dep],
+  dependencies : volume_deps,
   install : true,
   install_dir : plugins_install_dir,
 )