diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-25 11:48:35 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-25 11:48:35 +0530 |
| commit | b63d64cb855a7b3859b7837a726c5c3f021e0015 (patch) | |
| tree | 55a72f45ad59ad74021eb8ee744a47f0b70ec723 | |
| parent | 5665c2bfc9cae531c6dd9a75766d06a4af25ab9a (diff) | |
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
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | tests/check/meson.build | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 4856dab0..45a5c971 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 e9ef8088..e2625e46 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') |