Revert "meson: don't use subproject fallback for gst-validate if it won't work"

This reverts commit 6760e5e0b1b2f28fb04e9c430506af56c15432b9.

This was not supposed to be pushed and should not be needed any more.

diff --git a/meson.build b/meson.build
index 58fc4c78977440b0ee82c7ba8bb0d1de4a0daffc..4b9d42eefdb0e3813f2b4ca8f579865cee09d194 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -64,15 +64,8 @@ if host_machine.system() != 'windows'
 endif
 gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req,
   fallback : ['gstreamer', 'gst_controller_dep'])
-
-# gst-validate has a hard-dep on json-glib-1.0 so maintain optionality of it all
-# by only dragging it in as a fallback if we know we can satisfy the dependencies
-if dependency('json-glib-1.0').found()
-  gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : false,
-    fallback : ['gst-devtools', 'validate_dep'])
-else
-  gstvalidate_dep = dependency('gst-validate-1.0', vesion: gst_req, required : false)
-endif
+gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : false,
+  fallback : ['gst-devtools', 'validate_dep'])
 
 gio_dep = dependency('gio-2.0', version : glib_req)
 libxml_dep = dependency('libxml-2.0')