summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-Remove-super-shit-QPA-hueristics.patch72
-rw-r--r--0001-Turn-bcm_host-library-into-makeSpec-source.patch80
-rw-r--r--0005-Fix-qtdeclarative-build-configured-with-qreal-float.patch35
3 files changed, 0 insertions, 187 deletions
diff --git a/0001-Remove-super-shit-QPA-hueristics.patch b/0001-Remove-super-shit-QPA-hueristics.patch
deleted file mode 100644
index d104fe62f23..00000000000
--- a/0001-Remove-super-shit-QPA-hueristics.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 77bc37d717d5072e7f8218bc3ec78fafe1117716 Mon Sep 17 00:00:00 2001
-From: Donald Carr <d@chaos-reins.com>
-Date: Mon, 16 Sep 2019 00:38:06 -0700
-Subject: [PATCH] Remove super shit QPA hueristics
-
-Change-Id: I7776958c24822b483de304f7c5d530666b3ae227
----
- src/core/content_browser_client_qt.cpp | 43 +++++++++++++++-----------
- 1 file changed, 25 insertions(+), 18 deletions(-)
-
-diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
-index 16945020..af34baf3 100644
---- a/src/core/content_browser_client_qt.cpp
-+++ b/src/core/content_browser_client_qt.cpp
-@@ -168,29 +168,36 @@ public:
- : gl::GLContext(0)
- , m_handle(0)
- {
-- QString platform = qApp->platformName().toLower();
-- QPlatformNativeInterface *pni = QGuiApplication::platformNativeInterface();
-- if (platform == QLatin1String("xcb") || platform == QLatin1String("offscreen")) {
-+ if (qEnvironmentVariableIsSet(QT_WEBENGINE_SKIP_QPA_DETECTION)) {
- if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2)
- m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
- else
- m_handle = pni->nativeResourceForContext(QByteArrayLiteral("glxcontext"), qtContext);
-- } else if (platform == QLatin1String("cocoa"))
-- m_handle = pni->nativeResourceForContext(QByteArrayLiteral("cglcontextobj"), qtContext);
-- else if (platform == QLatin1String("qnx"))
-- m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
-- else if (platform == QLatin1String("eglfs") || platform == QLatin1String("wayland")
-- || platform == QLatin1String("wayland-egl"))
-- m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
-- else if (platform == QLatin1String("windows")) {
-- if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2)
-- m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglContext"), qtContext);
-- else
-- m_handle = pni->nativeResourceForContext(QByteArrayLiteral("renderingcontext"), qtContext);
- } else {
-- qFatal("%s platform not yet supported", platform.toLatin1().constData());
-- // Add missing platforms once they work.
-- Q_UNREACHABLE();
-+ QString platform = qApp->platformName().toLower();
-+ QPlatformNativeInterface *pni = QGuiApplication::platformNativeInterface();
-+ if (platform == QLatin1String("xcb") || platform == QLatin1String("offscreen")) {
-+ if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2)
-+ m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
-+ else
-+ m_handle = pni->nativeResourceForContext(QByteArrayLiteral("glxcontext"), qtContext);
-+ } else if (platform == QLatin1String("cocoa"))
-+ m_handle = pni->nativeResourceForContext(QByteArrayLiteral("cglcontextobj"), qtContext);
-+ else if (platform == QLatin1String("qnx"))
-+ m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
-+ else if (platform == QLatin1String("eglfs") || platform == QLatin1String("wayland")
-+ || platform == QLatin1String("wayland-egl"))
-+ m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
-+ else if (platform == QLatin1String("windows")) {
-+ if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2)
-+ m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglContext"), qtContext);
-+ else
-+ m_handle = pni->nativeResourceForContext(QByteArrayLiteral("renderingcontext"), qtContext);
-+ } else {
-+ qFatal("%s platform not yet supported", platform.toLatin1().constData());
-+ // Add missing platforms once they work.
-+ Q_UNREACHABLE();
-+ }
- }
- }
-
---
-2.23.0
-
diff --git a/0001-Turn-bcm_host-library-into-makeSpec-source.patch b/0001-Turn-bcm_host-library-into-makeSpec-source.patch
deleted file mode 100644
index 7ecbc27dde9..00000000000
--- a/0001-Turn-bcm_host-library-into-makeSpec-source.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0a50f3de2be1ec6456714d4d54ba86236873b820 Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann <joerg.bornemann@qt.io>
-Date: Mon, 11 Feb 2019 15:00:09 +0100
-Subject: [PATCH] Turn bcm_host library into makeSpec source
-
-The makespec provides LIBDIR, INCDIR and LIBS for bcm_host.
-
-Change-Id: I4bc268504dc48edaf2884f1c14b745260fd9112c
-Fixes: QTBUG-73727
----
- mkspecs/devices/linux-rasp-pi-g++/qmake.conf | 4 ++++
- mkspecs/devices/linux-rasp-pi2-g++/qmake.conf | 5 +++++
- mkspecs/devices/linux-rasp-pi3-g++/qmake.conf | 4 ++++
- src/gui/configure.json | 3 ++-
- 4 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
-index b72091373d..6ec7817efb 100644
---- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
-+++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
-@@ -20,6 +20,10 @@ QMAKE_INCDIR_OPENVG = $${QMAKE_INCDIR_EGL}
- QMAKE_LIBS_EGL = -lEGL -lGLESv2
- QMAKE_LIBS_OPENVG = -lEGL -lOpenVG -lGLESv2
-
-+QMAKE_INCDIR_BCM_HOST = $$[QT_SYSROOT]/opt/vc/include
-+QMAKE_LIBDIR_BCM_HOST = $$[QT_SYSROOT]/opt/vc/lib
-+QMAKE_LIBS_BCM_HOST = -lbcm_host
-+
- contains(DISTRO, squeeze) {
- #Debian Squeeze: Legacy everything
- QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL
-diff --git a/mkspecs/devices/linux-rasp-pi2-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi2-g++/qmake.conf
-index ffe8f5739a..3b49f19a5b 100644
---- a/mkspecs/devices/linux-rasp-pi2-g++/qmake.conf
-+++ b/mkspecs/devices/linux-rasp-pi2-g++/qmake.conf
-@@ -16,6 +16,11 @@ QMAKE_INCDIR_OPENVG = $${QMAKE_INCDIR_EGL}
-
- QMAKE_LIBS_EGL = -lEGL -lGLESv2
- QMAKE_LIBS_OPENVG = -lEGL -lOpenVG -lGLESv2
-+
-+QMAKE_INCDIR_BCM_HOST = $$[QT_SYSROOT]/opt/vc/include
-+QMAKE_LIBDIR_BCM_HOST = $$[QT_SYSROOT]/opt/vc/lib
-+QMAKE_LIBS_BCM_HOST = -lbcm_host
-+
- QMAKE_CFLAGS += -march=armv7-a -marm -mthumb-interwork -mfpu=neon-vfpv4 -mtune=cortex-a7 -mabi=aapcs-linux
- QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
-
-diff --git a/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf
-index 2bb70ffb5a..c35a828745 100644
---- a/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf
-+++ b/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf
-@@ -31,6 +31,10 @@ QMAKE_LIBS_OPENGL_ES2 = $${VC_LINK_LINE} -lGLESv2
- # The official opt vc EGL references GLESv2 symbols: need to link it
- QMAKE_LIBS_EGL = $${VC_LINK_LINE} -lEGL -lGLESv2
-
-+QMAKE_LIBDIR_BCM_HOST = =$${VC_LIBRARY_PATH}
-+QMAKE_INCDIR_BCM_HOST = $$VC_INCLUDE_PATH
-+QMAKE_LIBS_BCM_HOST = -lbcm_host
-+
- QMAKE_CFLAGS = -march=armv8-a -mtune=cortex-a53 -mfpu=crypto-neon-fp-armv8
- QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
-
-diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 70d0817791..3108b691be 100644
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -59,8 +59,9 @@
- },
- "bcm_host": {
- "export": "",
-+ "headers": "bcm_host.h",
- "sources": [
-- "-lbcm_host"
-+ { "type": "makeSpec", "spec": "BCM_HOST" }
- ]
- },
- "dxguid": {
---
-2.20.1
-
diff --git a/0005-Fix-qtdeclarative-build-configured-with-qreal-float.patch b/0005-Fix-qtdeclarative-build-configured-with-qreal-float.patch
deleted file mode 100644
index 22a46290f7e..00000000000
--- a/0005-Fix-qtdeclarative-build-configured-with-qreal-float.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d9aad59d4144f5bf725893b5a008fe5c52ff5634 Mon Sep 17 00:00:00 2001
-From: Donald Carr <d@chaos-reins.com>
-Date: Thu, 28 Mar 2019 22:23:54 -0700
-Subject: [PATCH 5/7] Fix qtdeclarative build configured with -qreal=float
-
-There is a sole point of failure in Qt 5.13 beta1
-
-Change-Id: I58a41e310604a8bccbf14f463f734877d6a65a73
-Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
----
- src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp b/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp
-index 6bc99d32a..ab5cfb48b 100644
---- a/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp
-+++ b/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp
-@@ -220,10 +220,10 @@ void qDrawTiled(VGImage image, const QSize imageSize, const QRectF &targetRect,
- void qDrawBorderImage(VGImage image, const QSizeF &textureSize, const QRectF &targetRect, const QRectF &innerTargetRect, const QRectF &subSourceRect)
- {
- // Create normalized margins
-- QMarginsF margins(qMax(innerTargetRect.left() - targetRect.left(), 0.0),
-- qMax(innerTargetRect.top() - targetRect.top(), 0.0),
-- qMax(targetRect.right() - innerTargetRect.right(), 0.0),
-- qMax(targetRect.bottom() - innerTargetRect.bottom(), 0.0));
-+ QMarginsF margins(qMax(innerTargetRect.left() - targetRect.left(), qreal(0.0)),
-+ qMax(innerTargetRect.top() - targetRect.top(), qreal(0.0)),
-+ qMax(targetRect.right() - innerTargetRect.right(), qreal(0.0)),
-+ qMax(targetRect.bottom() - innerTargetRect.bottom(), qreal(0.0)));
-
- QRectF sourceRect(0, 0, textureSize.width(), textureSize.height());
-
---
-2.21.0
-