From 5c152314de97482d5afb0ff314deb0d57db5a648 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 25 Oct 2016 10:50:47 +0530 Subject: [PATCH] Revert "meson: move gstreamer-check-1.0 dependency to tests/check" This reverts commit 46632694662b96fddb848a1f2091a215b28a2d35. Does not actually work. See: https://bugzilla.gnome.org/show_bug.cgi?id=773114#c31 --- meson.build | 2 ++ tests/check/meson.build | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 2cad134..bfeb820 100644 --- a/meson.build +++ b/meson.build @@ -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']) diff --git a/tests/check/meson.build b/tests/check/meson.build index 7d6b24b..4559e66 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -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) -- 2.7.4