From 02e151bce65af13e66017b7b547dfeae2e688818 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 13 Jan 2017 12:41:51 +0000 Subject: [PATCH] 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. --- meson.build | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index 58fc4c7..4b9d42e 100644 --- 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') -- 2.7.4