webrtc-audio-processing: Add patches to fix compilation with gcc 15

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9038>
This commit is contained in:
Sebastian Dröge 2025-05-30 09:17:08 +03:00
parent 056c6967b2
commit 86bb1cf907
3 changed files with 116 additions and 0 deletions

View File

@ -0,0 +1,48 @@
From e9c78dc4712fa6362b0c839ad57b6b46dce1ba83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= <francois@centricular.com>
Date: Mon, 14 Apr 2025 16:48:19 +0200
Subject: [PATCH 1/3] Fix compilation with gcc-15
This commit fixes compilation errors with gcc-15 (default for Fedora 42).
From [1]:
> Common C++ headers (like <memory>) in GCC 15.0.0 (combined with libstdc++)
> don't transitively include uint64_t anymore.
See also [2].
[1]: https://github.com/ROCm/rocm_smi_lib/pull/198
[2]: https://github.com/root-project/root/issues/17444
---
.../audio_processing/aec3/multi_channel_content_detector.h | 1 +
webrtc/rtc_base/trace_event.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/webrtc/modules/audio_processing/aec3/multi_channel_content_detector.h b/webrtc/modules/audio_processing/aec3/multi_channel_content_detector.h
index 2b2f3b8..feb29fd 100644
--- a/webrtc/modules/audio_processing/aec3/multi_channel_content_detector.h
+++ b/webrtc/modules/audio_processing/aec3/multi_channel_content_detector.h
@@ -12,6 +12,7 @@
#define MODULES_AUDIO_PROCESSING_AEC3_MULTI_CHANNEL_CONTENT_DETECTOR_H_
#include <stddef.h>
+#include <cstdint>
#include <memory>
#include <optional>
diff --git a/webrtc/rtc_base/trace_event.h b/webrtc/rtc_base/trace_event.h
index 2aee713..f88a68e 100644
--- a/webrtc/rtc_base/trace_event.h
+++ b/webrtc/rtc_base/trace_event.h
@@ -28,6 +28,7 @@
#if !defined(RTC_USE_PERFETTO)
#include <string>
+#include <cstdint>
#include "rtc_base/event_tracer.h"
--
2.49.0

View File

@ -0,0 +1,67 @@
From a260b2e8b9ca00119eb6c683121d5c40e040bce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= <francois@centricular.com>
Date: Tue, 15 Apr 2025 19:18:03 +0200
Subject: [PATCH 2/3] patches: Track Fix compilation with gcc-15
---
.../0001-Fix-compilation-with-gcc-15.patch | 48 +++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 patches/0001-Fix-compilation-with-gcc-15.patch
diff --git a/patches/0001-Fix-compilation-with-gcc-15.patch b/patches/0001-Fix-compilation-with-gcc-15.patch
new file mode 100644
index 0000000..10d989d
--- /dev/null
+++ b/patches/0001-Fix-compilation-with-gcc-15.patch
@@ -0,0 +1,48 @@
+From e9c78dc4712fa6362b0c839ad57b6b46dce1ba83 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= <francois@centricular.com>
+Date: Mon, 14 Apr 2025 16:48:19 +0200
+Subject: [PATCH] Fix compilation with gcc-15
+
+This commit fixes compilation errors with gcc-15 (default for Fedora 42).
+
+From [1]:
+
+> Common C++ headers (like <memory>) in GCC 15.0.0 (combined with libstdc++)
+> don't transitively include uint64_t anymore.
+
+See also [2].
+
+[1]: https://github.com/ROCm/rocm_smi_lib/pull/198
+[2]: https://github.com/root-project/root/issues/17444
+---
+ .../audio_processing/aec3/multi_channel_content_detector.h | 1 +
+ webrtc/rtc_base/trace_event.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/webrtc/modules/audio_processing/aec3/multi_channel_content_detector.h b/webrtc/modules/audio_processing/aec3/multi_channel_content_detector.h
+index 2b2f3b8..feb29fd 100644
+--- a/webrtc/modules/audio_processing/aec3/multi_channel_content_detector.h
++++ b/webrtc/modules/audio_processing/aec3/multi_channel_content_detector.h
+@@ -12,6 +12,7 @@
+ #define MODULES_AUDIO_PROCESSING_AEC3_MULTI_CHANNEL_CONTENT_DETECTOR_H_
+
+ #include <stddef.h>
++#include <cstdint>
+
+ #include <memory>
+ #include <optional>
+diff --git a/webrtc/rtc_base/trace_event.h b/webrtc/rtc_base/trace_event.h
+index 2aee713..f88a68e 100644
+--- a/webrtc/rtc_base/trace_event.h
++++ b/webrtc/rtc_base/trace_event.h
+@@ -28,6 +28,7 @@
+
+ #if !defined(RTC_USE_PERFETTO)
+ #include <string>
++#include <cstdint>
+
+ #include "rtc_base/event_tracer.h"
+
+--
+2.49.0
+
--
2.49.0

View File

@ -3,6 +3,7 @@ directory = webrtc-audio-processing
url = https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing.git
push-url = git@gitlab.freedesktop.org:pulseaudio/webrtc-audio-processing.git
revision = v2.1
diff_files = webrtc-audio-processing-2.1/0001-Fix-compilation-with-gcc-15.patch, webrtc-audio-processing-2.1/0002-patches-Track-Fix-compilation-with-gcc-15.patch
[provide]
dependency_names = webrtc-audio-processing-2