diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 9c622b6..74b4312 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -12,6 +12,8 @@ %if 0%{?fedora} # need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e) %global use_system_libvpx 1 +# For screen sharing on Wayland, currently Fedora only thing - no epel +%global pipewire 1 %endif %if 0%{?fedora} > 30 || 0%{?epel} > 7 # need libwebp >= 0.6.0 @@ -154,6 +156,9 @@ BuildRequires: nodejs %if 0%{?use_system_re2} BuildRequires: re2-devel %endif +%if 0%{?pipewire} +BuildRequires: pkgconfig(libpipewire-0.3) +%endif BuildRequires: snappy-devel BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gobject-2.0) @@ -434,6 +439,9 @@ popd %patch5 -p1 -b .QT_DEPRECATED_VERSION %patch6 -p1 -b .angle_nullptr %patch7 -p1 -b .hunspell_nullptr +#if 0%{?pipewire} +%patch8 -p1 -b .libpipewire-0.3 +#endif ## upstream patches %patch24 -p1 -b .aarch64-new-stat @@ -502,7 +510,7 @@ export NINJA_PATH=%{__ninja} CONFIG+="link_pulseaudio use_gold_linker" \ %{?use_system_libicu:QMAKE_EXTRA_ARGS+="-system-webengine-icu"} \ QMAKE_EXTRA_ARGS+="-webengine-kerberos" \ - QMAKE_EXTRA_ARGS+="-webengine-webrtc-pipewire" \ + %{?pipewire:QMAKE_EXTRA_ARGS+="-webengine-webrtc-pipewire"} \ . # avoid %%make_build for now, the -O flag buffers output from intermediate build steps done via ninja diff --git a/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch b/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch new file mode 100644 index 0000000..ece385b --- /dev/null +++ b/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch @@ -0,0 +1,12 @@ +diff -up qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn.libpipewire-0.3 qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn +--- qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn.libpipewire-0.3 2021-12-15 10:09:27.000000000 -0600 ++++ qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn 2022-02-18 09:43:31.402923179 -0600 +@@ -202,7 +202,7 @@ if (is_linux || is_chromeos) { + + if (rtc_link_pipewire) { + pkg_config("pipewire") { +- packages = [ "libpipewire-0.2" ] ++ packages = [ "libpipewire-0.3" ] + } + } else { + # When libpipewire is not directly linked, use stubs to allow for dlopening of