Sophie

Sophie

distrib > Mageia > 8 > i586 > media > core-updates_testing-src > by-pkgid > 2821eff5bf8d3c67c145b19a99c222ec > files > 12

qtwebengine5-5.15.8-1.1.mga8.src.rpm

From: Fabian Vogt <fabian@ritter-vogt.de>
Subject: Don't require open264 when proprietary_codecs are supported

diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/chromium/third_party/webrtc/webrtc.gni
index ca8acdbf259..36897a72aa8 100644
--- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
+++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
@@ -151,8 +151,7 @@ declare_args() {
   #
   # Enabling H264 when building with MSVC is currently not supported, see
   # bugs.webrtc.org/9213#c13 for more info.
-  rtc_use_h264 =
-      proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang)
+  rtc_use_h264 = false
 
   # Enable this flag to make webrtc::Mutex be implemented by absl::Mutex.
   rtc_use_absl_mutex = false

diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index d9d64e76..cd0fd120 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -26,9 +26,6 @@

 qtConfig(webengine-proprietary-codecs) {
     gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
-    qtConfig(webengine-webrtc) {
-        gn_args += rtc_use_h264=true
-    }
 } else {
     gn_args += proprietary_codecs=false
 }
@@ -46,3 +43,8 @@
 }

 !qtConfig(webengine-nodejs10): gn_args += use_rollup=false
+
+gn_args += "media_use_openh264=false"
+gn_args += "rtc_use_h264=false"
+gn_args += "use_system_libxml=true"
+gn_args += "use_system_libxslt=true"