summaryrefslogtreecommitdiff
path: root/dev-qt/qtdeclarative/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
commit1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch)
treee48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-qt/qtdeclarative/files
parentd87262dd706fec50cd150aab3e93883b6337466d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-qt/qtdeclarative/files')
-rw-r--r--dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch18
-rw-r--r--dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch59
2 files changed, 0 insertions, 77 deletions
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch
deleted file mode 100644
index 7799ef71b7e4..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
-index 4b08194..224ddb1 100644
---- a/src/qml/jsruntime/qv4global_p.h
-+++ b/src/qml/jsruntime/qv4global_p.h
-@@ -96,8 +96,13 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
- # undef V4_ENABLE_JIT
- #endif
- #endif
-
-+// Gentoo note: disable the JIT due to USE="-jit"
-+#ifdef V4_ENABLE_JIT
-+#undef V4_ENABLE_JIT
-+#endif
-+
- // Do certain things depending on whether the JIT is enabled or disabled
-
- #ifdef V4_ENABLE_JIT
- #define ENABLE_YARR_JIT 1
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch
deleted file mode 100644
index c2a143ecbeda..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 839f09c65523fb5c419b62e078f72bb39285449a Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson@kde.org>
-Date: Wed, 28 Mar 2018 00:24:56 +0100
-Subject: [PATCH] Avoid marking hidden windows as updatePending in Gui render
- loop
-
-Since eeb320bbd8763f3e72f79369cc3908e999a0da3c the GL context only
-deletes textures when all windows with pending updates have finished
-rendering.
-
-renderWindow will not process any window that is not visible. This
-leaves a logic bug that we can have the updatePending flag set but
-never cleared.
-
-If we have two windows, this leaves the other window still updating
-normally, but lastDirtyWindow will always be false and we never call
-endSync.
-
-This results in an effective memory leak of all textures.
-
-This patch resets the flag on hide() a move that can be considered safe
-given the show() method will reset this flag anyway.
-
-Change-Id: Iab0171716e27e31077a66b5e36a00bf28a2e7a8c
-Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-Reviewed-by: Aleix Pol
-Reviewed-by: Andy Nichols <andy.nichols@qt.io>
----
- src/quick/scenegraph/qsgrenderloop.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
-index 60f3538662..2eaed497ef 100644
---- a/src/quick/scenegraph/qsgrenderloop.cpp
-+++ b/src/quick/scenegraph/qsgrenderloop.cpp
-@@ -305,6 +305,8 @@ void QSGGuiThreadRenderLoop::hide(QQuickWindow *window)
- {
- QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
- cd->fireAboutToStop();
-+ if (m_windows.contains(window))
-+ m_windows[window].updatePending = false;
- }
-
- void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window)
-@@ -494,7 +496,8 @@ QImage QSGGuiThreadRenderLoop::grab(QQuickWindow *window)
-
- void QSGGuiThreadRenderLoop::maybeUpdate(QQuickWindow *window)
- {
-- if (!m_windows.contains(window))
-+ QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
-+ if (!cd->isRenderable() || !m_windows.contains(window))
- return;
-
- m_windows[window].updatePending = true;
---
-2.16.3
-