diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-25 11:46:38 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-25 11:46:38 +0530 |
| commit | 2d3af07c3d56a8f973b076567b92e5f9185cf69b (patch) | |
| tree | 1a3e7eae5f12d58c9506d69fbd4111192f6dd16a | |
| parent | 9ccd144421a8ed779751bbb2083a6030db28e698 (diff) | |
| download | gstreamer-plugins-base-2d3af07c3d56a8f973b076567b92e5f9185cf69b.tar.gz | |
Revert "meson: move gstreamer-check-1.0 dependency to tests/check"
This reverts commit e3c7c17b9b0ff8efb81d23e135178a7be7eaeb1e.
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 0af3f2ba9..a0eaf084d 100644 --- a/meson.build +++ b/meson.build @@ -147,6 +147,8 @@ gst_base_dep = dependency('gstreamer-base-1.0', version : gst_req, fallback : ['gstreamer', 'gst_base_dep']) gst_net_dep = dependency('gstreamer-net-1.0', version : gst_req, 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, fallback : ['gstreamer', 'gst_controller_dep']) diff --git a/tests/check/meson.build b/tests/check/meson.build index 62ab7b438..e9c16278b 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -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') # name, condition when to skip the test and extra dependencies |