diff options
| author | Ionen Wolkens <ionen@gentoo.org> | 2025-03-31 10:58:45 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2025-03-31 11:56:53 -0400 |
| commit | deeb17dfe876994c35feacdfa6b80ada031b40e2 (patch) | |
| tree | feb944d073339c5fe18e7ab109400834d79023f8 /dev-qt/qtwebengine | |
| parent | 9bf804feae60cb951ca7ff125eddc13685d8bdbf (diff) | |
| download | gentoo-deeb17dfe876994c35feacdfa6b80ada031b40e2.tar.gz gentoo-deeb17dfe876994c35feacdfa6b80ada031b40e2.tar.bz2 gentoo-deeb17dfe876994c35feacdfa6b80ada031b40e2.zip | |
dev-qt/qtwebengine: backport webrtc build fix with pipewire-1.4
Same issue that chromium ran into wrt bug #951816
Bug: https://bugs.gentoo.org/951816
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtwebengine')
4 files changed, 22 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.3-pipewire1.4.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.3-pipewire1.4.patch new file mode 100644 index 000000000000..50ea936b586f --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.8.3-pipewire1.4.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/951816 +https://issues.webrtc.org/issues/401732633 +https://webrtc-review.googlesource.com/c/src/+/380500 +--- 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 +@@ -61,5 +61,5 @@ + }; + +- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); ++ pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this); + } + +@@ -95,5 +95,5 @@ + 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; + } diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild index 6270ea2dd3de..7b688a197a15 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild @@ -113,6 +113,7 @@ PATCHES+=( "${FILESDIR}"/${PN}-6.8.2-cstdint.patch "${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch "${FILESDIR}"/${PN}-6.8.3-clang20.patch + "${FILESDIR}"/${PN}-6.8.3-pipewire1.4.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.0_rc.ebuild index 3cbb787dc5e8..14ce19f4b48d 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.0_rc.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.0_rc.ebuild @@ -107,6 +107,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch + "${FILESDIR}"/${PN}-6.8.3-pipewire1.4.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild index 3cbb787dc5e8..14ce19f4b48d 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild @@ -107,6 +107,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch + "${FILESDIR}"/${PN}-6.8.3-pipewire1.4.patch ) python_check_deps() { |