From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Tue, 25 Oct 2016 06:18:35 +0000 (+0530)
Subject: Revert "meson: move gstreamer-check-1.0 dependency to tests/check"
X-Git-Tag: 1.19.3~493^2~918
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b63d64cb855a7b3859b7837a726c5c3f021e0015;p=platform%2Fupstream%2Fgstreamer.git

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

This reverts commit 5665c2bfc9cae531c6dd9a75766d06a4af25ab9a.

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

diff --git a/meson.build b/meson.build
index 4856dab..45a5c97 100644
--- a/meson.build
+++ b/meson.build
@@ -53,6 +53,8 @@ gstvideo_dep = dependency('gstreamer-video-' + apiversion, version : gst_req,
     fallback : ['gst-plugins-base', 'video_dep'])
 gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req,
     fallback : ['gstreamer', 'gst_base_dep'])
+gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
+  fallback : ['gstreamer', 'gst_check_dep'], required: false)
 gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req,
   fallback : ['gstreamer', 'gst_controller_dep'])
 gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : false,
diff --git a/tests/check/meson.build b/tests/check/meson.build
index e9ef808..e2625e4 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -33,9 +33,6 @@ test_defines = [
   '-DGST_USE_UNSTABLE_API',
 ]
 
-gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
-  fallback : ['gstreamer', 'gst_check_dep'])
-
 pluginsdirs = []
 if not meson.is_subproject()
   pkgconfig = find_program('pkg-config')