From c54e4b630516ba763c047d5f742af35a6d7d01f2 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 11 Aug 2018 04:12:46 +0530 Subject: [PATCH] meson: Add gnustl dep for webrtcdsp on Android Needed for C++ headers. Without this, webrtcdsp can't find --- ext/webrtcdsp/meson.build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ext/webrtcdsp/meson.build b/ext/webrtcdsp/meson.build index 678d128bd3..a0e09a02d8 100644 --- a/ext/webrtcdsp/meson.build +++ b/ext/webrtcdsp/meson.build @@ -6,13 +6,18 @@ webrtc_sources = [ webrtc_dep = dependency('webrtc-audio-processing', version : ['>= 0.2', '< 0.4'], required : get_option('webrtcdsp')) -if webrtc_dep.found() +gnustl_dep = declare_dependency() +if host_system == 'android' + gnustl_dep = dependency('gnustl', required : get_option('webrtcdsp')) +endif + +if webrtc_dep.found() and gnustl_dep.found() gstwebrtcdsp = library('gstwebrtcdsp', webrtc_sources, cpp_args : gst_plugins_bad_args, link_args : noseh_link_args, include_directories : [configinc], - dependencies : [gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep], + dependencies : [gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep, gnustl_dep], install : true, install_dir : plugins_install_dir, )