From 925e37f27d528ff5fbac98d0dad110b093f44caa Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 13 May 2025 10:32:07 +0300 Subject: [PATCH] qt6-6.9.0 --- .../files/qtwebengine-link-pipewire.patch | 13 +++++++ ...ngine-webrtc-fix-build-with-pipewire.patch | 34 +++++++++++++++++++ desktop/toolkit/qt6/qt6-webengine/pspec.xml | 3 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-link-pipewire.patch create mode 100644 desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-webrtc-fix-build-with-pipewire.patch diff --git a/desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-link-pipewire.patch b/desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-link-pipewire.patch new file mode 100644 index 0000000000..49d8aa2060 --- /dev/null +++ b/desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-link-pipewire.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni +index 5a1c43c..82870d2 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni ++++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni +@@ -150,7 +150,7 @@ declare_args() { + rtc_use_pipewire = is_linux && use_sysroot + + # Set this to link PipeWire and required libraries directly instead of using the dlopen. +- rtc_link_pipewire = false ++ rtc_link_pipewire = true + + # Enable to use the Mozilla internal settings. + build_with_mozilla = false diff --git a/desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-webrtc-fix-build-with-pipewire.patch b/desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-webrtc-fix-build-with-pipewire.patch new file mode 100644 index 0000000000..4a3b5f36d0 --- /dev/null +++ b/desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-webrtc-fix-build-with-pipewire.patch @@ -0,0 +1,34 @@ +diff --git a/src/3rdparty/chromium/third_party/webrtc/AUTHORS b/src/3rdparty/chromium/third_party/webrtc/AUTHORS +index 064e12611..0543ba699 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/AUTHORS ++++ b/src/3rdparty/chromium/third_party/webrtc/AUTHORS +@@ -60,6 +60,7 @@ Hans Knoechel + Helmut Januschka + Hugues Ekra + Hyungjoo Na ++Ilya Katsnelson + Jake Hilton + James H. Brown + Jan Grulich +diff --git 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 +index e9f7f765a..358cf3d7e 100644 +--- 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 +@@ -85,7 +85,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, + .param = OnNodeParam, + }; + +- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); ++ pw_node_add_listener(reinterpret_cast(proxy_), &node_listener_, &node_events, this); + } + + // static +@@ -117,7 +117,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(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); + break; + } + } diff --git a/desktop/toolkit/qt6/qt6-webengine/pspec.xml b/desktop/toolkit/qt6/qt6-webengine/pspec.xml index b47ed48188..0e64cbe9ec 100755 --- a/desktop/toolkit/qt6/qt6-webengine/pspec.xml +++ b/desktop/toolkit/qt6/qt6-webengine/pspec.xml @@ -93,7 +93,8 @@ - + qtwebengine-link-pipewire.patch + qtwebengine-webrtc-fix-build-with-pipewire.patch