Merge branch 'upstream/1.22.7' into tizen_gst_1.22.7

[platform/upstream/gstreamer.git] / meson.build

diff --git a/meson.build b/meson.build
index 6027292..8450bfc 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gstreamer-full', 'c',
-  version : '1.21.2',
+  version : '1.22.7',
   meson_version : '>= 0.62.0',
   default_options : ['buildtype=debugoptimized',
                      # Needed due to https://github.com/mesonbuild/meson/issues/1889,
@@ -154,10 +154,7 @@ foreach sp : subprojects
   if match_gst_version
     subproj = subproject(project_name, version: gst_version, required: is_required, default_options: default_options)
   elif sysdep != ''
-      sysdep_dep = dependency(sysdep, version: sysdep_version, required: false, default_options: default_options)
-      if not sysdep_dep.found()
-        subproj = subproject(project_name, required: is_required, default_options: default_options)
-      endif
+    sysdep_dep = dependency(sysdep, version: sysdep_version, required: is_required, default_options: default_options)
   else
     subproj = subproject(project_name, required: is_required, default_options: default_options)
   endif
@@ -256,7 +253,11 @@ configure_file(
 )
 
 if documented_projects != ''
-  subproject('gst-docs', required: get_option('doc').enabled())
+  gst_doc = subproject('gst-docs', required: get_option('doc').enabled())
+  if gst_doc.found()
+    gst_doc_target = gst_doc.get_variable('gstreamer_doc')
+    alias_target('gst-doc', gst_doc_target)
+  endif
   message('Gst docs subprojects: ' + documented_projects)
 endif
 
@@ -267,7 +268,7 @@ foreach plugin: all_plugins
   plugin_path = plugin.get_variable('full_path')
   all_plugins_paths += plugin_path
   all_plugins_dirs += fs.parent(plugin_path)
-  plugins_names += plugin_path
+  plugins_names += fs.name(plugin_path)
 endforeach
 
 # Work around meson bug: https://github.com/mesonbuild/meson/pull/6770
@@ -473,8 +474,6 @@ setenv = find_program('gst-env.py')
 devenv_cmd = [setenv, '--builddir=@0@'.format(meson.global_build_root()),
               '--srcdir=@0@'.format(meson.global_source_root())]
 
-subdir('tests')
-subdir('ci/fuzzing')
 
 if meson.can_run_host_binaries() and build_machine.system() == 'linux' and host_machine.system() == 'windows'
   # FIXME: Ideally we could get the wrapper directly from meson
@@ -492,6 +491,7 @@ if orc_subproject.found() and orc_update_targets.length() > 0
   alias_target('update-orc-dist', orc_update_targets)
 endif
 
+
 dotnet_format = find_program('dotnet-format', required: false)
 if dotnet_format.found()
     run_target('csharp_format_check',