Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/webrtc-audio-processing/files/, media-libs/webrtc-audio-processing/, ...
Date: Thu, 23 Sep 2021 14:10:21
Message-Id: 1632406146.a821b85f4a03acf61b9cff28a73e5134a314dece.leio@gentoo
1 commit: a821b85f4a03acf61b9cff28a73e5134a314dece
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 23 13:27:45 2021 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 23 14:09:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a821b85f
7
8 media-libs/webrtc-audio-processing: add preliminary SLOT=1 bump
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.2
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 media-libs/webrtc-audio-processing/Manifest | 1 +
14 .../files/1.0-abseil-cmake.patch | 69 ++++++++++++++++++++++
15 .../webrtc-audio-processing-1.0.ebuild | 32 ++++++++++
16 profiles/package.mask | 4 ++
17 4 files changed, 106 insertions(+)
18
19 diff --git a/media-libs/webrtc-audio-processing/Manifest b/media-libs/webrtc-audio-processing/Manifest
20 index 54926ef3847..4a4f053a09c 100644
21 --- a/media-libs/webrtc-audio-processing/Manifest
22 +++ b/media-libs/webrtc-audio-processing/Manifest
23 @@ -1 +1,2 @@
24 DIST webrtc-audio-processing-0.3.1.tar.xz 695920 BLAKE2B 833c6d12b358918d95dee5b165308c8cc382f98264349fd38649bfe478557765b85d9112a35194676ee52a8ef297fb7cb7e3a570d9c2295785b6fb97d35be948 SHA512 1c7a2d16f7f6c03cf6d60405d0dcd224caae6e80c9c4d43f8373bad2446affcdf49a02efb0085387328289aa79c8981dcaedff876cde55be9602dbde9c3f440b
25 +DIST webrtc-audio-processing-1.0.tar.gz 856721 BLAKE2B bbf5bee4887ca9929cdc62ded5a9b12563371e75cf1d3e3a3d7c8ccc766cb00bd718bc1ddf96d713a47342694394cc853067fba531c61c7e28e493a4dcdc895f SHA512 fced98beeb58155e86aed9649413e2f28ee6814e711bd57e946ec0db30ddabcc65bbf425b85892f4ad8803e87f0ece9fdde5595948145b90f436c2592da55961
26
27 diff --git a/media-libs/webrtc-audio-processing/files/1.0-abseil-cmake.patch b/media-libs/webrtc-audio-processing/files/1.0-abseil-cmake.patch
28 new file mode 100644
29 index 00000000000..ca1e825469a
30 --- /dev/null
31 +++ b/media-libs/webrtc-audio-processing/files/1.0-abseil-cmake.patch
32 @@ -0,0 +1,69 @@
33 +From 3f9907f93d3983033e176e95f5134a57900a7f6e Mon Sep 17 00:00:00 2001
34 +From: Arun Raghavan <arun@××××××××××.io>
35 +Date: Thu, 10 Dec 2020 19:06:31 -0500
36 +Subject: [PATCH] build: Use cmake to look up abseil dependency
37 +
38 +This should be much more robust than looking up the library directly.
39 +
40 +Fixes: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4
41 +---
42 + .gitlab-ci.yml | 3 ++-
43 + meson.build | 21 ++++++++-------------
44 + 2 files changed, 10 insertions(+), 14 deletions(-)
45 +
46 +diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
47 +index 11a3b78..42cd589 100644
48 +--- a/.gitlab-ci.yml
49 ++++ b/.gitlab-ci.yml
50 +@@ -19,7 +19,7 @@ variables:
51 + # CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES.
52 + # The tag is an arbitrary string that identifies the exact container
53 + # contents.
54 +- BASE_TAG: '2020-11-27.1'
55 ++ BASE_TAG: '2020-12-10.1'
56 + FDO_DISTRIBUTION_VERSION: '20.10'
57 + FDO_UPSTREAM_REPO: 'pulseaudio/webrtc-audio-processing'
58 +
59 +@@ -43,6 +43,7 @@ include:
60 + FDO_DISTRIBUTION_PACKAGES: >-
61 + g++
62 + gcc
63 ++ cmake
64 + libabsl-dev
65 + meson
66 + ninja-build
67 +diff --git a/meson.build b/meson.build
68 +index bae155e..96d84d7 100644
69 +--- a/meson.build
70 ++++ b/meson.build
71 +@@ -40,19 +40,14 @@ os_deps = []
72 + have_posix = false
73 + have_win = false
74 +
75 +-absl_dep = [
76 +- cpp.find_library('absl_base'),
77 +- cpp.find_library('absl_bad_optional_access'),
78 +- cpp.find_library('absl_flags_internal'),
79 +- cpp.find_library('absl_flags_marshalling'),
80 +- cpp.find_library('absl_flags_parse'),
81 +- cpp.find_library('absl_flags_registry'),
82 +- cpp.find_library('absl_flags_usage_internal'),
83 +- cpp.find_library('absl_raw_logging_internal'),
84 +- cpp.find_library('absl_strings'),
85 +- cpp.find_library('absl_synchronization'),
86 +- cpp.find_library('absl_throw_delegate'),
87 +-]
88 ++absl_dep = dependency('absl', method : 'cmake',
89 ++ modules : [
90 ++ 'absl::base',
91 ++ 'absl::flags_parse',
92 ++ 'absl::strings',
93 ++ 'absl::synchronization',
94 ++ ]
95 ++)
96 +
97 + if ['darwin', 'ios'].contains(host_system)
98 + os_cflags = ['-DWEBRTC_MAC']
99 +--
100 +GitLab
101 +
102
103 diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.0.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.0.ebuild
104 new file mode 100644
105 index 00000000000..6f1978a3eab
106 --- /dev/null
107 +++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.0.ebuild
108 @@ -0,0 +1,32 @@
109 +# Copyright 1999-2021 Gentoo Authors
110 +# Distributed under the terms of the GNU General Public License v2
111 +
112 +EAPI=7
113 +
114 +inherit meson
115 +
116 +DESCRIPTION="AudioProcessing library from the webrtc.org codebase"
117 +HOMEPAGE="https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/"
118 +SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.gz"
119 +
120 +LICENSE="BSD"
121 +SLOT="1"
122 +KEYWORDS="~amd64 ~x86 ~amd64-linux"
123 +IUSE="cpu_flags_arm_neon"
124 +
125 +RDEPEND="dev-cpp/abseil-cpp[-cxx17(+)]" # TODO: resolve cxx14 requirement
126 +DEPEND="${RDEPEND}"
127 +BDEPEND="virtual/pkgconfig"
128 +
129 +PATCHES=(
130 + "${FILESDIR}"/${PV}-abseil-cmake.patch
131 +)
132 +
133 +DOCS=( AUTHORS NEWS README.md )
134 +
135 +src_configure() {
136 + local emesonargs=(
137 + -Dneon=$(usex cpu_flags_arm_neon yes no)
138 + )
139 + meson_src_configure
140 +}
141
142 diff --git a/profiles/package.mask b/profiles/package.mask
143 index 750f7e68774..f2db0adac9b 100644
144 --- a/profiles/package.mask
145 +++ b/profiles/package.mask
146 @@ -33,6 +33,10 @@
147
148 #--- END OF EXAMPLES ---
149
150 +# Mart Raudsepp <leio@g.o> (2021-09-23)
151 +# Incompatible with c++17 abseil-cpp, no in-tree consumers yet
152 +media-libs/webrtc-audio-processing:1
153 +
154 # Michał Górny <mgorny@g.o> (2021-09-23)
155 # Ancient version from 2016 that collides with dev-python/pyjwt.
156 # Never bumped by the maintainer. The only revdep turned out to be