diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-01-13 12:41:51 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-01-13 12:41:51 +0000 |
| commit | 02e151bce65af13e66017b7b547dfeae2e688818 (patch) | |
| tree | 09be6eb9d7c6460408019b3617879619a0f718a6 | |
| parent | e3332e0d486c9329278b0bf89602f3c9f498ef36 (diff) | |
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.
| -rw-r--r-- | meson.build | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 58fc4c78..4b9d42ee 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') |