Changes - SailfishOS Open Build Service

Changes of Revision 5

[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin.changes
@@ -1,3 +1,7 @@ +* Sat Feb 18 2023 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 5.6.2.24 +- [hwcomposer] Include android-config.h before droid headers. JB#60211 +- [hwcomposer] Initial support for Qt6 + * Tue Feb 07 2023 Simo Piiroinen <simo.piiroinen@jolla.com> - 5.6.2.23 - [hwcomposer] Remove unsafe async signal handler. Fixes JB#60078
[-] [+]	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.6.2.23 +Version: 5.6.2.24 Release: 1 License: LGPLv2 with exception or GPLv3 or Qt Commercial URL: http://github.com/mer-hybris/qt5-qpa-hwcomposer-plugin
[-] [+]	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">master</param> - <param name="revision">45b05e12fe8b50e254783fa50c97a576d19d1d74</param> + <param name="revision">998956aebe21ac7ba6e7315d1c12e6e11c93d742</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/hwcomposer.pro ^
@@ -30,10 +30,18 @@ HEADERS += qsystrace_selector.h -versionAtLeast(QT_MINOR_VERSION, 8) { - QT += core-private gui-private egl_support-private waylandcompositor-private dbus fontdatabase_support-private eventdispatcher_support-private theme_support-private -} else { - QT += core-private compositor-private gui-private platformsupport-private dbus +QT += core-private gui-private dbus + +equals(QT_MAJOR_VERSION, 5) { + versionAtLeast(QT_MINOR_VERSION, 8) { + QT += egl_support-private waylandcompositor-private fontdatabase_support-private eventdispatcher_support-private theme_support-private + } else { + QT += compositor-private platformsupport-private + } +} + +equals(QT_MAJOR_VERSION, 6) { + QT += waylandcompositor-private opengl } enable-sensors {
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/hwcomposer_backend.h ^
@@ -42,12 +42,13 @@ #ifndef HWCOMPOSER_BACKEND_H #define HWCOMPOSER_BACKEND_H +#include <android-config.h> + #include <inttypes.h> #include <sys/types.h> #include <sync/sync.h> #include <stdint.h> -#include <android-config.h> #include <hardware/hardware.h> #include <hardware/hwcomposer.h>
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/hwcomposer_backend_v0.cpp ^
@@ -38,7 +38,7 @@ $QT_END_LICENSE$ ****************************************************************************/ -#include <android-version.h> +#include <android-config.h> #if ANDROID_VERSION_MAJOR <= 4 #include <hardware/hwcomposer_defs.h> #ifdef HWC_DEVICE_API_VERSION_0_1
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/hwcomposer_backend_v11.h ^
@@ -49,6 +49,7 @@ // libhybris access to the native hwcomposer window #include <hwcomposer_window.h> +#include <QObject> #include <QBasicTimer> class HwcProcs_v11;
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/hwcomposer_backend_v20.h ^
@@ -50,6 +50,7 @@ #include <hybris/hwc2/hwc2_compatibility_layer.h> +#include <QObject> #include <QBasicTimer> class HwcProcs_v20;
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/hwcomposer_context.h ^
@@ -55,7 +55,9 @@ #include <QtGui/QImage> #include <EGL/egl.h> -#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +#include <QtGui/private/qeglplatformcontext_p.h> +#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) #include <QtEglSupport/private/qeglplatformcontext_p.h> #else #include <QtPlatformSupport/private/qeglplatformcontext_p.h>
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/qeglfsbackingstore.cpp ^
@@ -42,9 +42,15 @@ #include "qeglfsbackingstore.h" #include "qeglfswindow.h" +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +#include <QtGui/QOpenGLContext> +#include <QtOpenGL/QOpenGLPaintDevice> +#include <QtOpenGL/QOpenGLShaderProgram> +#else #include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLPaintDevice> #include <QtGui/QOpenGLShaderProgram> +#endif #include <QtGui/QScreen> @@ -145,7 +151,11 @@ QRect imageRect = m_image.rect(); QRegion fixed; - foreach (const QRect &rect, m_dirty.rects()) { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) + for (const QRect &rect : m_dirty) { +#else + for (const QRect &rect : m_dirty.rects()) { +#endif // intersect with image rect to be sure QRect r = imageRect & rect; @@ -159,7 +169,11 @@ fixed \|= r; } - foreach (const QRect &rect, fixed.rects()) { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) + for (const QRect &rect : fixed) { +#else + for (const QRect &rect : fixed.rects()) { +#endif // if the sub-rect is full-width we can pass the image data directly to // OpenGL instead of copying, since there's no gap between scanlines if (rect.width() == imageRect.width()) {
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/qeglfscontext.cpp ^
@@ -43,7 +43,9 @@ #include "qeglfswindow.h" #include "qeglfsintegration.h" -#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +#include <QtGui/private/qeglpbuffer_p.h> +#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) #include <QtEglSupport/private/qeglpbuffer_p.h> #else #include <QtPlatformSupport/private/qeglpbuffer_p.h>
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/qeglfscontext.h ^
@@ -44,8 +44,10 @@ #include <QtGlobal> -#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) - +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +#include <QtGui/private/qeglconvenience_p.h> +#include <QtGui/private/qeglplatformcontext_p.h> +#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) #include <QtEglSupport/private/qeglconvenience_p.h> #include <QtEglSupport/private/qeglplatformcontext_p.h> #else
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/qeglfsintegration.cpp ^
@@ -46,7 +46,14 @@ #include <QtGui/private/qguiapplication_p.h> -#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +#include <QtGui/private/qgenericunixfontdatabase_p.h> +#include <QtGui/private/qgenericunixeventdispatcher_p.h> +#include <QtGui/private/qgenericunixthemes_p.h> +#include <QtGui/private/qeglconvenience_p.h> +#include <QtGui/private/qeglplatformcontext_p.h> +#include <QtGui/private/qeglpbuffer_p.h> +#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> #include <QtThemeSupport/private/qgenericunixthemes_p.h>
[-] [+]	Changed	_service:tar_git:qt5-qpa-hwcomposer-plugin-5.6.2.24.tar.bz2/hwcomposer/qeglfswindow.cpp ^
@@ -42,7 +42,9 @@ #include "qeglfswindow.h" #include <qpa/qwindowsysteminterface.h> -#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) +#include <QtGui/private/qeglconvenience_p.h> +#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) #include <QtEglSupport/private/qeglconvenience_p.h> #else #include <QtPlatformSupport/private/qeglconvenience_p.h>