From fb3455d7a1fb0b8fb9d00da174986b8efce573f6 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 5 Oct 2017 14:28:42 +0200
Subject: [PATCH] meson: Add some missing args and dependencies in the gir
 generation

---
 gst-libs/gst/pbutils/meson.build | 8 ++++----
 gst-libs/gst/tag/meson.build     | 2 +-
 gst-libs/gst/video/meson.build   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gst-libs/gst/pbutils/meson.build b/gst-libs/gst/pbutils/meson.build
index 41c794e12e..a4e2660b3c 100644
--- a/gst-libs/gst/pbutils/meson.build
+++ b/gst-libs/gst/pbutils/meson.build
@@ -17,7 +17,7 @@ pbconf.set('PACKAGE_VERSION_MAJOR', gst_version_major)
 pbconf.set('PACKAGE_VERSION_MINOR', gst_version_minor)
 pbconf.set('PACKAGE_VERSION_MICRO', gst_version_micro)
 pbconf.set('PACKAGE_VERSION_NANO', gst_version_nano)
-configure_file(input : 'gstpluginsbaseversion.h.in',
+gst_pbutils_version_h = configure_file(input : 'gstpluginsbaseversion.h.in',
   output: 'gstpluginsbaseversion.h',
   install_dir : 'include/gstreamer-1.0/gst/pbutils/',
   configuration: pbconf)
@@ -63,17 +63,17 @@ pbutils = library('gstpbutils-@0@'.format(api_version),
   vs_module_defs: vs_module_defs_dir + 'libgstpbutils.def',
 )
 
-pbutils_gen_sources = [gstpbutils_h]
+pbutils_gen_sources = [gstpbutils_h, gst_pbutils_version_h]
 if build_gir
   gst_gir_extra_args = gir_init_section + [ '--c-include=gst/pbutils/pbutils.h' ]
   pbutils_gen_sources += [gnome.generate_gir(pbutils,
-    sources : pbutils_sources + pbutils_headers + [gstpbutils_h],
+    sources : pbutils_sources + pbutils_headers + [gstpbutils_h, gst_pbutils_version_h],
     namespace : 'GstPbutils',
     nsversion : api_version,
     identifier_prefix : 'Gst',
     symbol_prefix : 'gst',
     export_packages : 'gstreamer-pbutils-1.0',
-    includes : ['Gst-1.0', 'GstBase-1.0'],
+    includes : ['Gst-1.0', 'GstBase-1.0', 'GstAudio-1.0', 'GstVideo-1.0'],
     install : true,
     extra_args : gst_gir_extra_args,
     dependencies : gstpbutils_deps
diff --git a/gst-libs/gst/tag/meson.build b/gst-libs/gst/tag/meson.build
index b076af5f87..52d9cdd1e5 100644
--- a/gst-libs/gst/tag/meson.build
+++ b/gst-libs/gst/tag/meson.build
@@ -61,7 +61,7 @@ if build_gir
     identifier_prefix : 'Gst',
     symbol_prefix : 'gst',
     export_packages : 'gstreamer-tag-1.0',
-    includes : ['Gst-1.0'],
+    includes : ['Gst-1.0', 'GstBase-1.0'],
     install : true,
     extra_args : gst_gir_extra_args,
     dependencies : tag_deps
diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build
index 883a40b2b5..c2ea90cb62 100644
--- a/gst-libs/gst/video/meson.build
+++ b/gst-libs/gst/video/meson.build
@@ -139,7 +139,7 @@ if build_gir
     identifier_prefix : 'Gst',
     symbol_prefix : 'gst',
     export_packages : 'gstreamer-video-1.0',
-    includes : ['Gst-1.0', 'GLib-2.0', 'GObject-2.0', 'GModule-2.0' ],
+    includes : ['Gst-1.0', 'GstBase-1.0'],
     install : true,
     extra_args : gst_gir_extra_args,
     dependencies : gstvideo_deps