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

authored by K900 and committed by GitHub 12b6897f c02c4a43

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