From 5d3412e1d07fb2c51cea19fd18e8dd8cbe787501 Mon Sep 17 00:00:00 2001 From: Vladimir Stoiakin Date: Thu, 11 Aug 2022 11:34:34 +0300 Subject: [PATCH] meson: make a Speex audio processor a feature Change-Id: I6542e049809ab2526fa652986a4078f3a9969733 --- meson.build | 6 ++---- meson_options.txt | 3 ++- src/meson.build | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index d016b62de7b..c985592f2ff 100644 --- a/meson.build +++ b/meson.build @@ -29,7 +29,6 @@ deplibavformat = dependency('libavformat', version: '>= 56.40.101') deplibswscale = dependency('libswscale', version: '>= 3.1.101') deplibswresample = dependency('libswresample', version: '>= 1.2.101') deplibavutil = dependency('libavutil', version: '>= 55.75.100') - depfmt = dependency('fmt', version: '>= 5.3') depyamlcpp = dependency('yaml-cpp', version: '>= 0.5.1', required: false) @@ -110,10 +109,10 @@ conf.set10('HAVE_LIBNATPMP', depnatpmp.found()) depopenssl = dependency('openssl', required: get_option('name_service')) conf.set10('HAVE_RINGNS', depopenssl.found()) -depwebrtcap = dependency('webrtc-audio-processing', required: get_option('aec')) +depwebrtcap = dependency('webrtc-audio-processing', required: get_option('webrtc_ap')) conf.set10('HAVE_WEBRTC_AP', depwebrtcap.found()) -depspeexdsp = dependency('speexdsp') +depspeexdsp = dependency('speexdsp', required: get_option('speex_ap')) conf.set10('HAVE_SPEEXDSP', depspeexdsp.found()) if get_option('video') @@ -161,7 +160,6 @@ endif if get_option('tracepoints') conf.set('ENABLE_TRACEPOINTS', true) deplttngust = dependency('lttng-ust', version: '>= 2.13') - #depliburcu = dependency('liburcu', version: '>= 0.13.1') else conf.set('ENABLE_TRACEPOINTS', false) endif diff --git a/meson_options.txt b/meson_options.txt index e50af897038..aaf6a55c8c8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -11,7 +11,8 @@ option('jack', type: 'feature', value: 'auto', description: 'Enable support for option('portaudio', type: 'feature', value: 'auto', description: 'Enable support for PortAudio') option('upnp', type: 'feature', value: 'auto', description: 'Enable support for UPnP') option('natpmp', type: 'feature', value: 'auto', description: 'Enable support for NAT-PMP') -option('aec', type: 'feature', value: 'auto', description: 'Enable Acoustic Echo Cancellation') +option('webrtc_ap', type: 'feature', value: 'auto', description: 'Enable support for WebRTC audio processing') +option('speex_ap', type: 'feature', value: 'auto', description: 'Enable support for Speex audio processing') option('natpmp_prefix', type: 'string', value: '', description: 'Override a system directory to search for the library "natpmp"') option('tests', type: 'boolean', value: false, description: 'Build tests') diff --git a/src/meson.build b/src/meson.build index db94f87b4e5..d637fb5b0a4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -145,7 +145,6 @@ libjami_dependencies = [ deplibswscale, deplibswresample, deplibavutil, - depspeexdsp, depfmt, depyamlcpp, depjsoncpp,