[mutter/zbrown/assorted-g-i-things: 1/7] build: Associate GIRs with their respective pc

[Zander Brown <zbrown src gnome org>]

commit a043bc0b9d1c7c8672693b62013d0afd3dcf22e7
Author: Zander Brown <zbrown gnome org>
Date:   Tue Jul 6 19:03:10 2021 +0100

    build: Associate GIRs with their respective pc
    
    Additionally Cogl was missing xlib as an include

 clutter/clutter/meson.build | 1 +
 cogl/cogl-pango/meson.build | 1 +
 cogl/cogl/meson.build       | 6 +++++-
 src/meson.build             | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index ad5895fae5..870beb023b 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -433,6 +433,7 @@ if have_introspection
     ],
     nsversion: libmutter_api_version,
     namespace: 'Cally',
+    export_packages: [libmutter_clutter_name],
     includes: [
       libmutter_cogl_gir[0],
       libmutter_cogl_pango_gir[0],
diff --git a/cogl/cogl-pango/meson.build b/cogl/cogl-pango/meson.build
index ba8fe70bad..38f15184e9 100644
--- a/cogl/cogl-pango/meson.build
+++ b/cogl/cogl-pango/meson.build
@@ -42,6 +42,7 @@ if have_introspection
     sources: cogl_pango_public_headers,
     nsversion: libmutter_api_version,
     namespace: 'CoglPango',
+    export_packages: ['mutter-cogl-pango-' + libmutter_api_version],
     symbol_prefix: 'cogl_pango',
     header: 'cogl-pango.h',
     includes: [
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index a76b9685c5..e79ea3e960 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -64,6 +64,8 @@ cogl_egl_defines_h = configure_file(
 )
 built_headers += [cogl_gl_header_h]
 
+cogl_gir_includes = ['cairo-1.0', 'GL-1.0', 'GObject-2.0', 'Graphene-1.0']
+
 cogl_deprecated_headers = [
   'deprecated/cogl-material-compat.h',
   'deprecated/cogl-shader.h',
@@ -364,6 +366,7 @@ cogl_sources = [
 ]
 
 if have_x11
+  cogl_gir_includes += ['xlib-2.0']
   cogl_nonintrospected_headers += [
     'winsys/cogl-texture-pixmap-x11.h',
     'cogl-xlib.h',
@@ -468,7 +471,8 @@ if have_introspection
     sources: cogl_introspected_headers,
     nsversion: libmutter_api_version,
     namespace: 'Cogl',
-    includes: ['cairo-1.0', 'GL-1.0', 'GObject-2.0', 'Graphene-1.0'],
+    export_packages: [libmutter_cogl_name],
+    includes: cogl_gir_includes,
     dependencies: [cogl_deps],
     extra_args: introspection_args + [
       '-UCOGL_COMPILATION',
diff --git a/src/meson.build b/src/meson.build
index 85d66a455a..e8fafd4ac2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1037,6 +1037,7 @@ if have_introspection
     ],
     nsversion: libmutter_api_version,
     namespace: 'Meta',
+    export_packages: ['libmutter-' + libmutter_api_version],
     symbol_prefix: 'meta',
     includes: [
       'GObject-2.0',