Revert "meson: move gstreamer-check-1.0 dependency to tests/check"
authorNirbheek Chauhan <nirbheek@centricular.com>
Tue, 25 Oct 2016 05:20:47 +0000 (10:50 +0530)
committerNirbheek Chauhan <nirbheek@centricular.com>
Tue, 25 Oct 2016 06:17:22 +0000 (11:47 +0530)
This reverts commit 46632694662b96fddb848a1f2091a215b28a2d35.

Does not actually work. See:
https://bugzilla.gnome.org/show_bug.cgi?id=773114#c31

meson.build
tests/check/meson.build

index 2cad134..bfeb820 100644 (file)
@@ -140,6 +140,8 @@ gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req,
   fallback : ['gstreamer', 'gst_base_dep'])
 gstnet_dep = dependency('gstreamer-net-1.0', version : gst_req,
   fallback : ['gstreamer', 'gst_net_dep'])
+gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
+  fallback : ['gstreamer', 'gst_check_dep'])
 gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req,
   fallback : ['gstreamer', 'gst_controller_dep'])
 
index 7d6b24b..4559e66 100644 (file)
@@ -1,6 +1,3 @@
-gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
-  fallback : ['gstreamer', 'gst_check_dep'])
-
 # FIXME: use dependency('valgrind') once we have a method to get the includes
 if cc.has_header('valgrind/valgrind.h')
   cdata.set('HAVE_VALGRIND', 1)