meson: Fix warning building GstGLEGL

We forgot to add the `GstGL` gir as a dependency which was properly
done for GstGLWayland and GstGLX11.

And document why we use a list for `all_libraries`

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1168>

diff --git a/meson.build b/meson.build
index 06170ec..c10098a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -113,6 +113,8 @@ subprojects_names = []
 plugins_doc_caches = []
 orc_update_targets = []
 all_plugins = []
+# Using a list and not a dict to keep the ordering to build the chain of `gir`
+# dependencies
 all_libraries = []
 foreach sp : subprojects
   project_name = sp[0]

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
index 055c0f2..a3d4621 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
+++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
@@ -1207,10 +1207,12 @@ if build_gstgl
         'extra_args' : gir_init_section + ['--c-include=gst/gl/egl/egl.h'],
         'dependencies' : [video_dep, gst_dep, gst_base_dep]
       }
+      gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
+      libraries += [[pkg_name, {'gir': gir_dict}]]
       if not static_build
+        gir += {'includes': gir['includes'] + [gl_gir[0]]}
         gl_egl_gir = gnome.generate_gir(gstgl, kwargs: gir)
       endif
-      libraries += [[pkg_name, {'gir': gir}]]
     endif
     gstglegl_dep = declare_dependency(dependencies : [gstgl_dep],
       sources : gl_egl_gir)