mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-05-05 16:04:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

build: link against the gnustl dependency on android for c++ plugins

Browse source
This commit is contained in:
Matthew Waters 2018-11-12 21:23:37 +11:00
parent 15fc39c296
commit c78f81f410
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/soundtouch/meson.build
View file

@ -9,6 +9,10 @@ if get_option('soundtouch').disabled()
subdir_done() subdir_done()
endif endif
if not gnustl_dep.found() and get_option('soundtouch').enabled()
error('soundtouch plugin enabled but could not find gnustl dep for Android c++ support')
endif
soundtouch_dep = dependency('soundtouch', required : false) soundtouch_dep = dependency('soundtouch', required : false)
if soundtouch_dep.found() if soundtouch_dep.found()
soundtouch_cargs += ['-DHAVE_SOUNDTOUCH_1_4'] soundtouch_cargs += ['-DHAVE_SOUNDTOUCH_1_4']
@ -32,7 +36,7 @@ if soundtouch_dep.found()
c_args : gst_plugins_bad_args + soundtouch_cargs, c_args : gst_plugins_bad_args + soundtouch_cargs,
cpp_args : gst_plugins_bad_args + soundtouch_cargs, cpp_args : gst_plugins_bad_args + soundtouch_cargs,
include_directories : [configinc], include_directories : [configinc],
dependencies : [gstaudio_dep, soundtouch_dep], dependencies : [gstaudio_dep, soundtouch_dep, gnustl_dep],
install : true, install : true,
install_dir : plugins_install_dir) install_dir : plugins_install_dir)
pkgconfig.generate(gstsoundtouch, install_dir : plugins_pkgconfig_install_dir) pkgconfig.generate(gstsoundtouch, install_dir : plugins_pkgconfig_install_dir)

5
ext/webrtcdsp/meson.build
View file

@ -6,9 +6,8 @@ webrtc_sources = [
webrtc_dep = dependency('webrtc-audio-processing', version : ['>= 0.2', '< 0.4'], webrtc_dep = dependency('webrtc-audio-processing', version : ['>= 0.2', '< 0.4'],
required : get_option('webrtcdsp')) required : get_option('webrtcdsp'))
gnustl_dep = declare_dependency() if not gnustl_dep.found() and get_option('webrtcdsp').enabled()
if host_system == 'android' error('webrtcdsp plugin enabled but could not find gnustl dep for Android c++ support')
gnustl_dep = dependency('gnustl', required : get_option('webrtcdsp'))
endif endif
if webrtc_dep.found() and gnustl_dep.found() if webrtc_dep.found() and gnustl_dep.found()

5
meson.build
View file

@ -499,6 +499,11 @@ else
cdata.set('DISABLE_ORC', 1) cdata.set('DISABLE_ORC', 1)
endif endif
gnustl_dep = declare_dependency()
if host_system == 'android'
gnustl_dep = dependency('gnustl', required : false)
endif
if gst_dep.type_name() == 'internal' if gst_dep.type_name() == 'internal'
gst_debug_disabled = not subproject('gstreamer').get_variable('gst_debug') gst_debug_disabled = not subproject('gstreamer').get_variable('gst_debug')
else else