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

Revert "meson: move gstreamer-check-1.0 dependency to tests/check"

Browse source 
This reverts commit e3c7c17b9b.

Does not actually work. See:
https://bugzilla.gnome.org/show_bug.cgi?id=773114#c31
This commit is contained in:
Nirbheek Chauhan 2016-10-25 11:46:38 +05:30
parent 9ccd144421
commit 2d3af07c3d
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -147,6 +147,8 @@ gst_base_dep = dependency('gstreamer-base-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_base_dep']) fallback : ['gstreamer', 'gst_base_dep'])
gst_net_dep = dependency('gstreamer-net-1.0', version : gst_req, gst_net_dep = dependency('gstreamer-net-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_net_dep']) fallback : ['gstreamer', 'gst_net_dep'])
gst_check_dep = dependency('gstreamer-check-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_check_dep'])
gst_controller_dep = dependency('gstreamer-controller-1.0', version : gst_req, gst_controller_dep = dependency('gstreamer-controller-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_controller_dep']) fallback : ['gstreamer', 'gst_controller_dep'])

3
tests/check/meson.build
View file

@ -1,6 +1,3 @@
gst_check_dep = dependency('gstreamer-check-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_check_dep'])
have_registry = true # FIXME not get_option('disable_registry') have_registry = true # FIXME not get_option('disable_registry')
# name, condition when to skip the test and extra dependencies # name, condition when to skip the test and extra dependencies