diff options
Diffstat (limited to 'dev-qt/qtdeclarative')
| -rw-r--r-- | dev-qt/qtdeclarative/Manifest | 1 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch | 59 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-5.9.5-r1000.ebuild | 58 |
3 files changed, 0 insertions, 118 deletions
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 32bdf3ce..e99dd841 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,2 +1 @@ DIST qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053 -DIST qtdeclarative-opensource-src-5.9.5.tar.xz 21413796 BLAKE2B d8b365654eda101d5fa62736d6ed523c097310cce8c9a1ed4854b694903f9084aebf408c8f4a6a021175d6ee00763928201a071a798caf46c4245a9fda45436a SHA512 0d04b9f7ee299d1bad125dd839cac850c11ee8dff06192852489c5e8c8054b5b6e256bc20866ce45e3dad3eb0e11796994d649052645c6ff6fb289485038dcd4 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 c2a143ec..00000000 --- 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 - diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.5-r1000.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.5-r1000.ebuild deleted file mode 100644 index 8186bb3b..00000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9.5-r1000.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -inherit python-any-r1 qt5-build-r10000 - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64" -fi - -IUSE="gles2 +jit localstorage +widgets xml" - -# qtgui[gles2=] is needed because of bug 504322 -COMMON_DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=] - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qttest-${PV} - localstorage? ( ~dev-qt/qtsql-${PV} ) - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtxmlpatterns-${PV} - ) -" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} -" -RDEPEND="${COMMON_DEPEND} - !<dev-qt/qtquickcontrols-5.7:5 -" - -PATCHES=( "${FILESDIR}/${P}-texture-memleak.patch" ) - -src_prepare() { - use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch") - - qt_use_disable_mod localstorage sql \ - src/imports/imports.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/qmltest/qmltest.pro \ - tests/auto/auto.pro \ - tools/tools.pro \ - tools/qmlscene/qmlscene.pro \ - tools/qml/qml.pro - - qt_use_disable_mod xml xmlpatterns \ - src/imports/imports.pro \ - tests/auto/quick/quick.pro \ - tests/auto/quick/examples/examples.pro - - qt5-build-r10000_src_prepare -} |