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

libs: va: make sure va-enumtypes.h is generated before it's used

Browse source 
Need to add a dep for the generated header file to the dependency()
so that it gets generated before anyone tries to #include files
from it (which may happen before the actual lib is built because
that's only needed when stuff is linked together later).

See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2057#note_1323236
and CI build failures in https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2096

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2103>
This commit is contained in:
Tim-Philipp Müller 2022-04-01 21:09:10 +01:00 committed by GStreamer Marge Bot
parent 0011feb0d6
commit 296094508e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gst-plugins-bad/gst-libs/gst/va/meson.build
View file

@ -49,6 +49,8 @@ va_enums = gnome.mkenums_simple('va-enumtypes',
body_prefix: '#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif', body_prefix: '#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif',
install_header: false) install_header: false)
va_enumtypes_h = va_enums[1]
gstva = library('gstva-' + api_version, gstva = library('gstva-' + api_version,
va_sources, va_enums, va_sources, va_enums,
c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_VA', '-DG_LOG_DOMAIN="GStreamer-VA"'], c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_VA', '-DG_LOG_DOMAIN="GStreamer-VA"'],
@ -64,5 +66,7 @@ libraries += [[pkg_name, {'lib': gstva}]]
gstva_dep = declare_dependency(link_with : gstva, gstva_dep = declare_dependency(link_with : gstva,
include_directories : [libsinc], include_directories : [libsinc],
dependencies : [gst_dep, gstvideo_dep, gstallocators_dep, libva_dep, libva_drm_dep, libdrm_dep]) dependencies : [gst_dep, gstvideo_dep, gstallocators_dep, libva_dep, libva_drm_dep, libdrm_dep],
sources : [va_enumtypes_h])
meson.override_dependency(pkg_name, gstva_dep) meson.override_dependency(pkg_name, gstva_dep)