Hello community,

here is the log from the commit of package libqt5-qtwebengine for 
openSUSE:Factory checked in at 2020-09-14 12:10:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebengine (Old)
 and      /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqt5-qtwebengine"

Mon Sep 14 12:10:15 2020 rev:60 rq:833665 version:5.15.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebengine/libqt5-qtwebengine.changes    
2020-05-29 21:17:47.887133545 +0200
+++ 
/work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.4249/libqt5-qtwebengine.changes
  2020-09-14 12:11:33.736132567 +0200
@@ -1,0 +2,19 @@
+Thu Sep 10 07:57:36 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to 5.15.1:
+  * New bugfix release
+  * For more details please see:
+    
http://code.qt.io/cgit/qt/qtwebengine.git/plain/dist/changes-5.15.1/?h=5.15.1
+- Drop patches, now upstream:
+  * icu-v67.patch
+  * 0001-fix-build-after-y2038-changes-in-glibc.patch
+- Refresh disable-gpu-when-using-nouveau-boo-1005323.diff
+- Update rtc-dont-use-h264.patch
+
+-------------------------------------------------------------------
+Thu May 28 10:28:37 UTC 2020 - Fabian Vogt <fv...@suse.com>
+
+- Add patch to not require openh264 and don't build the bundled version:
+  * rtc-dont-use-h264.patch
+
+-------------------------------------------------------------------

Old:
----
  0001-fix-build-after-y2038-changes-in-glibc.patch
  icu-v67.patch
  qtwebengine-everywhere-src-5.15.0.tar.xz

New:
----
  qtwebengine-everywhere-src-5.15.1.tar.xz
  rtc-dont-use-h264.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt5-qtwebengine.spec ++++++
--- /var/tmp/diff_new_pack.SFlfkw/_old  2020-09-14 12:11:54.280153555 +0200
+++ /var/tmp/diff_new_pack.SFlfkw/_new  2020-09-14 12:11:54.280153555 +0200
@@ -38,27 +38,25 @@
 %global _qtwebengine_dictionaries_dir 
%{_libqt5_datadir}/qtwebengine_dictionaries
 
 Name:           libqt5-qtwebengine
-Version:        5.15.0
+Version:        5.15.1
 Release:        0
 Summary:        Qt 5 WebEngine Library
 License:        LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 Group:          Development/Libraries/X11
 URL:            https://www.qt.io
 %define base_name libqt5
-%define real_version 5.15.0
-%define so_version 5.15.0
-%define tar_version qtwebengine-everywhere-src-5.15.0
+%define real_version 5.15.1
+%define so_version 5.15.1
+%define tar_version qtwebengine-everywhere-src-5.15.1
 Source:         
https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration 
for armv6
 Patch1:         armv6-ffmpeg-no-thumb.patch
 # PATCH-FIX-UPSTREAM disable-gpu-when-using-nouveau-boo-1005323.diff
 Patch2:         disable-gpu-when-using-nouveau-boo-1005323.diff
-# PATCH-FIX-UPSTREAM 0001-fix-build-after-y2038-changes-in-glibc.patch
-Patch3:         0001-fix-build-after-y2038-changes-in-glibc.patch
 Patch7:         fix1163766.patch
-# PATCH-FIX-UPSTREAM https://chromium-review.googlesource.com/c/v8/v8/+/2136489
-Patch8:         icu-v67.patch
+# PATCH-FIX-OPENSUSE
+Patch9:         rtc-dont-use-h264.patch
 # http://www.chromium.org/blink not ported to PowerPC
 ExcludeArch:    ppc ppc64 ppc64le s390 s390x
 # Try to fix i586 MemoryErrors with rpmlint
@@ -300,6 +298,9 @@
 mkdir .git
 %endif
 
+# TODO: Get the manual unbundling from chromium.spec working here as well
+rm -r src/3rdparty/chromium/third_party/openh264/src
+
 %ifnarch x86_64
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS "
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }

++++++ disable-gpu-when-using-nouveau-boo-1005323.diff ++++++
--- /var/tmp/diff_new_pack.SFlfkw/_old  2020-09-14 12:11:54.320153597 +0200
+++ /var/tmp/diff_new_pack.SFlfkw/_new  2020-09-14 12:11:54.324153600 +0200
@@ -7,19 +7,19 @@
 Work around these issues by not doing GPU-accelerated rendering in such
 cases.
 
-Index: qtwebengine-everywhere-src-5.13.0-beta1/src/core/web_engine_context.cpp
+Index: qtwebengine-everywhere-src-5.15.1/src/core/web_engine_context.cpp
 ===================================================================
---- 
qtwebengine-everywhere-src-5.13.0-beta1.orig/src/core/web_engine_context.cpp
-+++ qtwebengine-everywhere-src-5.13.0-beta1/src/core/web_engine_context.cpp
-@@ -108,6 +108,7 @@
+--- qtwebengine-everywhere-src-5.15.1.orig/src/core/web_engine_context.cpp
++++ qtwebengine-everywhere-src-5.15.1/src/core/web_engine_context.cpp
+@@ -127,6 +127,7 @@
  #include <QOffscreenSurface>
- #ifndef QT_NO_OPENGL
+ #if QT_CONFIG(opengl)
  # include <QOpenGLContext>
 +# include <QOpenGLFunctions>
  #endif
  #include <QQuickWindow>
  #include <QStringList>
-@@ -167,6 +168,39 @@ void dummyGetPluginCallback(const std::v
+@@ -186,6 +187,39 @@ void dummyGetPluginCallback(const std::v
  }
  #endif
  
@@ -59,9 +59,9 @@
  } // namespace
  
  namespace QtWebEngineCore {
-@@ -501,10 +535,31 @@ WebEngineContext::WebEngineContext()
+@@ -697,10 +731,31 @@ WebEngineContext::WebEngineContext()
      const char *glType = 0;
- #ifndef QT_NO_OPENGL
+ #if QT_CONFIG(opengl)
  
 +    bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU");
 +

++++++ qtwebengine-everywhere-src-5.15.0.tar.xz -> 
qtwebengine-everywhere-src-5.15.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtwebengine/qtwebengine-everywhere-src-5.15.0.tar.xz
 
/work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.4249/qtwebengine-everywhere-src-5.15.1.tar.xz
 differ: char 26, line 1

++++++ rtc-dont-use-h264.patch ++++++
From: Fabian Vogt <fab...@ritter-vogt.de>
Subject: Don't require open264 when proprietary_codecs are supported

Index: 
qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
===================================================================
--- 
qtwebengine-everywhere-src-5.15.1.orig/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
+++ 
qtwebengine-everywhere-src-5.15.1/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
@@ -149,8 +149,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
 
   # By default, use normal platform audio support or dummy audio, but don't
   # use file-based audio playout and record.
Index: qtwebengine-everywhere-src-5.15.1/src/core/config/common.pri
===================================================================
--- qtwebengine-everywhere-src-5.15.1.orig/src/core/config/common.pri
+++ qtwebengine-everywhere-src-5.15.1/src/core/config/common.pri
@@ -27,9 +27,6 @@ qtConfig(webengine-webrtc) {
 
 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
 }

Reply via email to