mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 11:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Fix warning building GstGLEGL

Browse source 
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>
This commit is contained in:
Thibault Saunier 2021-10-15 22:07:39 -03:00 committed by GStreamer Marge Bot
parent f60af61bb7
commit 08eac09c12
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -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]

4
subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
View file

@ -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)