[neon/qt6/qt6-multimedia/Neon/release] debian/patches: fix_unity_build.diff
Carlos De Maine
null at kde.org
Mon Nov 4 09:35:44 GMT 2024
Git commit 4ad0a6e20b931041b0e7c80146dd10b89936bdc2 by Carlos De Maine.
Committed on 04/11/2024 at 09:35.
Pushed by carlosdem into branch 'Neon/release'.
fix_unity_build.diff
D +0 -50 debian/patches/fix_build_2.diff
A +15 -0 debian/patches/fix_unity_build.diff
D +0 -52 debian/patches/null_pointers.diff
M +1 -4 debian/patches/series
D +0 -13 debian/patches/simd.diff
D +0 -16 debian/patches/unity_build.diff
https://invent.kde.org/neon/qt6/qt6-multimedia/-/commit/4ad0a6e20b931041b0e7c80146dd10b89936bdc2
diff --git a/debian/patches/fix_build_2.diff b/debian/patches/fix_build_2.diff
deleted file mode 100644
index 20de1dc..0000000
--- a/debian/patches/fix_build_2.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-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/fix_unity_build.diff b/debian/patches/fix_unity_build.diff
new file mode 100644
index 0000000..23a62bb
--- /dev/null
+++ b/debian/patches/fix_unity_build.diff
@@ -0,0 +1,15 @@
+diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
+index 107000f9d..1981ea1b0 100644
+--- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt
++++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
+@@ -106,6 +106,10 @@ if (QT_FEATURE_pipewire)
+ qpipewirecapture.cpp qpipewirecapture_p.h
+ qpipewirecapturehelper.cpp qpipewirecapturehelper_p.h
+ symbolstubs/qffmpegsymbols-pipewire.cpp
++
++ NO_UNITY_BUILD_SOURCES
++ # conflict with qffmpegsymbols-va.cpp: class SymbolsResolverImpl
++ symbolstubs/qffmpegsymbols-pipewire.cpp
+ LIBRARIES
+ Qt::DBus
+ )
\ No newline at end of file
diff --git a/debian/patches/null_pointers.diff b/debian/patches/null_pointers.diff
deleted file mode 100644
index e50cb2f..0000000
--- a/debian/patches/null_pointers.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/examples/multimedia/player/qplaylistfileparser.cpp b/examples/multimedia/player/qplaylistfileparser.cpp
-index 27982bd..4e8f4dd 100644 (file)
---- a/examples/multimedia/player/qplaylistfileparser.cpp
-+++ b/examples/multimedia/player/qplaylistfileparser.cpp
-@@ -267,7 +267,7 @@ public:
- QPlaylistFileParser::FileType m_type;
- struct ParserJob
- {
-- QIODevice *m_stream;
-+ QIODevice *m_stream = nullptr;
- QUrl m_media;
- QString m_mimeType;
- [[nodiscard]] bool isValid() const { return m_stream || !m_media.isEmpty(); }
-diff --git a/src/plugins/multimedia/gstreamer/common/qgst_p.h b/src/plugins/multimedia/gstreamer/common/qgst_p.h
-index 169b87f..90cf058 100644 (file)
---- a/src/plugins/multimedia/gstreamer/common/qgst_p.h
-+++ b/src/plugins/multimedia/gstreamer/common/qgst_p.h
-@@ -915,8 +915,8 @@ public:
- }
-
- template <typename... Ts>
-- std::enable_if_t<(std::is_base_of_v<QGstElement, Ts> && ...), void>
-- stopAndRemoveElements(Ts... ts)
-+ std::enable_if_t<(std::is_base_of_v<QGstElement, std::remove_reference_t<Ts>> && ...), void>
-+ stopAndRemoveElements(Ts &&...ts)
- {
- bool stateChangeSuccessful = (ts.setStateSync(GST_STATE_NULL) && ...);
- Q_ASSERT(stateChangeSuccessful);
-diff --git a/src/plugins/multimedia/ffmpeg/qpipewirecapturehelper.cpp b/src/plugins/multimedia/ffmpeg/qpipewirecapturehelper.cpp
-index 39df3a5..f49bfaa 100644 (file)
---- a/src/plugins/multimedia/ffmpeg/qpipewirecapturehelper.cpp
-+++ b/src/plugins/multimedia/ffmpeg/qpipewirecapturehelper.cpp
-@@ -662,6 +662,11 @@ void QPipeWireCaptureHelper::recreateStream()
- m_streamListener = {};
- pw_stream_add_listener(m_stream, &m_streamListener, &streamEvents, this);
-
-+ QT_WARNING_PUSH
-+ // QTBUG-129587: libpipewire=1.2.5 warning
-+ QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers")
-+ QT_WARNING_DISABLE_CLANG("-Wmissing-field-initializers")
-+
- uint8_t buffer[4096];
- struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
- const struct spa_pod *params[1];
-@@ -689,6 +694,7 @@ void QPipeWireCaptureHelper::recreateStream()
- SPA_FORMAT_VIDEO_framerate, SPA_POD_CHOICE_RANGE_Fraction(
- &defrate, &minrate, &maxrate))
- );
-+ QT_WARNING_POP
-
- const int connectErr = pw_stream_connect(
- m_stream,
diff --git a/debian/patches/series b/debian/patches/series
index bf59277..0cb010b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-unity_build.diff
-#fix_build_2.diff
-null_pointers.diff
-simd.diff
\ No newline at end of file
+fix_unity_build.diff
diff --git a/debian/patches/simd.diff b/debian/patches/simd.diff
deleted file mode 100644
index 7013bd2..0000000
--- a/debian/patches/simd.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qtmultimedia-everywhere-src-6.8.0/src/resonance-audio/CMakeLists.txt
-===================================================================
---- qtmultimedia-everywhere-src-6.8.0.orig/src/resonance-audio/CMakeLists.txt
-+++ qtmultimedia-everywhere-src-6.8.0/src/resonance-audio/CMakeLists.txt
-@@ -233,7 +233,7 @@ qt_internal_extend_target(BundledResonan
- # Use fallback mode if SSE is not available
- qt_internal_extend_target(BundledResonanceAudio CONDITION (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i[3-6]86$")
- COMPILE_OPTIONS
-- -DPFFFT_SIMD_DISABLE
-+ -DPFFFT_SIMD_DISABLE -DDISABLE_SIMD
- )
-
- qt_disable_warnings(BundledResonanceAudio)
diff --git a/debian/patches/unity_build.diff b/debian/patches/unity_build.diff
deleted file mode 100644
index 9ba0af3..0000000
--- a/debian/patches/unity_build.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/multimedia/platform/qplatformaudiobufferinput_p.h b/src/multimedia/platform/qplatformaudiobufferinput_p.h
-index 55636ce..530266a 100644 (file)
---- a/src/multimedia/platform/qplatformaudiobufferinput_p.h
-+++ b/src/multimedia/platform/qplatformaudiobufferinput_p.h
-@@ -38,9 +38,9 @@ public:
- const QAudioFormat &audioFormat() const { return m_format; }
-
- QMediaInputEncoderInterface *encoderInterface() const { return m_encoderInterface; }
-- void setEncoderInterface(QMediaInputEncoderInterface *interface)
-+ void setEncoderInterface(QMediaInputEncoderInterface *encoderInterface)
- {
-- m_encoderInterface = interface;
-+ m_encoderInterface = encoderInterface;
- }
-
- Q_SIGNALS:
More information about the Neon-commits
mailing list