Changes - SailfishOS Open Build Service

Changes of Revision 8

[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin.changes
@@ -1,8 +1,3 @@ -* Sat Oct 08 2016 David Greaves <david@dgreaves.com> - 5.1.0.17 -- [hwcomposer] Build on qtbase 5.6. Contributes to JB#35409 -- [hwcomposer] Fix instantiation of the theme. Contributes to JB#35409 -- [hwcomposer] pkgconfig files are no longer created for private libs. Contributes to JB#35409 - * Wed Aug 17 2016 Gunnar Sletta <gunnar.sletta@jollamobile.com> - 5.1.0.16 - [hwcomposer] Avoid using Hwc::eventControl when display is off. Contributes to JB#35911.
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin.spec ^
@@ -1,6 +1,6 @@ Name: qt5-qpa-hwcomposer-plugin Summary: Qt 5 QPA hwcomposer plugin -Version: 5.1.0.17 +Version: 5.1.0.16 Release: 1 Group: Qt/Qt License: LGPLv2.1 with exception or GPLv3 @@ -9,7 +9,7 @@ BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: qt5-qtplatformsupport-devel >= 5.6.0 +BuildRequires: pkgconfig(Qt5PlatformSupport) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(wayland-egl) @@ -37,8 +37,7 @@ %build export QTDIR=/usr/share/qt5 cd hwcomposer -# Qt is built with mesa, which has gl3.h. We're built with hybris which doesn't include gl3.h, so explicitly disable es3 -%qmake5 DEFINES+=QT_NO_OPENGL_ES_3 +%qmake5 make %{_smp_mflags} %install @@ -48,7 +47,6 @@ # doesn't exist on Qt 5.1, we don't currently care about this for 5.2 rm -f %{buildroot}/usr/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake -rm -f %{buildroot}/usr/lib/cmake/Qt5Gui/Qt5Gui_QEglFShwcIntegrationPlugin.cmake %files %defattr(-,root,root,-)
[-] [+]	Changed	_service ^
@@ -6,7 +6,7 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/qt5-qpa-hwcomposer-plugin.git</param> <param name="branch">qt-5.2</param> - <param name="revision">294e3267a1c34545d78e85b1da45b8f26b515c33</param> + <param name="revision">1678a4b1a47fb942d211eac026464c00363efa70</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.16.tar.bz2/hwcomposer/hwcomposer.pro ^
@@ -1,7 +1,7 @@ TARGET = hwcomposer PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QEglFShwcIntegrationPlugin +PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin load(qt_plugin) INCLUDEPATH += . @@ -28,7 +28,7 @@ HEADERS += hwcomposer_backend_v11.h -QT += core-private compositor-private gui-private platformsupport-private dbus +QT += core-private compositor-private gui-private platformsupport-private DEFINES += QEGL_EXTRA_DEBUG CONFIG += egl qpa/genericunixfontdatabase @@ -57,12 +57,14 @@ $$PWD/qeglfswindow.cpp \ $$PWD/qeglfsbackingstore.cpp \ $$PWD/qeglfsscreen.cpp \ - $$PWD/qeglfscontext.cpp + $$PWD/qeglfscontext.cpp \ + $$PWD/qeglfspageflipper.cpp HEADERS += $$PWD/qeglfsintegration.h \ $$PWD/qeglfswindow.h \ $$PWD/qeglfsbackingstore.h \ $$PWD/qeglfsscreen.h \ - $$PWD/qeglfscontext.h + $$PWD/qeglfscontext.h \ + $$PWD/qeglfspageflipper.h QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.16.tar.bz2/hwcomposer/main.cpp ^
@@ -44,19 +44,20 @@ QT_BEGIN_NAMESPACE -class QEglFShwcIntegrationPlugin : public QPlatformIntegrationPlugin +class QEglFSIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "hwcomposer.json") + public: - QPlatformIntegration create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration create(const QString&, const QStringList&); }; -QPlatformIntegration* QEglFShwcIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QPlatformIntegration* QEglFSIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (!system.compare(QLatin1String("hwcomposer"), Qt::CaseInsensitive)) - return new QEglFSIntegration(); + if (system.toLower() == "hwcomposer") + return new QEglFSIntegration; return 0; }
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.16.tar.bz2/hwcomposer/qeglfscontext.cpp ^
@@ -42,6 +42,7 @@ #include "qeglfscontext.h" #include "qeglfswindow.h" #include "qeglfsintegration.h" +#include "qeglfspageflipper.h" #include <QtPlatformSupport/private/qeglpbuffer_p.h> #include <QtGui/QSurface> #include <QtDebug> @@ -50,6 +51,7 @@ QEglFSContext::QEglFSContext( HwComposerContext hwc + , QEglFSPageFlipper pageFlipper , const QSurfaceFormat &format , QPlatformOpenGLContext *share , EGLDisplay display @@ -61,12 +63,12 @@ hwc->surfaceFormatFor(format) , share , display - , &(m_config = QEglFSIntegration::chooseConfig(display, hwc->surfaceFormatFor(format))) + , QEglFSIntegration::chooseConfig(display, hwc->surfaceFormatFor(format)) #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) , eglApi #endif ), - m_hwc(hwc), m_swapIntervalConfigured(false) + m_hwc(hwc), m_pageFlipper(pageFlipper), m_swapIntervalConfigured(false) { }
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.16.tar.bz2/hwcomposer/qeglfscontext.h ^
@@ -44,6 +44,7 @@ #include <QtPlatformSupport/private/qeglconvenience_p.h> #include <QtPlatformSupport/private/qeglplatformcontext_p.h> +#include "qeglfspageflipper.h" #include "hwcomposer_context.h" @@ -52,7 +53,7 @@ class QEglFSContext : public QEGLPlatformContext { public: - QEglFSContext(HwComposerContext hwc, + QEglFSContext(HwComposerContext hwc, QEglFSPageFlipper pageFlipper, const QSurfaceFormat &format, QPlatformOpenGLContext share, EGLDisplay display #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) , EGLenum eglApi = EGL_OPENGL_ES_API); @@ -64,7 +65,7 @@ void swapBuffers(QPlatformSurface surface); private: HwComposerContext m_hwc; - EGLConfig m_config; + QEglFSPageFlipper *m_pageFlipper; bool m_swapIntervalConfigured; };
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.16.tar.bz2/hwcomposer/qeglfsintegration.cpp ^
@@ -63,6 +63,7 @@ #include <qpa/qplatforminputcontextfactory_p.h> #include "qeglfscontext.h" +#include "qeglfspageflipper.h" #include <EGL/egl.h> @@ -114,11 +115,7 @@ QEglFSIntegration::~QEglFSIntegration() { -#if QT_VERSION >= 0x050500 - destroyScreen(mScreen); -#else delete mScreen; -#endif eglTerminate(mDisplay); delete mHwc; @@ -153,7 +150,7 @@ QPlatformOpenGLContext QEglFSIntegration::createPlatformOpenGLContext(QOpenGLContext context) const { - return new QEglFSContext(mHwc, mHwc->surfaceFormatFor(context->format()), context->shareHandle(), mDisplay); + return new QEglFSContext(mHwc, static_cast<QEglFSPageFlipper >(mScreen->pageFlipper()), mHwc->surfaceFormatFor(context->format()), context->shareHandle(), mDisplay); } QPlatformOffscreenSurface QEglFSIntegration::createPlatformOffscreenSurface(QOffscreenSurface surface) const @@ -200,8 +197,8 @@ mHwc->sleepDisplay(true); } else if (lowerCaseResource == "displayon") { // Called from lipstick to turn on the display (src/homeapplication.cpp) - mHwc->sleepDisplay(false); - } + mHwc->sleepDisplay(false); + } return NULL; } @@ -249,7 +246,7 @@ QPlatformTheme QEglFSIntegration::createPlatformTheme(const QString &name) const { - if (name == QLatin1String("generic_eglfs")) + if (name == QLatin1String("generic_qeglfs")) return new GenericEglFSTheme; return GenericEglFSTheme::createUnixTheme(name);
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.16.tar.bz2/hwcomposer/qeglfsscreen.cpp ^
@@ -41,6 +41,7 @@ #include "qeglfsscreen.h" #include "qeglfswindow.h" +#include "qeglfspageflipper.h" #include <private/qmath_p.h> @@ -48,6 +49,7 @@ QEglFSScreen::QEglFSScreen(HwComposerContext hwc, EGLDisplay dpy) : m_hwc(hwc) + , m_pageFlipper(new QEglFSPageFlipper(this)) , m_dpy(dpy) { #ifdef QEGL_EXTRA_DEBUG @@ -57,8 +59,17 @@ QEglFSScreen::~QEglFSScreen() { + delete m_pageFlipper; } +#if 0 +QPlatformScreenPageFlipper QEglFSScreen::pageFlipper() const +{ + return m_pageFlipper; +} +#endif + + QRect QEglFSScreen::geometry() const { return QRect(QPoint(0, 0), m_hwc->screenSize());