diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 6f725b1..b730d0a 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Tue May 22 15:18:09 CEST 2018 - fabian@ritter-vogt.de + +- Update to 5.11.0 + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.11.0/?h=v5.11.0 + +------------------------------------------------------------------- +Tue May 8 10:59:23 CEST 2018 - fabian@ritter-vogt.de + +- Update to 5.11.0-rc + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Mon Apr 23 08:55:19 CEST 2018 - fabian@ritter-vogt.de + +- Update to 5.11.0-beta4 + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Wed Apr 11 09:13:40 CEST 2018 - fabian@ritter-vogt.de + +- Update to 5.11.0-beta3 + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Wed Mar 28 09:17:11 CEST 2018 - fabian@ritter-vogt.de + +- Update to 5.11.0-beta2 + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Tue Mar 13 13:40:39 UTC 2018 - christophe@krop.fr + +- Fix the license tag. + +------------------------------------------------------------------- +Thu Mar 1 09:54:49 CET 2018 - fabian@ritter-vogt.de + +- Update to 5.11.0-beta1 + * New feature release + * For more details please see: + * http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.11.0-beta1/?h=v5.11.0-beta1 + +------------------------------------------------------------------- +Tue Feb 20 14:28:03 CET 2018 - fabian@ritter-vogt.de + +- Update to 5.11.0-alpha + * New feature release + * For more details please see: + * https://wiki.qt.io/New_Features_in_Qt_5.11 +- Remove patches, now upstream + * revert-delay-deletion-of-qsgtextures.patch + +------------------------------------------------------------------- +Wed Feb 14 15:44:26 CET 2018 - fabian@ritter-vogt.de + +- Update to 5.10.1 + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.10.1/?h=v5.10.1 + ------------------------------------------------------------------- Fri Jan 26 12:45:00 UTC 2018 - alarrosa@suse.com diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index e0baadb..18544b8 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -21,22 +21,20 @@ %define libname libQtQuick5 Name: libqt5-qtdeclarative -Version: 5.10.0 +Version: 5.11.0 Release: 0 Summary: Qt 5 Declarative Library -License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-with-Qt-Company-Qt-exception-1.1 +License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.10.0 -%define so_version 5.10.0 -%define tar_version qtdeclarative-everywhere-src-5.10.0 -Source: https://download.qt.io/official_releases/qt/5.10/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.11.0 +%define so_version 5.11.0 +%define tar_version qtdeclarative-everywhere-src-5.11.0 +Source: https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case Patch100: sse2_nojit.patch -# PATCH-FIX-OPENSUSE -Patch101: revert-delay-deletion-of-qsgtextures.patch # PATCH-FIX-OPENSUSE Switch to use python3 at build time Patch102: qtdeclarative-switch-to-python3.patch BuildRequires: fdupes @@ -78,7 +76,6 @@ handling. %ifarch %ix86 %patch100 -p1 %endif -%patch101 -p1 %patch102 -p1 %package -n %libname @@ -253,6 +250,7 @@ popd %{_libqt5_libdir}/pkgconfig/Qt5Q*.pc %{_libqt5_archdatadir}/mkspecs/modules/*.pri %{_libqt5_archdatadir}/mkspecs/features/qmlcache.prf +%{_libqt5_archdatadir}/mkspecs/features/qtquickcompiler.prf %{_libqt5_archdatadir}/qml/QtTest %files examples diff --git a/qtdeclarative-everywhere-src-5.10.0.tar.xz b/qtdeclarative-everywhere-src-5.10.0.tar.xz deleted file mode 100644 index 400e499..0000000 --- a/qtdeclarative-everywhere-src-5.10.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ccb4dbca5046554037bcffbb05918f6efcff321c44cd1c39b1c47be7e67711e -size 21875096 diff --git a/qtdeclarative-everywhere-src-5.11.0.tar.xz b/qtdeclarative-everywhere-src-5.11.0.tar.xz new file mode 100644 index 0000000..f0bb888 --- /dev/null +++ b/qtdeclarative-everywhere-src-5.11.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eea9378b17b1c16d3b5235629b9128349bf98cba7d9c61122653d976b25f57c0 +size 22154136 diff --git a/revert-delay-deletion-of-qsgtextures.patch b/revert-delay-deletion-of-qsgtextures.patch deleted file mode 100644 index 9ed2169..0000000 --- a/revert-delay-deletion-of-qsgtextures.patch +++ /dev/null @@ -1,221 +0,0 @@ -From eeb320bbd8763f3e72f79369cc3908e999a0da3c Mon Sep 17 00:00:00 2001 -From: Dominik Holland -Date: Thu, 2 Mar 2017 15:25:07 +0100 -Subject: [PATCH] Delay the deletion of QSGTextures until all windows are - synchronized - -With the 'basic' and the 'windows' render loop the scene graph -context is shared. Because of this we cannot start deleting textures -after the first window is synchronized as it may contain textures -needed by the another window, which is not yet synchronized. - -QWindowPrivate::syncSceneGraph() is not calling endSync() anymore -as it doesn't know whether it is the last window or not. Instead -the renderloop is now responsible for calling endSync() once this -is safe to do. - -Change-Id: Icb50ebfb447c928e38b41df7e26f3bfafdb4a811 -Reviewed-by: Robert Griebl -Reviewed-by: Gunnar Sletta ---- - src/plugins/scenegraph/d3d12/qsgd3d12renderloop.cpp | 1 + - src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop.cpp | 2 ++ - src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp | 1 + - src/quick/items/qquickrendercontrol.cpp | 3 +++ - src/quick/items/qquickwindow.cpp | 2 -- - .../adaptations/software/qsgsoftwarerenderloop.cpp | 1 + - .../adaptations/software/qsgsoftwarethreadedrenderloop.cpp | 2 ++ - src/quick/scenegraph/qsgrenderloop.cpp | 12 ++++++++++++ - src/quick/scenegraph/qsgthreadedrenderloop.cpp | 1 + - src/quick/scenegraph/qsgwindowsrenderloop.cpp | 10 ++++++++++ - 10 files changed, 33 insertions(+), 2 deletions(-) - -Index: qtdeclarative-everywhere-src-5.10.0/src/plugins/scenegraph/d3d12/qsgd3d12renderloop.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.10.0.orig/src/plugins/scenegraph/d3d12/qsgd3d12renderloop.cpp -+++ qtdeclarative-everywhere-src-5.10.0/src/plugins/scenegraph/d3d12/qsgd3d12renderloop.cpp -@@ -461,7 +461,6 @@ void QSGD3D12RenderLoop::renderWindow(QQ - data.rc->initialize(nullptr); - - wd->syncSceneGraph(); -- data.rc->endSync(); - - if (profileFrames) - syncTime = renderTimer.nsecsElapsed(); -Index: qtdeclarative-everywhere-src-5.10.0/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.10.0.orig/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop.cpp -+++ qtdeclarative-everywhere-src-5.10.0/src/plugins/scenegraph/d3d12/qsgd3d12threadedrenderloop.cpp -@@ -410,7 +410,6 @@ bool QSGD3D12RenderThread::event(QEvent - QQuickWindowPrivate *wd = QQuickWindowPrivate::get(wme->window); - rc->initialize(nullptr); - wd->syncSceneGraph(); -- rc->endSync(); - wd->renderSceneGraph(wme->window->size()); - *wme->image = engine->executeAndWaitReadbackRenderTarget(); - } -@@ -546,7 +545,6 @@ void QSGD3D12RenderThread::sync(bool inE - - rc->initialize(nullptr); - wd->syncSceneGraph(); -- rc->endSync(); - - if (!hadRenderer && wd->renderer) { - if (Q_UNLIKELY(debug_loop())) -Index: qtdeclarative-everywhere-src-5.10.0/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.10.0.orig/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp -+++ qtdeclarative-everywhere-src-5.10.0/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp -@@ -205,7 +205,6 @@ void QSGOpenVGRenderLoop::renderWindow(Q - emit window->afterAnimating(); - - cd->syncSceneGraph(); -- rc->endSync(); - - if (profileFrames) - syncTime = renderTimer.nsecsElapsed(); -Index: qtdeclarative-everywhere-src-5.10.0/src/quick/items/qquickrendercontrol.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.10.0.orig/src/quick/items/qquickrendercontrol.cpp -+++ qtdeclarative-everywhere-src-5.10.0/src/quick/items/qquickrendercontrol.cpp -@@ -284,7 +284,6 @@ bool QQuickRenderControl::sync() - - QQuickWindowPrivate *cd = QQuickWindowPrivate::get(d->window); - cd->syncSceneGraph(); -- d->rc->endSync(); - - // TODO: find out if the sync actually caused a scenegraph update. - return true; -@@ -384,7 +383,6 @@ QImage QQuickRenderControl::grab() - QQuickWindowPrivate *cd = QQuickWindowPrivate::get(d->window); - cd->polishItems(); - cd->syncSceneGraph(); -- d->rc->endSync(); - render(); - grabContent = qt_gl_read_framebuffer(d->window->size() * d->window->effectiveDevicePixelRatio(), false, false); - if (QQuickRenderControl::renderWindowFor(d->window)) { -@@ -404,7 +402,6 @@ QImage QQuickRenderControl::grab() - QPaintDevice *prevDev = softwareRenderer->currentPaintDevice(); - softwareRenderer->setCurrentPaintDevice(&grabContent); - softwareRenderer->markDirty(); -- d->rc->endSync(); - render(); - softwareRenderer->setCurrentPaintDevice(prevDev); - } -Index: qtdeclarative-everywhere-src-5.10.0/src/quick/items/qquickwindow.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.10.0.orig/src/quick/items/qquickwindow.cpp -+++ qtdeclarative-everywhere-src-5.10.0/src/quick/items/qquickwindow.cpp -@@ -439,8 +439,10 @@ void QQuickWindowPrivate::syncSceneGraph - - emit q->afterSynchronizing(); - runAndClearJobs(&afterSynchronizingJobs); -+ context->endSync(); - } - -+ - void QQuickWindowPrivate::renderSceneGraph(const QSize &size) - { - QML_MEMORY_SCOPE_STRING("SceneGraph"); -Index: qtdeclarative-everywhere-src-5.10.0/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.10.0.orig/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp -+++ qtdeclarative-everywhere-src-5.10.0/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderloop.cpp -@@ -149,7 +149,6 @@ void QSGSoftwareRenderLoop::renderWindow - emit window->afterAnimating(); - - cd->syncSceneGraph(); -- rc->endSync(); - - if (profileFrames) - syncTime = renderTimer.nsecsElapsed(); -Index: qtdeclarative-everywhere-src-5.10.0/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.10.0.orig/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp -+++ qtdeclarative-everywhere-src-5.10.0/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp -@@ -330,7 +330,6 @@ bool QSGSoftwareRenderThread::event(QEve - softwareRenderer->setBackingStore(backingStore); - rc->initialize(nullptr); - wd->syncSceneGraph(); -- rc->endSync(); - wd->renderSceneGraph(wme->window->size()); - *wme->image = backingStore->handle()->toImage(); - } -@@ -444,7 +443,6 @@ void QSGSoftwareRenderThread::sync(bool - - rc->initialize(nullptr); - wd->syncSceneGraph(); -- rc->endSync(); - - if (!hadRenderer && wd->renderer) { - qCDebug(QSG_RASTER_LOG_RENDERLOOP, "RT - created renderer"); -Index: qtdeclarative-everywhere-src-5.10.0/src/quick/scenegraph/qsgrenderloop.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.10.0.orig/src/quick/scenegraph/qsgrenderloop.cpp -+++ qtdeclarative-everywhere-src-5.10.0/src/quick/scenegraph/qsgrenderloop.cpp -@@ -381,16 +381,6 @@ void QSGGuiThreadRenderLoop::renderWindo - bool alsoSwap = data.updatePending; - data.updatePending = false; - -- bool lastDirtyWindow = true; -- auto i = m_windows.constBegin(); -- while (i != m_windows.constEnd()) { -- if (i.value().updatePending) { -- lastDirtyWindow = false; -- break; -- } -- i++; -- } -- - if (!current) - return; - -@@ -418,8 +408,6 @@ void QSGGuiThreadRenderLoop::renderWindo - emit window->afterAnimating(); - - cd->syncSceneGraph(); -- if (lastDirtyWindow) -- rc->endSync(); - - if (profileFrames) - syncTime = renderTimer.nsecsElapsed(); -Index: qtdeclarative-everywhere-src-5.10.0/src/quick/scenegraph/qsgthreadedrenderloop.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.10.0.orig/src/quick/scenegraph/qsgthreadedrenderloop.cpp -+++ qtdeclarative-everywhere-src-5.10.0/src/quick/scenegraph/qsgthreadedrenderloop.cpp -@@ -432,7 +432,6 @@ bool QSGRenderThread::event(QEvent *e) - qCDebug(QSG_LOG_RENDERLOOP) << QSG_RT_PAD << "- sync scene graph"; - QQuickWindowPrivate *d = QQuickWindowPrivate::get(ce->window); - d->syncSceneGraph(); -- sgrc->endSync(); - - qCDebug(QSG_LOG_RENDERLOOP) << QSG_RT_PAD << "- rendering scene graph"; - QQuickWindowPrivate::get(ce->window)->renderSceneGraph(ce->window->size()); -Index: qtdeclarative-everywhere-src-5.10.0/src/quick/scenegraph/qsgwindowsrenderloop.cpp -=================================================================== ---- qtdeclarative-everywhere-src-5.10.0.orig/src/quick/scenegraph/qsgwindowsrenderloop.cpp -+++ qtdeclarative-everywhere-src-5.10.0/src/quick/scenegraph/qsgwindowsrenderloop.cpp -@@ -446,14 +446,6 @@ void QSGWindowsRenderLoop::renderWindow( - } - } - -- bool lastDirtyWindow = true; -- for (int i=0; iflushFrameSynchronousEvents(); - // Event delivery or processing has caused the window to stop rendering. - if (!windowData(window)) -@@ -473,8 +465,6 @@ void QSGWindowsRenderLoop::renderWindow( - - RLDEBUG(" - syncing"); - d->syncSceneGraph(); -- if (lastDirtyWindow) -- m_rc->endSync(); - QSG_RENDER_TIMING_SAMPLE(QQuickProfiler::SceneGraphRenderLoopFrame, time_synced, - QQuickProfiler::SceneGraphRenderLoopSync); -