up to 5.15.17

diff --git a/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch b/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
deleted file mode 100644 (file)
index 5dcc8fb..0000000
--- a/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Sun, 16 Jul 2023 18:18:02 +0300
-Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift
- instructions within inline assembly
-
-Fixes assembling with binutil as >= 2.41
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-index 6298f5ed19..ca7e2dffc1 100644
---- a/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
-     int rt, dummy;
-+    if (__builtin_constant_p(shift))
-     __asm__ (
-         "imull %3               \n\t"
-         "shrdl %4, %%edx, %%eax \n\t"
-         :"=a"(rt), "=d"(dummy)
--        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+        :"a"(a), "rm"(b), "i"(shift & 0x1F)
-     );
-+    else
-+        __asm__ (
-+            "imull %3               \n\t"
-+            "shrdl %4, %%edx, %%eax \n\t"
-+            :"=a"(rt), "=d"(dummy)
-+            :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+        );
-     return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("sarl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("sarl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+    if (__builtin_constant_p(s))
-     __asm__ ("shrl %1, %0\n\t"
-          : "+r" (a)
--         : "ic" ((uint8_t)(-s))
-+         : "i" (-s & 0x1F)
-     );
-+    else
-+        __asm__ ("shrl %1, %0\n\t"
-+               : "+r" (a)
-+               : "c" ((uint8_t)(-s))
-+        );
-     return a;
- }
-
---
-2.41.0

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 912943236bfaaeeedc468f1b6fbecc90ae6bbf07..4e540e195ab7f15bd281d4595526a7dad45d5786 100644 (file)
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -16,20 +16,20 @@
 Summary:       The Qt5 WebEngine library
 Summary(pl.UTF-8):     Biblioteka Qt5 WebEngine
 Name:          qt5-%{orgname}
-Version:       %{base_version}.15
-Release:       5
+Version:       %{base_version}.17
+Release:       1
 License:       LGPL v3 or GPL v2 or GPL v3 or commercial
 Group:         X11/Libraries
 Source0:       qtwebengine-%{version}.tar.xz
-# Source0-md5: fa635b1707607b3eafdc7e099b8cc22c
+# Source0-md5: 7c3144b76008377d8f7d74369bd9bc4f
 Patch0:                x32.patch
 Patch1:                %{name}-gn-dynamic.patch
-Patch2:                0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
 Patch3:                qt5-webengine-ffmpeg5.patch
 Patch4:                qt5-webengine-pipewire-0.3.patch
 Patch5:                chromium-107-proprietary-codecs.patch
 Patch6:                chromium-112-ffmpeg-first_dts.patch
 Patch7:                ninja-1.12.patch
+Patch8:                system-ffmpeg-check.patch
 URL:           https://www.qt.io/
 BuildRequires: Qt5Core-devel >= %{qtbase_ver}
 BuildRequires: Qt5Designer-devel >= %{qttools_ver}
@@ -289,12 +289,12 @@ Przykłady do biblioteki Qt5 WebEngine.
 %patch0 -p1
 %endif
 %patch1 -p1
-%patch2 -p1
 %patch4 -p1 -d src/3rdparty
 %patch5 -p1 -d src/3rdparty/chromium
 %if %{_ver_ge %ffmpeg_ver 5}
 %patch3 -p1 -d src/3rdparty
 %patch6 -p1 -d src/3rdparty/chromium
+%patch8 -p1 -R
 %endif
 %patch7 -p1 -d src/3rdparty
 

diff --git a/system-ffmpeg-check.patch b/system-ffmpeg-check.patch
new file mode 100644 (file)
index 0000000..159395e
--- /dev/null
+++ b/system-ffmpeg-check.patch
@@ -0,0 +1,69 @@
+From 855806fefdd52b29e8b15b6a02e263afc21028c8 Mon Sep 17 00:00:00 2001
+From: Martin Negyokru <negyokru@inf.u-szeged.hu>
+Date: Wed, 8 Feb 2023 11:10:59 +0100
+Subject: Add check for system ffmpeg compatibility
+
+Chromium uses the 'first_dts' field from AVStream that has
+been moved out from public api in ffmpeg 5.0.
+Although some packagers patch their ffmpeg to be compatible
+with chromium.
+Add compile time check to test compatibility.
+
+Task-number: QTBUG-116553
+Change-Id: I7658b9b12cb5122b6485f063edc3280f31fe9273
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+(cherry picked from commit 7e46ff40ab66cd480b3eb9d82594f402dd8b563e)
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ src/buildtools/configure.json | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+(limited to 'src/buildtools/configure.json')
+
+diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
+index 88d1790c1..9e7a0c570 100644
+--- a/src/buildtools/configure.json
++++ b/src/buildtools/configure.json
+@@ -212,6 +212,27 @@
+                 { "type": "pkgConfig", "args": "libavcodec libavformat libavutil" }
+             ]
+         },
++        "webengine-ffmpeg-support": {
++            "label": "compatible ffmpeg",
++            "type": "compile",
++            "test": {
++                "head": [
++                    "#include <libavformat/version.h>",
++                    "extern \"C\" {",
++                    "#include <libavformat/avformat.h>",
++                    "}"
++                ],
++                "main": [
++                    "#if LIBAVFORMAT_VERSION_MAJOR >= 59",
++                        "AVStream stream;",
++                        "auto first_dts = av_stream_get_first_dts(&stream);",
++                    "#endif"
++                ]
++            },
++            "sources": [
++                { "type": "pkgConfig", "args": "libavformat" }
++            ]
++        },
+         "webengine-opus": {
+             "label": "opus",
+             "sources": [
+@@ -758,6 +779,11 @@
+             "type": "warning",
+             "condition": "config.ios && config.simulator && config.device && features.build-qtpdf",
+             "message": "Building fat libray with device and simulator architectures will disable NEON."
++        },
++        {
++            "type": "fatal",
++            "condition": "features.webengine-system-ffmpeg && !libs.webengine-ffmpeg-support",
++            "message": "Unmodified ffmpeg >= 5.0 is not supported. Please configure with -qt-webengine-ffmpeg."
+         }
+     ],
+     "summary": [
+-- 
+cgit v1.2.3
+