build: Expose absl as a dependency of webrtc-audio-processing

This is needed because the audio processing header references
abseil's optional.h. Clean up the declared dependencies while we're at
it.

Fixes: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/merge_requests/34
This commit is contained in:
Arun Raghavan 2023-08-13 12:36:58 -04:00
parent 92a4765a7e
commit bc401b3cbf
3 changed files with 16 additions and 17 deletions

View File

@ -184,11 +184,20 @@ pkgconfig.generate(
extra_cflags: [ extra_cflags: [
'-DWEBRTC_LIBRARY_IMPL', '-DWEBRTC_LIBRARY_IMPL',
] + platform_cflags, ] + platform_cflags,
libraries: libwebrtc_audio_processing, libraries: [
libwebrtc_audio_processing,
],
requires: [
# the audio processing header references absl's optional.h
'absl_base',
]
) )
audio_processing_dep = declare_dependency(link_with : libwebrtc_audio_processing, audio_processing_dep = declare_dependency(
include_directories : [webrtc_inc]) link_with: libwebrtc_audio_processing,
dependencies: [absl_dep],
include_directories: [webrtc_inc]
)
meson.override_dependency(apm_project_name, audio_processing_dep) meson.override_dependency(apm_project_name, audio_processing_dep)
@ -204,7 +213,9 @@ pkgconfig.generate(
libraries: libwebrtc_audio_coding, libraries: libwebrtc_audio_coding,
) )
audio_coding_dep = declare_dependency(link_with : libwebrtc_audio_coding, audio_coding_dep = declare_dependency(
include_directories : [webrtc_inc]) link_with: libwebrtc_audio_coding,
include_directories: [webrtc_inc]
)
meson.override_dependency(ac_project_name, audio_coding_dep) meson.override_dependency(ac_project_name, audio_coding_dep)

View File

@ -45,12 +45,6 @@ libwebrtc_audio_coding = library(ac_project_name,
install: true install: true
) )
webrtc_audio_coding_dep = declare_dependency(
link_with: libwebrtc_audio_coding,
include_directories: webrtc_inc,
version: ac_version
)
install_headers(['codecs/isac/bandwidth_info.h'], install_headers(['codecs/isac/bandwidth_info.h'],
subdir: join_paths(include_subdir, 'modules', 'audio_coding', 'codecs', 'isac') subdir: join_paths(include_subdir, 'modules', 'audio_coding', 'codecs', 'isac')
) )

View File

@ -211,9 +211,3 @@ libwebrtc_audio_processing = library(apm_project_name,
soversion: apm_minor_version, soversion: apm_minor_version,
install: true install: true
) )
webrtc_audio_processing_dep = declare_dependency(
link_with: libwebrtc_audio_processing,
include_directories: webrtc_inc,
version: apm_version
)