mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-11 19:06:33 +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 0555c09607.

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 10:51:08 +05:30
parent db793e6cce
commit c64165fb00
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -113,6 +113,8 @@ gstsdp_dep = dependency('gstreamer-sdp-1.0', version : gst_req,
fallback : ['gst-plugins-base', 'sdp_dep']) fallback : ['gst-plugins-base', 'sdp_dep'])
gstrtsp_dep = dependency('gstreamer-rtsp-1.0', version : gst_req, gstrtsp_dep = dependency('gstreamer-rtsp-1.0', version : gst_req,
fallback : ['gst-plugins-base', 'rtsp_dep']) fallback : ['gst-plugins-base', 'rtsp_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, gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_controller_dep']) fallback : ['gstreamer', 'gst_controller_dep'])

3
tests/check/meson.build
View file

@ -1,6 +1,3 @@
gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_check_dep'])
# name, condition when to skip the test and extra dependencies # name, condition when to skip the test and extra dependencies
ugly_tests = [ ugly_tests = [
[ 'elements/amrnbenc', not amrnb_dep.found() ], [ 'elements/amrnbenc', not amrnb_dep.found() ],

4
tests/meson.build
View file

@ -1,3 +1 @@
if host_machine.system() != 'windows' subdir('check')
subdir('check')
endif