[neon/qt6/qt6-multimedia/Neon/release] debian/patches: one more

[Carlos De Maine]

Git commit 6be3abee30ec72b12c1aa7194f4175218dbaea48 by Carlos De Maine.
Committed on 28/10/2024 at 11:36.
Pushed by carlosdem into branch 'Neon/release'.

one more

M  +24   -0    debian/patches/null_pointers.diff

https://invent.kde.org/neon/qt6/qt6-multimedia/-/commit/6be3abee30ec72b12c1aa7194f4175218dbaea48

diff --git a/debian/patches/null_pointers.diff b/debian/patches/null_pointers.diff
index ab773ae..e50cb2f 100644
--- a/debian/patches/null_pointers.diff
+++ b/debian/patches/null_pointers.diff
@@ -26,3 +26,27 @@ index 169b87f..90cf058 100644 (file)
      {
          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,