mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 12:15:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Add support orc fallback

Browse source 
Allow fallback to orc subproject if any.
Additionally 'dependencies' keyword is removed from find_library,
because it's invalid keyword for find_library.
This commit is contained in:
Seungha Yang 2019-01-29 10:38:15 +09:00
parent 1a5fb98e53
commit 57aba8952d
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meson.build
View file

@ -309,7 +309,8 @@ gst_controller_dep = dependency('gstreamer-controller-1.0', version : gst_req,
have_orcc = false have_orcc = false
orcc_args = [] orcc_args = []
# Used by various libraries/elements that use Orc code # Used by various libraries/elements that use Orc code
orc_dep = dependency('orc-0.4', version : orc_req, required : get_option('orc')) orc_dep = dependency('orc-0.4', version : orc_req, required : get_option('orc'),
fallback : ['orc', 'orc_dep'])
orcc = find_program('orcc', required : get_option('orc')) orcc = find_program('orcc', required : get_option('orc'))
if orc_dep.found() and orcc.found() if orc_dep.found() and orcc.found()
have_orcc = true have_orcc = true

9
tests/check/meson.build
View file

@ -199,13 +199,18 @@ orc_tests = [
['orc_videotestsrc', files('../../gst/videotestsrc/gstvideotestsrcorc.orc')], ['orc_videotestsrc', files('../../gst/videotestsrc/gstvideotestsrcorc.orc')],
] ]
orc_test_dep = dependency('', required : false)
if have_orcc if have_orcc
# FIXME: there should really just be a separate orc-test-0.4.pc file for this # FIXME: there should really just be a separate orc-test-0.4.pc file for this
if orc_dep.type_name() == 'pkgconfig' if orc_dep.type_name() == 'pkgconfig'
orc_test_dep = cc.find_library('orc-test-0.4', dependencies: orc_dep) orc_test_dep = cc.find_library('orc-test-0.4', required : false)
else endif
if not orc_test_dep.found()
orc_test_dep = dependency('', fallback: ['orc', 'orc_test_dep']) orc_test_dep = dependency('', fallback: ['orc', 'orc_test_dep'])
endif endif
endif
if have_orcc and orc_test_dep.found()
foreach t : orc_tests foreach t : orc_tests
tname = t[0] tname = t[0]
torcfile = t[1] torcfile = t[1]