meson: A couple for GIR-generation fixes

diff --git a/gst/meson.build b/gst/meson.build
index 1cd8815..51af4ea 100644 (file)
--- a/gst/meson.build
+++ b/gst/meson.build
@@ -158,7 +158,7 @@ configure_file(input : 'gstconfig.h.in',
   output : 'gstconfig.h',
   install_dir : 'include/gstreamer-1.0/gst',
   configuration : cdata)
-configure_file(input : 'gstversion.h.in',
+gst_version_h = configure_file(input : 'gstversion.h.in',
   output : 'gstversion.h',
   install_dir : 'include/gstreamer-1.0/gst',
   configuration : cdata)
@@ -233,7 +233,7 @@ if libtype != 'static'
 
     gst_incdirs += [configinc]
     gst_gen_sources += [gnome.generate_gir(libgst_shared,
-      sources : gst_sources + gst_headers,
+      sources : gst_sources + gst_headers + gst_enums + [gst_version_h],
       namespace : 'Gst',
       nsversion : apiversion,
       identifier_prefix : 'Gst',

diff --git a/libs/gst/base/meson.build b/libs/gst/base/meson.build
index f66368c..7a91272 100644 (file)
--- a/libs/gst/base/meson.build
+++ b/libs/gst/base/meson.build
@@ -59,6 +59,7 @@ if libtype != 'static'
   )
   gst_base = gst_base_shared
   if build_gir
+    gst_gir_extra_args = gir_init_section + [ '--c-include=gst/base/base.h' ]
     gst_base_gen_sources += [gnome.generate_gir(gst_base_shared,
       sources : gst_base_sources + gst_base_headers,
       namespace : 'GstBase',
@@ -70,7 +71,7 @@ if libtype != 'static'
       include_directories : [configinc, libsinc, privinc],
       includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gst-1.0'],
       install : true,
-      extra_args : gir_init_section,
+      extra_args : gst_gir_extra_args,
     )]
   endif
 endif

diff --git a/libs/gst/controller/meson.build b/libs/gst/controller/meson.build
index 31b53d1..b08ac3b 100644 (file)
--- a/libs/gst/controller/meson.build
+++ b/libs/gst/controller/meson.build
@@ -66,6 +66,7 @@ if libtype != 'static'
   )
   gst_controller = gst_controller_shared
   if build_gir
+    gst_gir_extra_args = gir_init_section + [ '--c-include=gst/controller/controller.h' ]
     gst_controller_gir = gnome.generate_gir(gst_controller_shared,
       sources : gst_controller_sources + gst_controller_headers + [gstcontroller_h] + [gstcontroller_c],
       namespace : 'GstController',
@@ -77,7 +78,7 @@ if libtype != 'static'
       include_directories : [configinc, libsinc, privinc],
       includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gst-1.0'],
       install : true,
-      extra_args : gir_init_section,
+      extra_args : gst_gir_extra_args,
     )
     gst_controller_gen_sources += [gst_controller_gir]
   endif

diff --git a/libs/gst/net/meson.build b/libs/gst/net/meson.build
index bf25585..3cfed1f 100644 (file)
--- a/libs/gst/net/meson.build
+++ b/libs/gst/net/meson.build
@@ -45,6 +45,7 @@ if libtype != 'static'
   )
   gst_net = gst_net_shared
   if build_gir
+    gst_gir_extra_args = gir_init_section + [ '--c-include=gst/net/net.h' ]
     gst_net_gir = gnome.generate_gir(gst_net_shared,
       sources : gst_net_sources + gst_net_headers,
       namespace : 'GstNet',
@@ -56,7 +57,7 @@ if libtype != 'static'
       include_directories : [configinc, libsinc],
       includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gio-2.0', 'Gst-1.0'],
       install : true,
-      extra_args : gir_init_section,
+      extra_args : gst_gir_extra_args,
     )
     gst_net_gen_sources += [gst_net_gir]
   endif