mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
This reverts commit 6760e5e0b1.

This was not supposed to be pushed and should not be needed any more.
This commit is contained in:
Tim-Philipp Müller 2017-01-13 12:41:51 +00:00
parent e3332e0d48
commit 02e151bce6
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
meson.build
View file

@ -64,15 +64,8 @@ if host_machine.system() != 'windows'
endif endif
gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_controller_dep']) fallback : ['gstreamer', 'gst_controller_dep'])
gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : false,
# gst-validate has a hard-dep on json-glib-1.0 so maintain optionality of it all fallback : ['gst-devtools', 'validate_dep'])
# 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
gio_dep = dependency('gio-2.0', version : glib_req) gio_dep = dependency('gio-2.0', version : glib_req)
libxml_dep = dependency('libxml-2.0') libxml_dep = dependency('libxml-2.0')