mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Add support orc fallback

Browse source 
Allow fallback to orc subproject if any, and add missing orc version check.
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-30 19:54:33 +09:00
parent 19382f1e91
commit a9c61e467a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -17,6 +17,7 @@ endif
gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90 gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90
glib_req = '>= 2.40.0' glib_req = '>= 2.40.0'
orc_req = '>= 0.4.17'
gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)
api_version = '1.0' api_version = '1.0'
@ -359,7 +360,8 @@ endif
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', 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

@ -151,13 +151,18 @@ orc_tests = [
['orc_bayer', files('../../gst/bayer/gstbayerorc.orc')], ['orc_bayer', files('../../gst/bayer/gstbayerorc.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]