media-video/subtitlecomposer: Fix build with >=media-video/ffmpeg-8

Closes: https://bugs.gentoo.org/966741
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner 2025-12-12 15:12:34 +01:00
parent e3ba834150
commit e5e50cadf1
No known key found for this signature in database
GPG Key ID: AE591BBC73E4DD5E
2 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,42 @@
From 0043f4434886c5aabe99705d40bd7f633b8b73e7 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
Date: Tue, 16 Sep 2025 22:17:22 +0200
Subject: [PATCH] Include libavcodec/avfft.h only when AUDIO_VISUALIZATION is
enabled
libavcodec/avfft.h is needed only when the code of AUDIO_VISUALIZATION
is enabled (and it is off by default). This helps to build with
FFmpeg 8, which ships libavcodec 62 that drops all the FFT APIs (used
only within AUDIO_VISUALIZATION).
---
src/videoplayer/backend/videostate.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/videoplayer/backend/videostate.h b/src/videoplayer/backend/videostate.h
index 80e7fe83..acd9cc3f 100644
--- a/src/videoplayer/backend/videostate.h
+++ b/src/videoplayer/backend/videostate.h
@@ -23,7 +23,6 @@
extern "C" {
#include "libavformat/avformat.h"
-#include "libavcodec/avfft.h"
#include "libswscale/swscale.h"
}
@@ -58,6 +57,12 @@ extern "C" {
#undef AUDIO_VISUALIZATION
#undef VIDEO_SUBTITLE
+#ifdef AUDIO_VISUALIZATION
+extern "C" {
+#include "libavcodec/avfft.h"
+}
+#endif
+
namespace SubtitleComposer {
class RenderThread;
class GLRenderer;
--
GitLab

View File

@ -48,7 +48,10 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=( "${FILESDIR}/${P}-qt-6.10.patch" ) # bug #966626
PATCHES=(
"${FILESDIR}/${P}-qt-6.10.patch" # bug #966626
"${FILESDIR}/${P}-ffmpeg8.patch" # bug #966741
)
src_configure() {
local mycmakeargs=(