aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2023-10-04 13:58:18 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2023-10-20 05:44:59 +0000
commit4a78cb1c2de4abbe238c706a299bb8458687e572 (patch)
tree438014942c89a693fabe70a55b4e32e8e64d7575
parent8a047bd3bed8ee4e8a2e12ddd568e42115013f86 (diff)
Remove old patches from qtwebengine
The workaround for long rsp file is an old patch from qt5 times, which should not be needed in qt6 as used toolchains are in-source, therefore created toolchain labels and later rsp files should not embedded absolute paths, but simply use 'build/toolchain/yocto' as this is a location of yocto toochain with-in source tree. The second patch is fixed in 112-based in 29354c7c7de. Task-number: QTBUG-59769 Change-Id: I94a610c4562463f5de3f8bbb29915e05cf40e640 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit bdbb28f3624c2df9b9dd0521ac2924378ccb8916) Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--recipes-qt/qt6/qtwebengine.inc3
-rw-r--r--recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch43
-rw-r--r--recipes-qt/qt6/qtwebengine/chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch74
3 files changed, 0 insertions, 120 deletions
diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc
index caca4d9..be9130e 100644
--- a/recipes-qt/qt6/qtwebengine.inc
+++ b/recipes-qt/qt6/qtwebengine.inc
@@ -35,8 +35,5 @@ SRC_URI += " \
SRC_URI += " \
file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \
- file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
- file://chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch;patchdir=src/3rdparty \
"
-
SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium"
diff --git a/recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
deleted file mode 100644
index cb7f6f0..0000000
--- a/recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 358e7b51c205521dc9eac8a8cf676412078fe014 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Thu, 30 Mar 2017 11:37:24 +0300
-Subject: [PATCH] chromium: workaround for too long .rps file name
-
-Ninja may fail when the build directory is too long:
-
-ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
-interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
-6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
-.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
-le.rsp): Unable to create file. File name too long
-
-Task-number: QTBUG-59769
-Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
-Upstream-Status: Inappropriate [OE Specific]
----
- gn/src/gn/ninja_action_target_writer.cc | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/gn/src/gn/ninja_action_target_writer.cc b/gn/src/gn/ninja_action_target_writer.cc
-index 2ceac904a3c..8496e309cec 100644
---- a/gn/src/gn/ninja_action_target_writer.cc
-+++ b/gn/src/gn/ninja_action_target_writer.cc
-@@ -122,9 +122,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
- // strictly necessary for regular one-shot actions, but it's easier to
- // just always define unique_name.
- std::string rspfile = custom_rule_name;
-+
-+ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
-+ //please note ".$unique_name" is not used at the moment
-+ std::size_t pos = 0;
-+ std::string delimiter("_");
-+ while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
-+ rspfile = rspfile.substr(0,pos);
-+
- if (!target_->sources().empty())
- rspfile += ".$unique_name";
- rspfile += ".rsp";
-+
- out_ << " rspfile = " << rspfile << std::endl;
-
- // Response file contents.
diff --git a/recipes-qt/qt6/qtwebengine/chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch b/recipes-qt/qt6/qtwebengine/chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
deleted file mode 100644
index e1c7f56..0000000
--- a/recipes-qt/qt6/qtwebengine/chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 7894d0d905c61200eb2eb3df1eeeb780e72f3e77 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
-
-Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/effadce6c756247ea8bae32dc13bb3e6f464f0eb]
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- .../ffmpeg/libavcodec/x86/mathops.h | 26 ++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-index 6298f5ed198..ca7e2dffc10 100644
---- a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/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;
- }
-