meson: fix build for isoff lib addition

This commit is contained in:
Tim-Philipp Müller 2017-08-26 12:03:06 +01:00
parent 0829891c2c
commit 54d7e2811f
2 changed files with 2 additions and 2 deletions

View file

@ -14,7 +14,7 @@ if xml28_dep.found()
link_args : noseh_link_args, link_args : noseh_link_args,
include_directories : [configinc, libsinc], include_directories : [configinc, libsinc],
dependencies : [gst_dep, gstadaptivedemux_dep, gstcodecparsers_dep, dependencies : [gst_dep, gstadaptivedemux_dep, gstcodecparsers_dep,
gsturidownloader_dep, xml28_dep, gio_dep], gsturidownloader_dep, gstisoff_dep, xml28_dep, gio_dep],
install : true, install : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
) )

View file

@ -26,7 +26,6 @@ base_tests = [
[['elements/curlfilesink.c'], not curl_dep.found(), [curl_dep]], [['elements/curlfilesink.c'], not curl_dep.found(), [curl_dep]],
[['elements/curlftpsink.c'], not curl_dep.found(), [curl_dep]], [['elements/curlftpsink.c'], not curl_dep.found(), [curl_dep]],
[['elements/curlsmtpsink.c'], not curl_dep.found(), [curl_dep]], [['elements/curlsmtpsink.c'], not curl_dep.found(), [curl_dep]],
[['elements/dash_isoff.c'], not xml2_dep.found(), [xml2_dep]],
[['elements/dash_mpd.c'], not xml2_dep.found(), [xml2_dep]], [['elements/dash_mpd.c'], not xml2_dep.found(), [xml2_dep]],
[['elements/faac.c'], not faac_dep.found() or not cc.has_header_symbol('faac.h', 'faacEncOpen'), [faac_dep]], [['elements/faac.c'], not faac_dep.found() or not cc.has_header_symbol('faac.h', 'faacEncOpen'), [faac_dep]],
[['elements/faad.c'], not faad_dep.found() or not have_faad_2_7, [faad_dep]], [['elements/faad.c'], not faad_dep.found() or not have_faad_2_7, [faad_dep]],
@ -56,6 +55,7 @@ base_tests = [
[['elements/voaacenc.c'], not voaac_dep.found(), [voaac_dep]], [['elements/voaacenc.c'], not voaac_dep.found(), [voaac_dep]],
[['elements/x265enc.c'], not x265_dep.found(), [x265_dep]], [['elements/x265enc.c'], not x265_dep.found(), [x265_dep]],
[['elements/zbar.c'], not zbar_dep.found(), [zbar_dep]], [['elements/zbar.c'], not zbar_dep.found(), [zbar_dep]],
[['libs/isoff.c'], not xml2_dep.found(), [gstisoff_dep, xml2_dep]],
] ]
test_defines = [ test_defines = [