mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 00:36:51 +00:00
meson: validate: Fix linking error missing GstBaseTransform
There is a mockdecryptor that has been added into validate-sources and this element is base on GstBaseTransform. This added a deps against gstbase which was leading to linking errors when building with meson.
This commit is contained in:
parent
1858853bf2
commit
40755c2d90
2 changed files with 6 additions and 4 deletions
|
@ -61,6 +61,8 @@ endif
|
||||||
|
|
||||||
gst_dep = dependency('gstreamer-' + apiversion, version : gst_req,
|
gst_dep = dependency('gstreamer-' + apiversion, version : gst_req,
|
||||||
fallback : ['gstreamer', 'gst_dep'])
|
fallback : ['gstreamer', 'gst_dep'])
|
||||||
|
gstbase_dep = dependency('gstreamer-base-' + apiversion, version : gst_req,
|
||||||
|
fallback : ['gstreamer', 'gst_base_dep'])
|
||||||
gst_pbutils_dep = dependency('gstreamer-pbutils-' + apiversion, version : gst_req,
|
gst_pbutils_dep = dependency('gstreamer-pbutils-' + apiversion, version : gst_req,
|
||||||
fallback : ['gst-plugins-base', 'pbutils_dep'])
|
fallback : ['gst-plugins-base', 'pbutils_dep'])
|
||||||
gst_video_dep = dependency('gstreamer-video-' + apiversion, version : gst_req,
|
gst_video_dep = dependency('gstreamer-video-' + apiversion, version : gst_req,
|
||||||
|
|
|
@ -62,8 +62,8 @@ gstvalidate = library('gstvalidate-1.0',
|
||||||
install: true,
|
install: true,
|
||||||
c_args : [gst_c_args] + ['-D_GNU_SOURCE'],
|
c_args : [gst_c_args] + ['-D_GNU_SOURCE'],
|
||||||
vs_module_defs: vs_module_defs_dir + 'libgstvalidate.def',
|
vs_module_defs: vs_module_defs_dir + 'libgstvalidate.def',
|
||||||
dependencies : [gst_dep, glib_dep, gio_dep, gmodule_dep,
|
dependencies : [gst_dep, gstbase_dep, glib_dep, gio_dep,
|
||||||
gst_pbutils_dep, mathlib, json_dep])
|
gmodule_dep, gst_pbutils_dep, mathlib, json_dep])
|
||||||
|
|
||||||
gstvalidatetracer = library('gstvalidatetracer',
|
gstvalidatetracer = library('gstvalidatetracer',
|
||||||
sources: gstvalidate_sources + gst_validate_enums,
|
sources: gstvalidate_sources + gst_validate_enums,
|
||||||
|
@ -71,7 +71,7 @@ gstvalidatetracer = library('gstvalidatetracer',
|
||||||
install: true,
|
install: true,
|
||||||
c_args : [gst_c_args] + ['-D__GST_VALIDATE_PLUGIN', '-D_GNU_SOURCE'],
|
c_args : [gst_c_args] + ['-D__GST_VALIDATE_PLUGIN', '-D_GNU_SOURCE'],
|
||||||
install_dir : plugins_install_dir,
|
install_dir : plugins_install_dir,
|
||||||
dependencies : [gst_dep, glib_dep, gio_dep, gmodule_dep,
|
dependencies : [gst_dep, gstbase_dep, glib_dep, gio_dep, gmodule_dep,
|
||||||
gst_pbutils_dep, mathlib, json_dep])
|
gst_pbutils_dep, mathlib, json_dep])
|
||||||
|
|
||||||
validate_gen_sources = []
|
validate_gen_sources = []
|
||||||
|
@ -91,7 +91,7 @@ if build_gir
|
||||||
'Gst-' + apiversion,
|
'Gst-' + apiversion,
|
||||||
'GstPbutils-' + apiversion],
|
'GstPbutils-' + apiversion],
|
||||||
install : true,
|
install : true,
|
||||||
dependencies : [gst_dep, glib_dep, gio_dep, gst_pbutils_dep],
|
dependencies : [gst_dep, gstbase_dep, glib_dep, gio_dep, gst_pbutils_dep],
|
||||||
extra_args : gst_validate_gir_extra_args,
|
extra_args : gst_validate_gir_extra_args,
|
||||||
)]
|
)]
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue