Back to development

[platform/upstream/gstreamer.git] / subprojects / gst-docs / meson.build

diff --git a/subprojects/gst-docs/meson.build b/subprojects/gst-docs/meson.build
index 06e0cdf..e15c5e2 100644 (file)
--- a/subprojects/gst-docs/meson.build
+++ b/subprojects/gst-docs/meson.build
@@ -1,6 +1,6 @@
 project('GStreamer manuals and tutorials', 'c',
-  version: '1.19.2',
-  meson_version : '>= 0.54')
+  version: '1.21.2.1',
+  meson_version : '>= 0.62')
 
 hotdoc_p = find_program('hotdoc')
 if not hotdoc_p.found()
@@ -9,7 +9,7 @@ if not hotdoc_p.found()
 endif
 
 hotdoc_req = '>= 0.12.2'
-hotdoc_version = run_command(hotdoc_p, '--version').stdout()
+hotdoc_version = run_command(hotdoc_p, '--version', check: false).stdout()
 if not hotdoc_version.version_compare(hotdoc_req)
     error('Hotdoc version @0@ not found, got @1@'.format(hotdoc_req, hotdoc_version))
 endif
@@ -44,11 +44,12 @@ with open(fname, 'r') as f:
 
   # gst-build will generate this file for us to consume so that subproject
   # changes can still work
-  fname = join_paths(meson.build_root(), 'GstDocumentedSubprojects')
+  fname = join_paths(meson.project_build_root(), '..', '..', 'GstDocumentedSubprojects')
   cmdres = run_command(
       python3,
       '-c', read_file_contents,
       fname,
+      check: false,
     )
   if cmdres.returncode() == 0
     built_subprojects = cmdres.stdout().strip()
@@ -66,13 +67,13 @@ if built_subprojects != ''
         if sub.get_variable('build_hotdoc')
             message('Building @0@ documentation'.format(project_name))
 
-            foreach lib: sub.get_variable('libs_doc')
+            foreach lib: sub.get_variable('libs_doc', [])
               hotdoc_subprojects += [lib]
               libs += lib.full_path() + pathsep
               deps += [lib]
             endforeach
 
-            foreach plugin_doc: sub.get_variable('plugins_doc')
+            foreach plugin_doc: sub.get_variable('plugins_doc', [])
               plugins_doc += plugin_doc.full_path() + pathsep
               hotdoc_subprojects += [plugin_doc]
               deps += [plugin_doc]
@@ -123,6 +124,7 @@ gstreamer_doc = hotdoc.generate_doc('GStreamer',
     build_always_stale: true,
     edit_on_github_repository: 'https://gitlab.freedesktop.org/gstreamer/gst-docs/',
     previous_symbol_index: join_paths(meson.current_source_dir(), 'symbols', 'symbol_index.json'),
+    fatal_warnings: get_option('fatal_warnings')
 )
 
 cdata = configuration_data()