Merge pull request #16598 from Rmys/master

qt6-6.9.0
2025-05-13 10:33:31 +03:00
parent 8f93fcb3be 925e37f27d
commit 0801de7885
3 changed files with 49 additions and 1 deletions
@@ -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
@@ -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 <hans@hans-knoechel.de>
+ Helmut Januschka <helmut@januschka.com>
+ Hugues Ekra <hekra01@gmail.com>
+ Hyungjoo Na <element11sodium@gmail.com>
+Ilya Katsnelson <me@0upti.me>
+ Jake Hilton <jakehilton@gmail.com>
+ James H. Brown <jbrown@burgoyne.com>
+ Jan Grulich <grulja@gmail.com>
+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<pw_node*>(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<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
+         break;
+       }
+     }
@@ -93,7 +93,8 @@
 <!--             <Dependency>pciutils-devel</Dependency> -->
        </BuildDependencies>
        <Patches>
-<!--             <Patch level="1">qtwebengine-fix-building-with-system-ffmpeg.patch</Patch> -->
+            <Patch level="1">qtwebengine-link-pipewire.patch</Patch>
+            <Patch level="1">qtwebengine-webrtc-fix-build-with-pipewire.patch</Patch>
        </Patches>
    </Source>