1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From 3f9907f93d3983033e176e95f5134a57900a7f6e Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arun@asymptotic.io>
Date: Thu, 10 Dec 2020 19:06:31 -0500
Subject: [PATCH] build: Use cmake to look up abseil dependency
This should be much more robust than looking up the library directly.
Fixes: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4
---
.gitlab-ci.yml | 3 ++-
meson.build | 21 ++++++++-------------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11a3b78..42cd589 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
# CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES.
# The tag is an arbitrary string that identifies the exact container
# contents.
- BASE_TAG: '2020-11-27.1'
+ BASE_TAG: '2020-12-10.1'
FDO_DISTRIBUTION_VERSION: '20.10'
FDO_UPSTREAM_REPO: 'pulseaudio/webrtc-audio-processing'
@@ -43,6 +43,7 @@ include:
FDO_DISTRIBUTION_PACKAGES: >-
g++
gcc
+ cmake
libabsl-dev
meson
ninja-build
diff --git a/meson.build b/meson.build
index bae155e..96d84d7 100644
--- a/meson.build
+++ b/meson.build
@@ -40,19 +40,14 @@ os_deps = []
have_posix = false
have_win = false
-absl_dep = [
- cpp.find_library('absl_base'),
- cpp.find_library('absl_bad_optional_access'),
- cpp.find_library('absl_flags_internal'),
- cpp.find_library('absl_flags_marshalling'),
- cpp.find_library('absl_flags_parse'),
- cpp.find_library('absl_flags_registry'),
- cpp.find_library('absl_flags_usage_internal'),
- cpp.find_library('absl_raw_logging_internal'),
- cpp.find_library('absl_strings'),
- cpp.find_library('absl_synchronization'),
- cpp.find_library('absl_throw_delegate'),
-]
+absl_dep = dependency('absl', method : 'cmake',
+ modules : [
+ 'absl::base',
+ 'absl::flags_parse',
+ 'absl::strings',
+ 'absl::synchronization',
+ ]
+)
if ['darwin', 'ios'].contains(host_system)
os_cflags = ['-DWEBRTC_MAC']
--
GitLab
|
GitWeb
