mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
This reverts commit 5665c2bfc9.

Does not actually work. See:
https://bugzilla.gnome.org/show_bug.cgi?id=773114#c31
This commit is contained in:
Nirbheek Chauhan 2016-10-25 11:48:35 +05:30
parent 5665c2bfc9
commit b63d64cb85
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -53,6 +53,8 @@ gstvideo_dep = dependency('gstreamer-video-' + apiversion, version : gst_req,
fallback : ['gst-plugins-base', 'video_dep']) fallback : ['gst-plugins-base', 'video_dep'])
gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req, gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_base_dep']) 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, gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_controller_dep']) fallback : ['gstreamer', 'gst_controller_dep'])
gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : false, gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : false,

3
tests/check/meson.build
View file

@ -33,9 +33,6 @@ test_defines = [
'-DGST_USE_UNSTABLE_API', '-DGST_USE_UNSTABLE_API',
] ]
gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_check_dep'])
pluginsdirs = [] pluginsdirs = []
if not meson.is_subproject() if not meson.is_subproject()
pkgconfig = find_program('pkg-config') pkgconfig = find_program('pkg-config')