subprojects: orc: bump to latest commit

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

diff --git a/meson.build b/meson.build
index 3967832..1da3ac6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -173,9 +173,19 @@ foreach sp : subprojects
   endif
 
   if subproj.found()
-    plugins = subproj.get_variable('plugins', [])
+    plugins = subproj.get_variable('gst_plugins', [])
+    legacy_plugins = subproj.get_variable('plugins', [])
     all_plugins += plugins
-    all_libraries += subproj.get_variable('libraries', [])
+    if plugins.length() == 0 and legacy_plugins.length() > 0
+      warning(f'DEPRECATED use of the `plugins` variable in @project_name@.')
+      warning('The variable should now be called `gst_plugins` and use:')
+      warning('`declare_dependency( link_with: <plugin_target>, variable: {\'full_path\': <plugin_target>.full_path()})` instead')
+      foreach plugin: legacy_plugins
+        all_plugins += [declare_dependency(link_with: plugin, variables: {'full_path': plugin.full_path()})]
+      endforeach
+    endif
+
+    all_libraries += subproj.get_variable('gst_libraries', [])
     if not get_option('tools').disabled()
       all_tools += subproj.get_variable('gst_tools', {})
     endif
@@ -185,9 +195,7 @@ foreach sp : subprojects
     subprojects_names += [project_name]
 
     if not meson.is_cross_build() and build_infos.get('build-hotdoc', false)
-      if plugins.length() > 0
-        plugins_doc_caches += [subproj.get_variable('plugins_doc_dep', [])]
-      endif
+      plugins_doc_caches += [subproj.get_variable('gst_plugins_doc_dep', [])]
       if documented_projects != ''
         documented_projects += ','
       endif
@@ -197,13 +205,17 @@ foreach sp : subprojects
 endforeach
 
 # Check if we need to also build glib-networking for TLS modules
+giomodules = []
 glib_dep = dependency('glib-2.0')
 if glib_dep.type_name() == 'internal'
-  subproject('glib-networking', required : get_option('tls'),
+  subp = subproject('glib-networking', required : get_option('tls'),
              default_options: ['gnutls=auto', 'openssl=auto'])
+  if subp.found()
+    giomodules += subp.get_variable('giomodules', [])
+  endif
 endif
 
-plugins_doc_dep = custom_target('plugins-doc-cache',
+gst_plugins_doc_dep = custom_target('plugins-doc-cache',
   command: [python3, '-c', 'print("Built all doc caches")'],
   input: plugins_doc_caches,
   output: 'plugins_doc_caches',
@@ -252,16 +264,27 @@ endif
 
 all_plugins_paths = []
 all_plugins_dirs = []
+plugins_names = []
 foreach plugin: all_plugins
-  all_plugins_paths += plugin.full_path()
-  all_plugins_dirs += fs.parent(plugin.full_path())
+  plugin_path = plugin.get_variable('full_path')
+  all_plugins_paths += plugin_path
+  all_plugins_dirs += fs.parent(plugin_path)
+  plugins_names += plugin_path
 endforeach
+
 # Work around meson bug: https://github.com/mesonbuild/meson/pull/6770
 pathsep = host_machine.system() == 'windows' ? ';' : ':'
 all_plugins_paths = pathsep.join(all_plugins_paths)
 
 devenv = environment()
-devenv.prepend('GST_PLUGIN_PATH', all_plugins_dirs)
+if not building_full
+  devenv.prepend('GST_PLUGIN_PATH', all_plugins_dirs)
+else
+  # Make sure the current build directory is first in PATH so we prefer tools
+  # built here that links on gst-full instead instead of those built in
+  # subprojects.
+  devenv.prepend('PATH', meson.current_build_dir())
+endif
 devenv.set('CURRENT_GST', meson.current_source_dir())
 devenv.set('GST_VERSION', meson.project_version())
 devenv.set('GST_ENV', 'gst-' + meson.project_version())
@@ -288,10 +311,6 @@ if building_full
   gst_c_args = ['-DHAVE_CONFIG_H']
 
   # Generate a .c file which declare and register all built plugins
-  plugins_names = []
-  foreach plugin: all_plugins
-    plugins_names += plugin.full_path()
-  endforeach
   all_plugin_names = ';'.join(plugins_names)
 
   static_plugins = get_option('gst-full-plugins')
@@ -307,7 +326,8 @@ if building_full
                '-e ' + get_option('gst-full-elements'),
                '-t ' + get_option('gst-full-typefind-functions'),
                '-d ' + get_option('gst-full-device-providers'),
-               '-T ' + get_option('gst-full-dynamic-types')
+               '-T ' + get_option('gst-full-dynamic-types'),
+               '--giomodules', ';'.join(giomodules),
                ]
   )
 
@@ -370,13 +390,17 @@ if building_full
     endif
   endif
 
+  giomodules_deps = []
+  foreach module : giomodules
+    giomodules_deps += dependency(module)
+  endforeach
+
   # Build both shared and static library
   gstfull = both_libraries('gstreamer-full-1.0',
     init_static_plugins_c,
-    link_with : all_plugins,
     link_args: gstfull_link_args,
     link_whole : exposed_libs,
-    dependencies : incdir_deps + glib_deps,
+    dependencies : [incdir_deps, glib_deps, all_plugins, giomodules_deps],
     link_depends : link_deps,
     install : true,
   )