From 40755c2d90227fa5bc40dca957fb78e7fc5fdca1 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Mon, 1 Apr 2019 14:48:54 -0400 Subject: [PATCH] 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. --- meson.build | 2 ++ validate/gst/validate/meson.build | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index ae014cbc75..caf9a8dade 100644 --- a/meson.build +++ b/meson.build @@ -61,6 +61,8 @@ endif gst_dep = dependency('gstreamer-' + apiversion, version : gst_req, 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, fallback : ['gst-plugins-base', 'pbutils_dep']) gst_video_dep = dependency('gstreamer-video-' + apiversion, version : gst_req, diff --git a/validate/gst/validate/meson.build b/validate/gst/validate/meson.build index f3613301ac..edaa4f1940 100644 --- a/validate/gst/validate/meson.build +++ b/validate/gst/validate/meson.build @@ -62,8 +62,8 @@ gstvalidate = library('gstvalidate-1.0', install: true, c_args : [gst_c_args] + ['-D_GNU_SOURCE'], vs_module_defs: vs_module_defs_dir + 'libgstvalidate.def', - dependencies : [gst_dep, glib_dep, gio_dep, gmodule_dep, - gst_pbutils_dep, mathlib, json_dep]) + dependencies : [gst_dep, gstbase_dep, glib_dep, gio_dep, + gmodule_dep, gst_pbutils_dep, mathlib, json_dep]) gstvalidatetracer = library('gstvalidatetracer', sources: gstvalidate_sources + gst_validate_enums, @@ -71,7 +71,7 @@ gstvalidatetracer = library('gstvalidatetracer', install: true, c_args : [gst_c_args] + ['-D__GST_VALIDATE_PLUGIN', '-D_GNU_SOURCE'], 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]) validate_gen_sources = [] @@ -91,7 +91,7 @@ if build_gir 'Gst-' + apiversion, 'GstPbutils-' + apiversion], 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, )] endif