[neon/qt6/qt6-multimedia/Neon/release] debian/patches: fix_build_2.diff

[Carlos De Maine]

Git commit 4a5dd24b84c555b35ca694425e0132630035b2c4 by Carlos De Maine.
Committed on 28/10/2024 at 10:33.
Pushed by carlosdem into branch 'Neon/release'.

fix_build_2.diff

A  +50   -0    debian/patches/fix_build_2.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-multimedia/-/commit/4a5dd24b84c555b35ca694425e0132630035b2c4

diff --git a/debian/patches/fix_build_2.diff b/debian/patches/fix_build_2.diff
new file mode 100644
index 0000000..20de1dc
--- /dev/null
+++ b/debian/patches/fix_build_2.diff
@@ -0,0 +1,50 @@
+diff --git a/src/multimedia/platform/qplatformvideoframeinput_p.h b/src/multimedia/platform/qplatformvideoframeinput_p.h
+index 4571449..ccab7c4 100644 (file)
+--- a/src/multimedia/platform/qplatformvideoframeinput_p.h
++++ b/src/multimedia/platform/qplatformvideoframeinput_p.h
+@@ -37,9 +37,9 @@ public:
+     QString errorString() const final { return {}; }
+ 
+     QMediaInputEncoderInterface *encoderInterface() const { return m_encoderInterface; }
+-    void setEncoderInterface(QMediaInputEncoderInterface *interface)
++    void setEncoderInterface(QMediaInputEncoderInterface *encoderInterface)
+     {
+-        m_encoderInterface = interface;
++        m_encoderInterface = encoderInterface;
+     }
+ 
+ Q_SIGNALS:
+diff --git a/src/plugins/multimedia/ffmpeg/recordingengine/qffmpegrecordingengineutils.cpp b/src/plugins/multimedia/ffmpeg/recordingengine/qffmpegrecordingengineutils.cpp
+index 6c2ba8b..b8fab13 100644 (file)
+--- a/src/plugins/multimedia/ffmpeg/recordingengine/qffmpegrecordingengineutils.cpp
++++ b/src/plugins/multimedia/ffmpeg/recordingengine/qffmpegrecordingengineutils.cpp
+@@ -19,13 +19,13 @@ void doWithMediaFrameInput(QObject *source, F &&f)
+         f(audioBufferInput);
+ }
+ 
+-void setEncoderInterface(QObject *source, QMediaInputEncoderInterface *interface)
++void setEncoderInterface(QObject *source, QMediaInputEncoderInterface *encoderInterface)
+ {
+     doWithMediaFrameInput(source, [&](auto source) {
+         using Source = std::remove_pointer_t<decltype(source)>;
+ 
+-        source->setEncoderInterface(interface);
+-        if (interface)
++        source->setEncoderInterface(encoderInterface);
++        if (encoderInterface)
+             // Postpone emit 'encoderUpdated' as the encoding pipeline may be not
+             // completely ready at the moment. The case is calling QMediaRecorder::stop
+             // upon handling 'readyToSendFrame'
+diff --git a/src/plugins/multimedia/ffmpeg/recordingengine/qffmpegrecordingengineutils_p.h b/src/plugins/multimedia/ffmpeg/recordingengine/qffmpegrecordingengineutils_p.h
+index a60f816..f3a84c0 100644 (file)
+--- a/src/plugins/multimedia/ffmpeg/recordingengine/qffmpegrecordingengineutils_p.h
++++ b/src/plugins/multimedia/ffmpeg/recordingengine/qffmpegrecordingengineutils_p.h
+@@ -40,7 +40,7 @@ T dequeueIfPossible(std::queue<T> &queue)
+     return result;
+ }
+ 
+-void setEncoderInterface(QObject *source, QMediaInputEncoderInterface *interface);
++void setEncoderInterface(QObject *source, QMediaInputEncoderInterface *);
+ 
+ void setEncoderUpdateConnection(QObject *source, EncoderThread *encoder);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8db678b..7972842 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 unity_build.diff
+fix_build_2.diff