Merge pull request #18227 from Rmys/master

subtitlecomposer rebuild

desktop/kde/utils/subtitlecomposer/actions.py

@@ -13,24 +13,14 @@ from pisi.actionsapi import cmaketools
 
 
 def setup():
-    shelltools.export("PKG_CONFIG_PATH", "/usr/lib/ffmpeg4.4/pkgconfig")
+    # shelltools.export("PKG_CONFIG_PATH", "/usr/lib/ffmpeg4.4/pkgconfig")
     cmaketools.configure("-B build -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DKDE_INSTALL_LIBDIR=lib \
         -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
             -DBUILD_TESTING:BOOL=OFF \
         -DCMAKE_CXX_STANDARD=17 \
-        -DFFMPEG_AVCODEC_LIBRARY:FILEPATH=/usr/lib/ffmpeg4.4/libavcodec.so \
+        -DQT_MAJOR_VERSION=6 ")
-        -DFFMPEG_AVFORMAT_LIBRARY:FILEPATH=/usr/lib/ffmpeg4.4/libavformat.so \
-        -DFFMPEG_AVUTIL_LIBRARY:FILEPATH=/usr/lib/ffmpeg4.4/libavutil.so \
-        -DFFMPEG_SWRESAMPLE_LIBRARY:FILEPATH=/usr/lib/ffmpeg4.4/libswresample.so \
-        -DFFMPEG_SWSCALE_LIBRARY:FILEPATH=/usr/lib/ffmpeg4.4/libswscale.so \
-        -DQT_MAJOR_VERSION=6 \
-        -DFFMPEG_AVCODEC_INCLUDE_DIR=/usr/include/ffmpeg4.4 \
-        -DFFMPEG_AVFORMAT_INCLUDE_DIR=/usr/include/ffmpeg4.4 \
-        -DFFMPEG_SWRESAMPLE_INCLUDE_DIR=/usr/include/ffmpeg4.4 \
-        -DFFMPEG_SWSCALE_INCLUDE_DIR=/usr/include/ffmpeg4.4 \
-        -DFFMPEG_AVUTIL_INCLUDE_DIR=/usr/include/ffmpeg4.4")
 
 def build():
     kde6.make()

desktop/kde/utils/subtitlecomposer/files/0043f4434886c5aabe99705d40bd7f633b8b73e7.patch

@@ -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
+

desktop/kde/utils/subtitlecomposer/files/1e11d53565ab6df3ba8329072e7b4b12f9f88d72.patch

@@ -0,0 +1,26 @@
+From 1e11d53565ab6df3ba8329072e7b4b12f9f88d72 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Mon, 13 Oct 2025 09:23:58 +0200
+Subject: [PATCH] Fix building with Qt 6.10
+
+Fixes #111
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69615111..397cadce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+ project(subtitlecomposer VERSION "0.8.2")
+ 
+ if(QT_MAJOR_VERSION EQUAL 6)
+-	set(QT_EXTRA_COMPONENTS OpenGLWidgets Core5Compat)
++	set(QT_EXTRA_COMPONENTS OpenGLWidgets Core5Compat WidgetsPrivate)
+ 	set(QT_MIN_VERSION "6.0.0")
+ 	set(KF_MAJOR_VERSION "6")
+ 	set(KF_MIN_VERSION "5.240.0")
+-- 
+GitLab
+

desktop/kde/utils/subtitlecomposer/pspec.xml

@@ -25,7 +25,7 @@
 <!--             <Dependency>kross-devel</Dependency> -->
             <Dependency>ki18n-devel</Dependency>
             <Dependency>sonnet-devel</Dependency>
-            <Dependency>ffmpeg4-devel</Dependency>
+            <Dependency>ffmpeg-devel</Dependency>
             <Dependency>openal-devel</Dependency>
             <Dependency>kcodecs-devel</Dependency>
             <Dependency>kconfig-devel</Dependency>
@@ -46,8 +46,8 @@
         </BuildDependencies>
         <Patches>
             <Patch>turkish.patch</Patch>
-<!--             <Patch>4f4f560e40ba0b760cf688eb024be3cc734ca347.patch</Patch> -->
+            <Patch>0043f4434886c5aabe99705d40bd7f633b8b73e7.patch</Patch>
-<!--             <Patch>d8f9797d9c0d45fa9f4402f79c539544b74d2cc7.patch</Patch> -->
+            <Patch>1e11d53565ab6df3ba8329072e7b4b12f9f88d72.patch</Patch>
         </Patches>
     </Source>
 
@@ -61,7 +61,7 @@
             <Dependency>ki18n</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>sonnet</Dependency>
-            <Dependency>ffmpeg4</Dependency>
+            <Dependency>ffmpeg</Dependency>
             <Dependency>openal</Dependency>
             <Dependency>openssl</Dependency>
             <Dependency>python3</Dependency>