diff options
| author | Arun Raghavan <arun@asymptotic.io> | 2023-08-13 12:36:58 -0400 |
|---|---|---|
| committer | Arun Raghavan <arun@asymptotic.io> | 2023-08-13 17:42:29 -0400 |
| commit | bc401b3cbfe95b63c341a3b1fe659ae049a718bf (patch) | |
| tree | c0b0c31110282a97c15724a34065767cc31abd37 | |
| parent | 92a4765a7e02d9281328f6d0ec9334891962c230 (diff) | |
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
| -rw-r--r-- | meson.build | 21 | ||||
| -rw-r--r-- | webrtc/modules/audio_coding/meson.build | 6 | ||||
| -rw-r--r-- | webrtc/modules/audio_processing/meson.build | 6 |
3 files changed, 16 insertions, 17 deletions
diff --git a/meson.build b/meson.build index dfaf80f..f2fa35b 100644 --- a/meson.build +++ b/meson.build @@ -184,11 +184,20 @@ pkgconfig.generate( extra_cflags: [ '-DWEBRTC_LIBRARY_IMPL', ] + 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, - include_directories : [webrtc_inc]) +audio_processing_dep = declare_dependency( + link_with: libwebrtc_audio_processing, + dependencies: [absl_dep], + include_directories: [webrtc_inc] +) meson.override_dependency(apm_project_name, audio_processing_dep) @@ -204,7 +213,9 @@ pkgconfig.generate( libraries: libwebrtc_audio_coding, ) -audio_coding_dep = declare_dependency(link_with : libwebrtc_audio_coding, - include_directories : [webrtc_inc]) +audio_coding_dep = declare_dependency( + link_with: libwebrtc_audio_coding, + include_directories: [webrtc_inc] +) meson.override_dependency(ac_project_name, audio_coding_dep) diff --git a/webrtc/modules/audio_coding/meson.build b/webrtc/modules/audio_coding/meson.build index 2c3f29d..1c46571 100644 --- a/webrtc/modules/audio_coding/meson.build +++ b/webrtc/modules/audio_coding/meson.build @@ -45,12 +45,6 @@ libwebrtc_audio_coding = library(ac_project_name, 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'], subdir: join_paths(include_subdir, 'modules', 'audio_coding', 'codecs', 'isac') ) diff --git a/webrtc/modules/audio_processing/meson.build b/webrtc/modules/audio_processing/meson.build index fd7d247..1309bc5 100644 --- a/webrtc/modules/audio_processing/meson.build +++ b/webrtc/modules/audio_processing/meson.build @@ -211,9 +211,3 @@ libwebrtc_audio_processing = library(apm_project_name, soversion: apm_minor_version, install: true ) - -webrtc_audio_processing_dep = declare_dependency( - link_with: libwebrtc_audio_processing, - include_directories: webrtc_inc, - version: apm_version -) |