diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-29 17:04:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-08 12:59:24 +0200 |
| commit | e5b5fcb1a2c186f14ae35f4c48f593e6fa75dd87 (patch) | |
| tree | ccc8492909c457410287c7826b2291a1f5959070 | |
| parent | 6495e99e433b6f086642f8845be0463eb9b38d0d (diff) | |
Add pipewire detection and support
Used for screensharing on wayland
Fixes: QTBUG-85309
Change-Id: I7ec61611bb9e3f318a6a5bd3a43212f391766628
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
| -rw-r--r-- | src/core/config/linux.pri | 2 | ||||
| -rw-r--r-- | src/core/configure.json | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index e98524002..26d0dcf7d 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -29,6 +29,8 @@ qtConfig(webengine-embedded-build) { qtConfig(webengine-webrtc): gn_args += rtc_use_x11=true } + qtConfig(webengine-webrtc): qtConfig(webengine-webrtc-pipewire): gn_args += rtc_use_pipewire=true + qtConfig(webengine-system-libevent): gn_args += use_system_libevent=true qtConfig(webengine-system-libwebp): gn_args += use_system_libwebp=true qtConfig(webengine-system-libxml2): gn_args += use_system_libxml=true use_system_libxslt=true diff --git a/src/core/configure.json b/src/core/configure.json index 1a2162723..7ba4a94c7 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -25,6 +25,7 @@ "webengine-native-spellchecker": "boolean", "webengine-extensions": "boolean", "webengine-webrtc": "boolean", + "webengine-webrtc-pipewire": "boolean", "webengine-geolocation": "boolean", "webengine-webchannel": "boolean", "webengine-kerberos": "boolean", @@ -67,6 +68,12 @@ "sources": [ { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" } ] + }, + "webengine-gio": { + "label": "gio", + "sources": [ + { "type": "pkgConfig", "args": "gio-2.0" } + ] } }, "tests" : { @@ -183,6 +190,13 @@ "autoDetect": "!features.webengine-embedded-build", "output": [ "privateFeature" ] }, + "webengine-webrtc-pipewire": { + "label": "PipeWire over GIO", + "purpose": "Provides PipeWire support in WebRTC using GIO.", + "condition": "features.webengine-webrtc && libs.webengine-gio", + "autoDetect": "false", + "output": [ "privateFeature" ] + }, "webengine-ozone" : { "label": "Support qpa-xcb", "condition": "features.webengine-ozone-x11", @@ -252,6 +266,7 @@ "webengine-spellchecker", "webengine-native-spellchecker", "webengine-webrtc", + "webengine-webrtc-pipewire", "webengine-geolocation", "webengine-webchannel", "webengine-kerberos", |