[neon/multimedia/subtitlecomposer/Neon/stable] debian: Revert "ffmpeg8 patch"
Carlos De Maine
null at kde.org
Thu Jul 30 12:06:04 BST 2026
Git commit 0cbf91955ec5b9ad05b966233ed3ac3957472175 by Carlos De Maine.
Committed on 30/07/2026 at 11:06.
Pushed by carlosdem into branch 'Neon/stable'.
Revert "ffmpeg8 patch"
This reverts commit 9eb0adf2ddd63f7758e4751e7fd926c40ff6ca09
D +0 -25 debian/patches/ffmpeg8.diff
M +0 -1 debian/patches/series
M +1 -1 debian/rules
https://invent.kde.org/neon/multimedia/subtitlecomposer/-/commit/0cbf91955ec5b9ad05b966233ed3ac3957472175
diff --git a/debian/patches/ffmpeg8.diff b/debian/patches/ffmpeg8.diff
deleted file mode 100644
index df87ae0..0000000
--- a/debian/patches/ffmpeg8.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/videoplayer/backend/videostate.h b/src/videoplayer/backend/videostate.h
-index 80e7fe831a2b6507e6c93a60972e7ba44bc28f96..acd9cc3f713ce66fc601fa0c2064391a0f19b023 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;
diff --git a/debian/patches/series b/debian/patches/series
index bbb19c0..06cc067 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
qt6_10_compat.diff
-ffmpeg8.diff
diff --git a/debian/rules b/debian/rules
index 5862926..a49fb57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,4 +6,4 @@
dh $@ --with kf6 --buildsystem kf6
override_dh_auto_configure:
- dh_auto_configure -- -DQT_MAJOR_VERSION=6 -DAUDIO_VISUALIZATION=ON
+ dh_auto_configure -- -DQT_MAJOR_VERSION=6
More information about the Neon-commits
mailing list