Michael Froman
e64b031d2e
Upstream commit: https://webrtc.googlesource.com/src/+/0590643ffe94b4d8b3d3bf6ab4d7deaa506083f3 Move the below build targets to api/video: - adapted_video_track_source - video_adapter - video_broadcaster - video_common These targets are meant to replace rtc_media_base. Change-Id: Iaa69cd8379f66f98d618ac2e4fb6ffb4a1806f50 Bug: webrtc:42225070 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/483960 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#48064}
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Wed, 8 Apr 2026 10:58:00 -0500
|
|
Subject: Bug 2030139 - (fix-bb3693c382) fix linux builds for constexpr
|
|
containing std::string
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/cab51cf0d4e9e67e9f5b053128d05e859d47b7c2
|
|
---
|
|
modules/portal/pipewire_utils.cc | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/modules/portal/pipewire_utils.cc b/modules/portal/pipewire_utils.cc
|
|
index 850726cc58..7008696b7d 100644
|
|
--- a/modules/portal/pipewire_utils.cc
|
|
+++ b/modules/portal/pipewire_utils.cc
|
|
@@ -28,9 +28,18 @@
|
|
|
|
namespace webrtc {
|
|
|
|
+#if defined(__GNUC__) && defined(WEBRTC_MOZILLA_BUILD)
|
|
+// Mozilla linux builds are using -std=gnu++20, which doesn't approve
|
|
+// of using std::string in a constexpr. PipewireVersion now contains
|
|
+// std::string as of libwebrtc commit d167fe9296.
|
|
+static const PipeWireVersion kReentrantDeinitMinVersion = {.major = 0,
|
|
+ .minor = 3,
|
|
+ .micro = 49};
|
|
+#else
|
|
constexpr PipeWireVersion kReentrantDeinitMinVersion = {.major = 0,
|
|
.minor = 3,
|
|
.micro = 49};
|
|
+#endif
|
|
|
|
PipeWireVersion PipeWireVersion::Parse(const std::string_view& version) {
|
|
std::vector<std::string_view> parsed_version = split(version, '.');
|