From e237be2025e6eb302f4267576a245b7c65576ebc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Apr 2018 18:13:36 +0100 Subject: dev-qt : bump to 5.9.5 --- dev-qt/qtdeclarative/Manifest | 2 +- .../qtdeclarative-5.9.5-texture-memleak.patch | 59 ++++++++++++++++++++++ .../qtdeclarative/qtdeclarative-5.9.3-r1000.ebuild | 56 -------------------- .../qtdeclarative/qtdeclarative-5.9.5-r1000.ebuild | 58 +++++++++++++++++++++ 4 files changed, 118 insertions(+), 57 deletions(-) create mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.9.3-r1000.ebuild create mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.9.5-r1000.ebuild (limited to 'dev-qt/qtdeclarative') diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index ece3b29a..bec84aca 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1 +1 @@ -DIST qtdeclarative-opensource-src-5.9.3.tar.xz 21443328 BLAKE2B acf201966b55f748e516d0f32c2fae0c3990d00ff5b2f31d72d012840ecff4328ba693eb96a800fa6eaefad285a72edfbaae93343e4d664792c561e78ba56882 SHA512 933caf5848437cde45b4bbf0c70b6cafbc690657c651508b28138b2f90d2f823f4842bc709f4726e2c88d3913a92240b0dcd9248d83af0d06d7127b9a8211b24 +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 new file mode 100644 index 00000000..c2a143ec --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch @@ -0,0 +1,59 @@ +From 839f09c65523fb5c419b62e078f72bb39285449a Mon Sep 17 00:00:00 2001 +From: David Edmundson +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 +Reviewed-by: Qt CI Bot +Reviewed-by: Dominik Holland +Reviewed-by: Aleix Pol +Reviewed-by: Andy Nichols +--- + 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.3-r1000.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.3-r1000.ebuild deleted file mode 100644 index 937e98cc..00000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9.3-r1000.ebuild +++ /dev/null @@ -1,56 +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} - !