[gupnp-dlna/wip/meson] build: Fix gir build

[Jens Georg <jensgeorg src gnome org>]

commit 661ad5e7314eb8578b2b509776a27f9e4bf51ce5
Author: Jens Georg <jensg openismus com>
Date:   Sun May 23 11:30:31 2021 +0200

    build: Fix gir build
    
    That only seemed to have worked against an installed version of the
    library

 libgupnp-dlna/meson.build                          |  1 +
 .../metadata-backends/gstreamer/meson.build        |  2 +-
 vala/meson.build                                   | 33 ++++++++++++++++------
 3 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/libgupnp-dlna/meson.build b/libgupnp-dlna/meson.build
index b7caf19..b35f25d 100644
--- a/libgupnp-dlna/meson.build
+++ b/libgupnp-dlna/meson.build
@@ -137,6 +137,7 @@ pkg.generate(
 )
 
 if get_option('introspection')
+    gupnp_dlna_gir_dir = meson.current_build_dir()
     gupnp_dlna_gir = gnome.generate_gir(
         libgupnp_dlna,
         sources : headers +
diff --git a/libgupnp-dlna/metadata-backends/gstreamer/meson.build 
b/libgupnp-dlna/metadata-backends/gstreamer/meson.build
index 006f60b..a029290 100644
--- a/libgupnp-dlna/metadata-backends/gstreamer/meson.build
+++ b/libgupnp-dlna/metadata-backends/gstreamer/meson.build
@@ -69,6 +69,6 @@ if get_option('introspection')
         symbol_prefix : 'gupnp_dlna_gst',
         identifier_prefix : 'GUPnPDLNAGst',
         install: true,
-        includes : ['GObject-2.0', 'GUPnPDLNA-2.0', 'Gst-1.0', 'GstPbutils-1.0']
+        includes : ['GObject-2.0', gupnp_dlna_gir.get(0), 'Gst-1.0', 'GstPbutils-1.0']
     )
 endif
diff --git a/vala/meson.build b/vala/meson.build
index f9f6641..fd30562 100644
--- a/vala/meson.build
+++ b/vala/meson.build
@@ -1,10 +1,27 @@
 
-gnome.generate_vapi('gupnp-dlna-2.0',
-                    sources : [gupnp_dlna_gir.get(0), 'gupnp-dlna-2.0-custom.vala'],
-                    packages : ['glib-2.0', 'gio-2.0', 'gmodule-2.0'],
-                    install : true)
+gupnp_dlna_vapi = gnome.generate_vapi(
+    'gupnp-dlna-2.0',
+    sources : [
+        gupnp_dlna_gir.get(0),
+        'gupnp-dlna-2.0-custom.vala'
+    ],
+    packages : ['glib-2.0', 'gio-2.0', 'gmodule-2.0'],
+    install : true
+)
 
-gnome.generate_vapi('gupnp-dlna-gst-2.0',
-                    sources : [gupnp_dlna_gst_gir.get(0), 'gupnp-dlna-gst-2.0-custom.vala'],
-                    packages : ['glib-2.0', 'gobject-2.0', 'gstreamer-1.0', 'gstreamer-pbutils-1.0'],
-                    install : true)
+gnome.generate_vapi(
+    'gupnp-dlna-gst-2.0',
+    sources : [
+        gupnp_dlna_gst_gir.get(0),
+        'gupnp-dlna-gst-2.0-custom.vala'
+    ],
+    packages : [
+        'glib-2.0',
+        'gobject-2.0',
+        'gstreamer-1.0',
+        'gstreamer-pbutils-1.0',
+        gupnp_dlna_vapi
+    ],
+    gir_dirs : gupnp_dlna_gir_dir,
+    install : true
+)