qt6Packages.{qtwebengine,qtmultimedia}: drop upstreamed patch (#416007)

K900 12b6897f c02c4a43

Changed files
+4 -41
pkgs
development
libraries
+4 -8
pkgs/development/libraries/qt-6/modules/qtmultimedia/default.nix
···
gst-vaapi
];
-
patches =
-
[
-
./fix-qtgui-include-incorrect-case.patch
-
]
-
++ lib.optionals stdenv.hostPlatform.isMinGW [
-
./windows-no-uppercase-libs.patch
-
./windows-resolve-function-name.patch
-
];
+
patches = lib.optionals stdenv.hostPlatform.isMinGW [
+
./windows-no-uppercase-libs.patch
+
./windows-resolve-function-name.patch
+
];
cmakeFlags = [
"-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0"
-11
pkgs/development/libraries/qt-6/modules/qtmultimedia/fix-qtgui-include-incorrect-case.patch
···
-
--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
-
+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp
-
@@ -7,7 +7,7 @@
-
#include <private/qmultimediautils_p.h>
-
#include <private/qwindowsmultimediautils_p.h>
-
#include <private/qvideoframe_p.h>
-
-#include <qtgui/qscreen_platform.h>
-
+#include <QtGui/qscreen_platform.h>
-
#include "qvideoframe.h"
-
-
#include <qloggingcategory.h>
-2
pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
···
# Override locales install path so they go to QtWebEngine's $out
./locales-path.patch
-
# Fix build with Pipewire 1.4
-
./pipewire-1.4.patch
# Reproducibility QTBUG-136068
./gn-object-sorted.patch
];
-20
pkgs/development/libraries/qt-6/modules/qtwebengine/pipewire-1.4.patch
···
-
--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
-
+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
-
@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session,
-
.param = OnNodeParam,
-
};
-
-
- pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
-
+ pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
-
}
-
-
// static
-
@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_node_info* info) {
-
uint32_t id = info->params[i].id;
-
if (id == SPA_PARAM_EnumFormat &&
-
info->params[i].flags & SPA_PARAM_INFO_READ) {
-
- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
-
+ pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
-
break;
-
}
-
}