diff --git a/buildroot-patches/2021.02.10/0001-package-qt5base-fix-build-with-gcc-11.patch b/buildroot-patches/2021.02.10/0001-package-qt5base-fix-build-with-gcc-11.patch deleted file mode 100644 index c66357e..0000000 --- a/buildroot-patches/2021.02.10/0001-package-qt5base-fix-build-with-gcc-11.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 7bd57831e991ea1239687b83cc94b306f21b9031 Mon Sep 17 00:00:00 2001 -From: Maxim Kochetkov -Date: Tue, 6 Jul 2021 07:29:02 +0300 -Subject: [PATCH] package/qt5/qt5base: fix build with gcc 11 - -Fix the following build failure with gcc 11: - -text/qbytearraymatcher.h:103:38: error: 'numeric_limits' is not a member of 'std' - 103 | const auto uchar_max = (std::numeric_limits::max)(); - | ^~~~~~~~~~~~~~ - -Signed-off-by: Maxim Kochetkov -Tested-by: Peter Seiderer -Signed-off-by: Thomas Petazzoni ---- - .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 +++++++++++++++++++ - 1 file changed, 61 insertions(+) - create mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch - -diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch -new file mode 100644 -index 00000000000..d20600c6ce7 ---- /dev/null -+++ b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch -@@ -0,0 +1,61 @@ -+From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001 -+From: Ville Voutilainen -+Date: Mon, 18 Jan 2021 09:58:17 +0200 -+Subject: [PATCH] Build fixes for GCC 11 -+ -+Task-number: QTBUG-89977 -+Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21 -+Reviewed-by: Lars Knoll -+Reviewed-by: Thiago Macieira -+[Retrieved (and backported) from: -+https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9] -+Signed-off-by: Maxim Kochetkov -+--- -+ src/corelib/text/qbytearraymatcher.h | 2 ++ -+ src/corelib/tools/qsharedpointer_impl.h | 3 --- -+ src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +- -+ 3 files changed, 3 insertions(+), 4 deletions(-) -+ -+diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h -+index 0eedfc1d20..f5f9bef7b8 100644 -+--- a/src/corelib/text/qbytearraymatcher.h -++++ b/src/corelib/text/qbytearraymatcher.h -+@@ -42,6 +42,8 @@ -+ -+ #include -+ -++#include -++ -+ QT_BEGIN_NAMESPACE -+ -+ -+diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h -+index 790c187cb9..4aee98af53 100644 -+--- a/src/corelib/tools/qsharedpointer_impl.h -++++ b/src/corelib/tools/qsharedpointer_impl.h -+@@ -155,9 +155,6 @@ namespace QtSharedPointer { -+ #endif -+ inline void checkQObjectShared(...) { } -+ inline void setQObjectShared(...) { } -+- -+- inline void operator delete(void *ptr) { ::operator delete(ptr); } -+- inline void operator delete(void *, void *) { } -+ }; -+ // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) -+ -+diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -+index 9e7e1a5572..f0866a90ac 100644 -+--- a/src/plugins/platforms/xcb/qxcbwindow.cpp -++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -+@@ -698,7 +698,7 @@ void QXcbWindow::show() -+ if (isTransient(window())) { -+ const QWindow *tp = window()->transientParent(); -+ if (tp && tp->handle()) -+- transientXcbParent = static_cast(tp->handle())->winId(); -++ transientXcbParent = tp->handle()->winId(); -+ // Default to client leader if there is no transient parent, else modal dialogs can -+ // be hidden by their parents. -+ if (!transientXcbParent) -+-- -+2.31.1 -+ diff --git a/buildroot-patches/2021.02.10/0002-package-qt5base-fix-another-gcc-11-compile-failure.patch b/buildroot-patches/2021.02.10/0002-package-qt5base-fix-another-gcc-11-compile-failure.patch deleted file mode 100644 index 3564304..0000000 --- a/buildroot-patches/2021.02.10/0002-package-qt5base-fix-another-gcc-11-compile-failure.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 6202ba67b74e9de7099df8b98e3db8d33490996a Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 18 Jul 2021 00:08:09 +0200 -Subject: [PATCH] package/qt5base: fix another gcc-11 compile failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- add upstream patch fixing gcc-11 compile failure (missing - limits include) - -Fixes: - - In file included from ../../../include/QtCore/5.15.2/QtCore/private/qoffsetstringarray_p.h:1, - from ../../dbus/qdbuserror.cpp:44: - ../../../src/corelib/tools/qoffsetstringarray_p.h:70:22: error: ‘numeric_limits’ is not a member of ‘std’ - 70 | Last <= std::numeric_limits::max(), - | ^~~~~~~~~~~~~~ - ../../../src/corelib/tools/qoffsetstringarray_p.h:70:43: error: wrong number of template arguments (1, should be 3) - 70 | Last <= std::numeric_limits::max(), - | ^ - -Signed-off-by: Peter Seiderer -Signed-off-by: Yann E. MORIN ---- - .../0008-Add-missing-limits-include.patch | 32 +++++++++++++++++++ - 1 file changed, 32 insertions(+) - create mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch - -diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch -new file mode 100644 -index 00000000000..e489f2e551b ---- /dev/null -+++ b/package/qt5/qt5base/0008-Add-missing-limits-include.patch -@@ -0,0 +1,32 @@ -+From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001 -+From: Nicolas Fella -+Date: Sun, 20 Jun 2021 17:36:41 +0200 -+Subject: [PATCH] Add missing limits include -+ -+The code uses std::numeric_limits but is lacking the appropriate include -+ -+Pick-to: 5.15 6.1 6.2 -+Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd -+Reviewed-by: Giuseppe D'Angelo -+ -+[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b] -+Signed-off-by: Peter Seiderer -+--- -+ src/corelib/tools/qoffsetstringarray_p.h | 1 + -+ 1 file changed, 1 insertion(+) -+ -+diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h -+index 4dd9e960..e26a57ff 100644 -+--- a/src/corelib/tools/qoffsetstringarray_p.h -++++ b/src/corelib/tools/qoffsetstringarray_p.h -+@@ -55,6 +55,7 @@ -+ -+ #include -+ #include -++#include -+ -+ QT_BEGIN_NAMESPACE -+ -+-- -+2.32.0 -+ diff --git a/buildroot-patches/2021.02.10/0003-package-qt5declarative-fix-gcc-11-compile-failure.patch b/buildroot-patches/2021.02.10/0003-package-qt5declarative-fix-gcc-11-compile-failure.patch deleted file mode 100644 index 393d3c6..0000000 --- a/buildroot-patches/2021.02.10/0003-package-qt5declarative-fix-gcc-11-compile-failure.patch +++ /dev/null @@ -1,147 +0,0 @@ -From fe68d894715e0cfd214444efb586f434802ae2c2 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Jul 2021 23:24:34 +0200 -Subject: [PATCH] package/qt5declarative: fix gcc-11 compile failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- add patch for qv4regexp_p to include c++ limits include (instead of plain - c limit.h) - -Fixes: - - In file included from jsruntime/qv4regexp_p.h:62, - from jsruntime/qv4regexp.cpp:40: - ../3rdparty/masm/yarr/Yarr.h:46:44: error: ‘numeric_limits’ is not a member of ‘std’ - 46 | static const unsigned offsetNoMatch = std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - ../3rdparty/masm/yarr/Yarr.h:46:59: error: expected primary-expression before ‘unsigned’ - 46 | static const unsigned offsetNoMatch = std::numeric_limits::max(); - | ^~~~~~~~ - -- add patch for qqmlprofilerevent_p to include c++ limits include - -Fixes: - - In file included from qqmlprofilertypedevent_p.h:43, - from qqmlprofilertypedevent.cpp:40: - qqmlprofilerevent_p.h: In member function ‘void QQmlProfilerEvent::assignNumbers(const Container&)’: - qqmlprofilerevent_p.h:314:65: error: ‘numeric_limits’ is not a member of ‘std’ - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~~~~~~~~~~~~ - qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ‘>’ token - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^ - qqmlprofilerevent_p.h:314:90: error: ‘::max’ has not been declared; did you mean ‘std::max’? - 314 | static_cast(numbers.size()) : std::numeric_limits::max(); - | ^~~ - | std::max - -Signed-off-by: Peter Seiderer -Signed-off-by: Thomas Petazzoni ---- - ...s-c-limits-include-instead-of-plain-.patch | 41 +++++++++++++++++ - ...t_p-needs-c-limits-inlcude-fixes-gcc.patch | 45 +++++++++++++++++++ - 2 files changed, 86 insertions(+) - create mode 100644 package/qt5/qt5declarative/0002-qv4regexp_p-needs-c-limits-include-instead-of-plain-.patch - create mode 100644 package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch - -diff --git a/package/qt5/qt5declarative/0002-qv4regexp_p-needs-c-limits-include-instead-of-plain-.patch b/package/qt5/qt5declarative/0002-qv4regexp_p-needs-c-limits-include-instead-of-plain-.patch -new file mode 100644 -index 00000000000..d3344c646b1 ---- /dev/null -+++ b/package/qt5/qt5declarative/0002-qv4regexp_p-needs-c-limits-include-instead-of-plain-.patch -@@ -0,0 +1,41 @@ -+From bfd3d907f48aba870be00cd251f0b63d34985be2 Mon Sep 17 00:00:00 2001 -+From: Peter Seiderer -+Date: Thu, 22 Jul 2021 23:02:29 +0200 -+Subject: [PATCH] qv4regexp_p: needs c++ limits include (instead of plain c -+ limit.h) -+MIME-Version: 1.0 -+Content-Type: text/plain; charset=UTF-8 -+Content-Transfer-Encoding: 8bit -+ -+Fixes gcc-11 compile: -+ -+ In file included from jsruntime/qv4regexp_p.h:62, -+ from jsruntime/qv4regexp.cpp:40: -+ ../3rdparty/masm/yarr/Yarr.h:46:44: error: ‘numeric_limits’ is not a member of ‘std’ -+ 46 | static const unsigned offsetNoMatch = std::numeric_limits::max(); -+ | ^~~~~~~~~~~~~~ -+ ../3rdparty/masm/yarr/Yarr.h:46:59: error: expected primary-expression before ‘unsigned’ -+ 46 | static const unsigned offsetNoMatch = std::numeric_limits::max(); -+ | ^~~~~~~~ -+ -+Signed-off-by: Peter Seiderer -+--- -+ src/qml/jsruntime/qv4regexp_p.h | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/src/qml/jsruntime/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h -+index 6afb10ea95..c64f3d3c38 100644 -+--- a/src/qml/jsruntime/qv4regexp_p.h -++++ b/src/qml/jsruntime/qv4regexp_p.h -+@@ -57,7 +57,7 @@ -+ #include -+ #include -+ -+-#include -++#include -+ -+ #include -+ #include -+-- -+2.32.0 -+ -diff --git a/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch -new file mode 100644 -index 00000000000..0e6da652f95 ---- /dev/null -+++ b/package/qt5/qt5declarative/0003-qqmlprofilerevent_p-needs-c-limits-inlcude-fixes-gcc.patch -@@ -0,0 +1,45 @@ -+From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001 -+From: Peter Seiderer -+Date: Thu, 22 Jul 2021 23:13:43 +0200 -+Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11 -+ compile) -+MIME-Version: 1.0 -+Content-Type: text/plain; charset=UTF-8 -+Content-Transfer-Encoding: 8bit -+ -+Fixes: -+ -+ In file included from qqmlprofilertypedevent_p.h:43, -+ from qqmlprofilertypedevent.cpp:40: -+ qqmlprofilerevent_p.h: In member function ‘void QQmlProfilerEvent::assignNumbers(const Container&)’: -+ qqmlprofilerevent_p.h:314:65: error: ‘numeric_limits’ is not a member of ‘std’ -+ 314 | static_cast(numbers.size()) : std::numeric_limits::max(); -+ | ^~~~~~~~~~~~~~ -+ qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ‘>’ token -+ 314 | static_cast(numbers.size()) : std::numeric_limits::max(); -+ | ^ -+ qqmlprofilerevent_p.h:314:90: error: ‘::max’ has not been declared; did you mean ‘std::max’? -+ 314 | static_cast(numbers.size()) : std::numeric_limits::max(); -+ | ^~~ -+ | std::max -+ -+Signed-off-by: Peter Seiderer -+--- -+ src/qmldebug/qqmlprofilerevent_p.h | 1 + -+ 1 file changed, 1 insertion(+) -+ -+diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h -+index a7e37d1964..01b2f58f16 100644 -+--- a/src/qmldebug/qqmlprofilerevent_p.h -++++ b/src/qmldebug/qqmlprofilerevent_p.h -+@@ -48,6 +48,7 @@ -+ #include -+ -+ #include -++#include -+ #include -+ -+ // -+-- -+2.32.0 -+ diff --git a/buildroot-patches/2021.02.10/0004-package-portaudio-bump-to-version-v190700_20210406.patch b/buildroot-patches/2021.02.10/0004-package-portaudio-bump-to-version-v190700_20210406.patch deleted file mode 100644 index 1ed28ca..0000000 --- a/buildroot-patches/2021.02.10/0004-package-portaudio-bump-to-version-v190700_20210406.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9ab8b9cd7ed666b3f4d224e3a1cb58868fc11bbb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 28 Jun 2021 06:22:25 +0000 -Subject: [PATCH] package/portaudio: bump to version v190700_20210406 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Note, that the download URL has changed for the new release. - -Signed-off-by: Jörg Krause -[yann.morin.1998@free.fr: move 'v' out of _VERSION] -Signed-off-by: Yann E. MORIN ---- - package/portaudio/portaudio.hash | 2 +- - package/portaudio/portaudio.mk | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/package/portaudio/portaudio.hash b/package/portaudio/portaudio.hash -index 903d760ce0a..ba3c506f18d 100644 ---- a/package/portaudio/portaudio.hash -+++ b/package/portaudio/portaudio.hash -@@ -1,3 +1,3 @@ - # Locally calculated --sha256 f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 pa_stable_v190600_20161030.tgz -+sha256 47efbf42c77c19a05d22e627d42873e991ec0c1357219c0d74ce6a2948cb2def pa_stable_v190700_20210406.tgz - sha256 ec52a1952d701f94e5135719a47376da4ee0b4a0201f1cafb49f61db6480ac3d LICENSE.txt -diff --git a/package/portaudio/portaudio.mk b/package/portaudio/portaudio.mk -index 0cf754c7d59..58798dda874 100644 ---- a/package/portaudio/portaudio.mk -+++ b/package/portaudio/portaudio.mk -@@ -4,9 +4,9 @@ - # - ################################################################################ - --PORTAUDIO_VERSION = v190600_20161030 --PORTAUDIO_SITE = http://www.portaudio.com/archives --PORTAUDIO_SOURCE = pa_stable_$(PORTAUDIO_VERSION).tgz -+PORTAUDIO_VERSION = 190700_20210406 -+PORTAUDIO_SITE = http://files.portaudio.com/archives -+PORTAUDIO_SOURCE = pa_stable_v$(PORTAUDIO_VERSION).tgz - PORTAUDIO_INSTALL_STAGING = YES - PORTAUDIO_MAKE = $(MAKE1) - PORTAUDIO_LICENSE = portaudio license (MIT-like plus special clause) diff --git a/buildroot-patches/2021.02.10/0005-package-qt5-qt5base-Allow-configuration-of-screen-ro.patch b/buildroot-patches/2021.02.10/0005-package-qt5-qt5base-Allow-configuration-of-screen-ro.patch deleted file mode 100644 index 5632887..0000000 --- a/buildroot-patches/2021.02.10/0005-package-qt5-qt5base-Allow-configuration-of-screen-ro.patch +++ /dev/null @@ -1,135 +0,0 @@ -From f0e27ab344952596c11abf84e54e0925243039ad Mon Sep 17 00:00:00 2001 -From: Carl Kittelberger -Date: Sat, 11 Jun 2022 15:13:09 +0200 -Subject: [PATCH] package/qt5/qt5base: Allow configuration of screen rotation - in linuxfb. - ---- - ...ration-of-screen-rotation-in-linuxfb.patch | 115 ++++++++++++++++++ - 1 file changed, 115 insertions(+) - create mode 100644 package/qt5/qt5base/A000-Allow-configuration-of-screen-rotation-in-linuxfb.patch - -diff --git a/package/qt5/qt5base/A000-Allow-configuration-of-screen-rotation-in-linuxfb.patch b/package/qt5/qt5base/A000-Allow-configuration-of-screen-rotation-in-linuxfb.patch -new file mode 100644 -index 0000000000..058d0e45d3 ---- /dev/null -+++ b/package/qt5/qt5base/A000-Allow-configuration-of-screen-rotation-in-linuxfb.patch -@@ -0,0 +1,115 @@ -+From ca5418769e21e36a2ad5437f663f5de155eef033 Mon Sep 17 00:00:00 2001 -+From: Carl Kittelberger -+Date: Sat, 11 Jun 2022 15:09:19 +0200 -+Subject: [PATCH] Allow configuration of screen rotation in linuxfb. -+ -+--- -+ .../platforms/linuxfb/qlinuxfbscreen.cpp | 37 +++++++++++++++++-- -+ .../platforms/linuxfb/qlinuxfbscreen.h | 1 + -+ 2 files changed, 34 insertions(+), 4 deletions(-) -+ -+diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp -+index cb8962d4b8..7f293d6b1c 100644 -+--- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp -++++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp -+@@ -287,7 +287,7 @@ static void blankScreen(int fd, bool on) -+ } -+ -+ QLinuxFbScreen::QLinuxFbScreen(const QStringList &args) -+- : mArgs(args), mFbFd(-1), mTtyFd(-1), mBlitter(0) -++ : mArgs(args), mFbFd(-1), mTtyFd(-1), mBlitter(0), mRotation(90) -+ { -+ mMmap.data = 0; -+ } -+@@ -313,6 +313,7 @@ bool QLinuxFbScreen::initialize() -+ QRegularExpression mmSizeRx(QLatin1String("mmsize=(\\d+)x(\\d+)")); -+ QRegularExpression sizeRx(QLatin1String("size=(\\d+)x(\\d+)")); -+ QRegularExpression offsetRx(QLatin1String("offset=(\\d+)x(\\d+)")); -++ QRegularExpression rotationRx(QLatin1String("rotation=(0|90|180|270)")); -+ -+ QString fbDevice, ttyDevice; -+ QSize userMmSize; -+@@ -334,6 +335,8 @@ bool QLinuxFbScreen::initialize() -+ ttyDevice = match.captured(1); -+ else if (arg.contains(fbRx, &match)) -+ fbDevice = match.captured(1); -++ else if (arg.contains(rotationRx, &match)) -++ mRotation = match.captured(1).toInt(); -+ } -+ -+ if (fbDevice.isEmpty()) { -+@@ -372,9 +375,17 @@ bool QLinuxFbScreen::initialize() -+ mDepth = determineDepth(vinfo); -+ mBytesPerLine = finfo.line_length; -+ QRect geometry = determineGeometry(vinfo, userGeometry); -++ QRect originalGeometry = geometry; -++ if( mRotation == 90 || mRotation == 270 ) -++ { -++ int tmp = geometry.width(); -++ geometry.setWidth(geometry.height()); -++ geometry.setHeight(tmp); -++ } -++ -+ mGeometry = QRect(QPoint(0, 0), geometry.size()); -+ mFormat = determineFormat(vinfo, mDepth); -+- mPhysicalSize = determinePhysicalSize(vinfo, userMmSize, geometry.size()); -++ mPhysicalSize = determinePhysicalSize(vinfo, userMmSize, originalGeometry.size()); -+ -+ // mmap the framebuffer -+ mMmap.size = finfo.smem_len; -+@@ -384,11 +395,11 @@ bool QLinuxFbScreen::initialize() -+ return false; -+ } -+ -+- mMmap.offset = geometry.y() * mBytesPerLine + geometry.x() * mDepth / 8; -++ mMmap.offset = originalGeometry.y() * mBytesPerLine + originalGeometry.x() * mDepth / 8; -+ mMmap.data = data + mMmap.offset; -+ -+ QFbScreen::initializeCompositor(); -+- mFbScreenImage = QImage(mMmap.data, geometry.width(), geometry.height(), mBytesPerLine, mFormat); -++ mFbScreenImage = QImage(mMmap.data, originalGeometry.width(), originalGeometry.height(), mBytesPerLine, mFormat); -+ -+ mCursor = new QFbCursor(this); -+ -+@@ -414,8 +425,26 @@ QRegion QLinuxFbScreen::doRedraw() -+ -+ mBlitter->setCompositionMode(QPainter::CompositionMode_Source); -+ for (const QRect &rect : touched) -++ { -++ if (mRotation == 90 || mRotation == 270) -++ { -++ mBlitter->translate(mGeometry.height() / 2, mGeometry.width() / 2); -++ } -++ else if (mRotation == 180) -++ { -++ mBlitter->translate(mGeometry.width() / 2, mGeometry.height() / 2); -++ } -++ if (mRotation != 0) -++ { -++ mBlitter->rotate(mRotation); -++ mBlitter->translate(-mGeometry.width() / 2, -mGeometry.height() / 2); -++ } -++ -+ mBlitter->drawImage(rect, mScreenImage, rect); -+ -++ mBlitter->resetTransform(); -++ } -++ -+ return touched; -+ } -+ -+diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.h b/src/plugins/platforms/linuxfb/qlinuxfbscreen.h -+index c7ce455e6a..385d29c365 100644 -+--- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.h -++++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.h -+@@ -64,6 +64,7 @@ private: -+ QStringList mArgs; -+ int mFbFd; -+ int mTtyFd; -++ int mRotation; -+ -+ QImage mFbScreenImage; -+ int mBytesPerLine; -+-- -+2.36.1 -+ --- -2.36.1 - diff --git a/clone-buildroot.sh b/clone-buildroot.sh index eb73126..f662819 100755 --- a/clone-buildroot.sh +++ b/clone-buildroot.sh @@ -21,12 +21,4 @@ git init "buildroot/${VERSION_ID}" git remote add origin https://git.buildroot.net/buildroot || true git fetch origin "refs/tags/${VERSION_ID}:refs/tags/${VERSION_ID}" git checkout "${VERSION_ID}" - patches_dir=../../buildroot-patches/"${VERSION_ID}" - if [ -d "${patches_dir}" ]; then - git am \ - --committer-date-is-author-date \ - --ignore-space-change \ - --no-gpg-sign \ - "${patches_dir}"/*.patch - fi )