* [gentoo-commits] repo/gentoo:master commit in: media-libs/webrtc-audio-processing/files/, media-libs/webrtc-audio-processing/, ...
@ 2021-09-23 14:10 Mart Raudsepp
0 siblings, 0 replies; only message in thread
From: Mart Raudsepp @ 2021-09-23 14:10 UTC (permalink / raw
To: gentoo-commits
commit: a821b85f4a03acf61b9cff28a73e5134a314dece
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 23 13:27:45 2021 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 14:09:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a821b85f
media-libs/webrtc-audio-processing: add preliminary SLOT=1 bump
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/webrtc-audio-processing/Manifest | 1 +
.../files/1.0-abseil-cmake.patch | 69 ++++++++++++++++++++++
.../webrtc-audio-processing-1.0.ebuild | 32 ++++++++++
profiles/package.mask | 4 ++
4 files changed, 106 insertions(+)
diff --git a/media-libs/webrtc-audio-processing/Manifest b/media-libs/webrtc-audio-processing/Manifest
index 54926ef3847..4a4f053a09c 100644
--- a/media-libs/webrtc-audio-processing/Manifest
+++ b/media-libs/webrtc-audio-processing/Manifest
@@ -1 +1,2 @@
DIST webrtc-audio-processing-0.3.1.tar.xz 695920 BLAKE2B 833c6d12b358918d95dee5b165308c8cc382f98264349fd38649bfe478557765b85d9112a35194676ee52a8ef297fb7cb7e3a570d9c2295785b6fb97d35be948 SHA512 1c7a2d16f7f6c03cf6d60405d0dcd224caae6e80c9c4d43f8373bad2446affcdf49a02efb0085387328289aa79c8981dcaedff876cde55be9602dbde9c3f440b
+DIST webrtc-audio-processing-1.0.tar.gz 856721 BLAKE2B bbf5bee4887ca9929cdc62ded5a9b12563371e75cf1d3e3a3d7c8ccc766cb00bd718bc1ddf96d713a47342694394cc853067fba531c61c7e28e493a4dcdc895f SHA512 fced98beeb58155e86aed9649413e2f28ee6814e711bd57e946ec0db30ddabcc65bbf425b85892f4ad8803e87f0ece9fdde5595948145b90f436c2592da55961
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
new file mode 100644
index 00000000000..ca1e825469a
--- /dev/null
+++ b/media-libs/webrtc-audio-processing/files/1.0-abseil-cmake.patch
@@ -0,0 +1,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
+
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
new file mode 100644
index 00000000000..6f1978a3eab
--- /dev/null
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="AudioProcessing library from the webrtc.org codebase"
+HOMEPAGE="https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="cpu_flags_arm_neon"
+
+RDEPEND="dev-cpp/abseil-cpp[-cxx17(+)]" # TODO: resolve cxx14 requirement
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-abseil-cmake.patch
+)
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_configure() {
+ local emesonargs=(
+ -Dneon=$(usex cpu_flags_arm_neon yes no)
+ )
+ meson_src_configure
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 750f7e68774..f2db0adac9b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
#--- END OF EXAMPLES ---
+# Mart Raudsepp <leio@gentoo.org> (2021-09-23)
+# Incompatible with c++17 abseil-cpp, no in-tree consumers yet
+media-libs/webrtc-audio-processing:1
+
# Michał Górny <mgorny@gentoo.org> (2021-09-23)
# Ancient version from 2016 that collides with dev-python/pyjwt.
# Never bumped by the maintainer. The only revdep turned out to be
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-23 14:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-23 14:10 [gentoo-commits] repo/gentoo:master commit in: media-libs/webrtc-audio-processing/files/, media-libs/webrtc-audio-processing/, Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox