* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0
@ 2017-01-31 7:59 Zoltan Gyarmati
2017-01-31 7:59 ` [Buildroot] [PATCH v6 1/9] qt5: add choice between version 5.6.2 and 5.8.0 Zoltan Gyarmati
` (10 more replies)
0 siblings, 11 replies; 39+ messages in thread
From: Zoltan Gyarmati @ 2017-01-31 7:59 UTC (permalink / raw)
To: buildroot
Changes v5 -> v6:
This is the updated version of Andreas' patchset, with the following changes:
* fix conflicts introduced by the Qt example license related commits
* fix the python-pyqt5 patches to not patching the sip-generated c++
code but the sip files themselves
The Qt 5.8 config (and pyqt5) was tested on Raspberry Pi.
Julien Corjon (3):
qt5enginio : move into legacy compatibility
qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview
Conditional revert "qt5base: install bundled fonts to target"
Naumann Andreas (6):
qt5: add choice between version 5.6.2 and 5.8.0
qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0
qt5quickcontrols: More deterministic target install
qt5quickcontrols/qt5quickcontrols2: enable for software renderer for
Qt 5.8.0
python-pyqt5: Depend directly on Qt5 rather than its toolchain
requirements
python-pyqt5: Fix for Qt 5.8.0
package/python-pyqt5/0002-fix-qt-5.6.2.patch | 28 ------------
package/python-pyqt5/0002-fix-qt5.8-build.patch | 28 ++++++++++++
package/python-pyqt5/Config.in | 13 ++----
package/qt5/Config.in | 27 ++++++++---
package/qt5/qt5.mk | 8 ++++
package/qt5/qt53d/qt53d.hash | 3 ++
.../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ------------------
...fs-fix-eglfs_mali-compile-for-odroid-mali.patch | 53 ----------------------
.../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ++++++++++++++++++
...fs-fix-eglfs_mali-compile-for-odroid-mali.patch | 53 ++++++++++++++++++++++
package/qt5/qt5base/qt5base.hash | 3 ++
package/qt5/qt5base/qt5base.mk | 15 ++++++
package/qt5/qt5canvas3d/qt5canvas3d.hash | 3 ++
package/qt5/qt5connectivity/qt5connectivity.hash | 3 ++
package/qt5/qt5connectivity/qt5connectivity.mk | 5 ++
package/qt5/qt5declarative/Config.in | 6 +--
package/qt5/qt5declarative/qt5declarative.hash | 3 ++
package/qt5/qt5declarative/qt5declarative.mk | 5 ++
.../qt5graphicaleffects/qt5graphicaleffects.hash | 3 ++
.../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 5 ++
package/qt5/qt5imageformats/qt5imageformats.hash | 3 ++
package/qt5/qt5imageformats/qt5imageformats.mk | 5 ++
package/qt5/qt5location/qt5location.hash | 3 ++
package/qt5/qt5location/qt5location.mk | 5 ++
package/qt5/qt5multimedia/qt5multimedia.hash | 3 ++
package/qt5/qt5multimedia/qt5multimedia.mk | 8 ++++
package/qt5/qt5quickcontrols/Config.in | 4 +-
package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 3 ++
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 +-
package/qt5/qt5quickcontrols2/Config.in | 4 +-
.../qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 3 ++
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 12 +++++
package/qt5/qt5script/qt5script.hash | 3 ++
package/qt5/qt5sensors/qt5sensors.hash | 3 ++
package/qt5/qt5sensors/qt5sensors.mk | 5 ++
package/qt5/qt5serialbus/qt5serialbus.hash | 3 ++
package/qt5/qt5serialport/qt5serialport.hash | 3 ++
package/qt5/qt5serialport/qt5serialport.mk | 5 ++
package/qt5/qt5svg/qt5svg.hash | 3 ++
package/qt5/qt5svg/qt5svg.mk | 5 ++
package/qt5/qt5tools/qt5tools.hash | 3 ++
package/qt5/qt5tools/qt5tools.mk | 5 ++
package/qt5/qt5webchannel/qt5webchannel.hash | 3 ++
package/qt5/qt5webchannel/qt5webchannel.mk | 5 ++
package/qt5/qt5webkit/qt5webkit.hash | 3 ++
package/qt5/qt5websockets/qt5websockets.hash | 3 ++
package/qt5/qt5websockets/qt5websockets.mk | 5 ++
package/qt5/qt5x11extras/qt5x11extras.hash | 3 ++
package/qt5/qt5x11extras/qt5x11extras.mk | 5 ++
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 3 ++
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 5 ++
51 files changed, 334 insertions(+), 151 deletions(-)
delete mode 100644 package/python-pyqt5/0002-fix-qt-5.6.2.patch
create mode 100644 package/python-pyqt5/0002-fix-qt5.8-build.patch
delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
delete mode 100644 package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
create mode 100644 package/qt5/qt5base/5.6.2/0006-eglfs-rasp-pi-header-inclusion.patch
create mode 100644 package/qt5/qt5base/5.6.2/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch
--
2.7.4
^ permalink raw reply [flat|nested] 39+ messages in thread* [Buildroot] [PATCH v6 1/9] qt5: add choice between version 5.6.2 and 5.8.0 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati @ 2017-01-31 7:59 ` Zoltan Gyarmati 2017-02-02 19:31 ` Peter Seiderer 2017-02-02 22:01 ` Arnout Vandecappelle 2017-01-31 7:59 ` [Buildroot] [PATCH v6 2/9] qt5enginio : move into legacy compatibility Zoltan Gyarmati ` (9 subsequent siblings) 10 siblings, 2 replies; 39+ messages in thread From: Zoltan Gyarmati @ 2017-01-31 7:59 UTC (permalink / raw) To: buildroot From: Naumann Andreas <ANaumann@ultratronik.de> For 5.8.0 - add hashes - qt5 need C++11 compliant compiler since 5.7 ([1]) - use different licenses: since version 5.7 Qt removed the LGPL v2.1 option in favor of v3 with a different exception - qt5base: renamed library to EglFSDeviceIntegration ([2]) - qt5base: remove ras-pi patch, commit c0cc5052097c723d0331a7619d686af9eb93d33c fix it ([3]) - qt5base: remove 0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch (upstream committed [3b]) - qt5base: remove obsolete config-option -large ([4]) - qt5base: remove gstreamer related config-option ([5]) For 5.6.2 - moved patches to subdir [1] http://blog.qt.io/blog/2016/06/16/qt-5-7-released/ [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ec4eb4db61094179bc6a9ec26ec68fb710177053 [3] https://codereview.qt-project.org/#/c/167172/ [3b] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f1b4bd4790860e1ff5afcec111a359bc3a91cfda [4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108 [5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=7d4da559afb62a779b3d90a65fb679cb5433f203 Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- package/qt5/Config.in | 18 +++++++- package/qt5/qt5.mk | 8 ++++ package/qt5/qt53d/qt53d.hash | 3 ++ .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ------------------ ...fs-fix-eglfs_mali-compile-for-odroid-mali.patch | 53 ---------------------- .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ++++++++++++++++++ ...fs-fix-eglfs_mali-compile-for-odroid-mali.patch | 53 ++++++++++++++++++++++ package/qt5/qt5base/qt5base.hash | 3 ++ package/qt5/qt5base/qt5base.mk | 13 ++++++ package/qt5/qt5canvas3d/qt5canvas3d.hash | 3 ++ package/qt5/qt5connectivity/qt5connectivity.hash | 3 ++ package/qt5/qt5connectivity/qt5connectivity.mk | 5 ++ package/qt5/qt5declarative/qt5declarative.hash | 3 ++ package/qt5/qt5declarative/qt5declarative.mk | 5 ++ .../qt5graphicaleffects/qt5graphicaleffects.hash | 3 ++ .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 5 ++ package/qt5/qt5imageformats/qt5imageformats.hash | 3 ++ package/qt5/qt5imageformats/qt5imageformats.mk | 5 ++ package/qt5/qt5location/qt5location.hash | 3 ++ package/qt5/qt5location/qt5location.mk | 5 ++ package/qt5/qt5multimedia/qt5multimedia.hash | 3 ++ package/qt5/qt5multimedia/qt5multimedia.mk | 5 ++ package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 3 ++ .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 3 ++ package/qt5/qt5script/qt5script.hash | 3 ++ package/qt5/qt5sensors/qt5sensors.hash | 3 ++ package/qt5/qt5sensors/qt5sensors.mk | 5 ++ package/qt5/qt5serialbus/qt5serialbus.hash | 3 ++ package/qt5/qt5serialport/qt5serialport.hash | 3 ++ package/qt5/qt5serialport/qt5serialport.mk | 5 ++ package/qt5/qt5svg/qt5svg.hash | 3 ++ package/qt5/qt5svg/qt5svg.mk | 5 ++ package/qt5/qt5tools/qt5tools.hash | 3 ++ package/qt5/qt5tools/qt5tools.mk | 5 ++ package/qt5/qt5webchannel/qt5webchannel.hash | 3 ++ package/qt5/qt5webchannel/qt5webchannel.mk | 5 ++ package/qt5/qt5webkit/qt5webkit.hash | 3 ++ package/qt5/qt5websockets/qt5websockets.hash | 3 ++ package/qt5/qt5websockets/qt5websockets.mk | 5 ++ package/qt5/qt5x11extras/qt5x11extras.hash | 3 ++ package/qt5/qt5x11extras/qt5x11extras.mk | 5 ++ package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 3 ++ package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 5 ++ 43 files changed, 271 insertions(+), 100 deletions(-) delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch delete mode 100644 package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch create mode 100644 package/qt5/qt5base/5.6.2/0006-eglfs-rasp-pi-header-inclusion.patch create mode 100644 package/qt5/qt5base/5.6.2/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 234dfdd..eb97fba 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -11,15 +11,16 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_ARM_CPU_ARMV4 default y -comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" +comment "Qt5 needs a toolchain w/ wchar, NPTL, C++11, dynamic library" depends on !BR2_PACKAGE_QT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS menuconfig BR2_PACKAGE_QT5 bool "Qt5" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on !BR2_STATIC_LIBS depends on !BR2_PACKAGE_QT select BR2_PACKAGE_QT5BASE @@ -30,6 +31,19 @@ menuconfig BR2_PACKAGE_QT5 http://qt.io if BR2_PACKAGE_QT5 + +choice + prompt "Qt5 version" + default BR2_QT5_VERSION_5_8 + +config BR2_QT5_VERSION_5_8 + bool "5.8" + +config BR2_QT5_VERSION_5_6 + bool "5.6" + +endchoice + source "package/qt5/qt5base/Config.in" source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5connectivity/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index e937e23..37d31c6 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -1,7 +1,15 @@ +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5_VERSION_MAJOR = 5.8 +QT5_VERSION = $(QT5_VERSION_MAJOR).0 +QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules +QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules +else QT5_VERSION_MAJOR = 5.6 QT5_VERSION = $(QT5_VERSION_MAJOR).2 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules +endif + include $(sort $(wildcard package/qt5/*/*.mk)) define QT5_LA_PRL_FILES_FIXUP diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 7179380..7eaf2cd 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qt3d-opensource-src-5.6.2.tar.xz.mirrorlist sha256 a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941 qt3d-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qt3d-opensource-src-5.8.0.tar.xz +sha256 3a224576fc922195ac0063b5b351cd6b9d13afcde9cec14317be0347d10c8ae5 qt3d-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch deleted file mode 100644 index f1f6d9b..0000000 --- a/package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001 -From: Julien Corjon <corjon.j@ecagroup.com> -Date: Tue, 21 Jul 2015 09:58:14 +0200 -Subject: [PATCH] eglfs - fix rasp-pi header inclusion - -eglplateform.h include headers for low level instruction and fail on brcm -headers inclusion - For the brcm presence test we use egl pkg-config file - For the eglfs-plugin compilation we use the egl configuration - -Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339 -Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> ---- - config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 2 ++ - src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro -index ce16a3a..192a8ad 100644 ---- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro -+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro -@@ -1,6 +1,8 @@ - SOURCES = eglfs-brcm.cpp - - CONFIG -= qt -+CONFIG += link_pkgconfig -+PKGCONFIG += egl - - INCLUDEPATH += $$QMAKE_INCDIR_EGL - -diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro -index 0f493fd..8479496 100644 ---- a/src/plugins/platforms/eglfs/eglfs-plugin.pro -+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro -@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin - load(qt_plugin) - - QT += platformsupport-private eglfs_device_lib-private -+CONFIG += egl - - SOURCES += $$PWD/qeglfsmain.cpp - --- -2.1.0 - diff --git a/package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch b/package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch deleted file mode 100644 index cbafb39..0000000 --- a/package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch +++ /dev/null @@ -1,53 +0,0 @@ -From b6c602e4264021f98ec2c72316e2a2000bf35e82 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Mon, 14 Nov 2016 23:42:25 +0100 -Subject: [PATCH] eglfs: fix eglfs_mali compile for odroid-mali - -Avoid duplicated struct fbdev_window definition (introduced by [1]) by -renaming struct fbdev_window to shadow_fbdev_window. - -Fixes the following buildroot compile failure ([2]): - -qeglfsmaliintegration.cpp:45:8: error: redefinition of 'struct fbdev_window' - struct fbdev_window { - ^ -In file included from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:28:0, - from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36, - from ../../../eglfs/qeglfsglobal.h:45, - from ../../../eglfs/qeglfsdeviceintegration.h:48, - from qeglfsmaliintegration.h:37, - from qeglfsmaliintegration.cpp:34: - -[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=58bed4cda98e8e25db8adc61c7db73b6853077dc -[2] http://autobuild.buildroot.net/results/48c/48c458c035162169e8ca7c34ae65e9064822f25a - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - .../eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp -index 43decdf..aeba83f 100644 ---- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp -+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp -@@ -42,7 +42,7 @@ - - QT_BEGIN_NAMESPACE - --struct fbdev_window { -+struct shadow_fbdev_window { - unsigned short width; - unsigned short height; - }; -@@ -85,7 +85,7 @@ EGLNativeWindowType QEglFSMaliIntegration::createNativeWindow(QPlatformWindow *w - Q_UNUSED(window); - Q_UNUSED(format); - -- fbdev_window *fbwin = reinterpret_cast<fbdev_window *>(malloc(sizeof(fbdev_window))); -+ shadow_fbdev_window *fbwin = reinterpret_cast<shadow_fbdev_window *>(malloc(sizeof(shadow_fbdev_window))); - if (NULL == fbwin) - return 0; - --- -2.8.1 - diff --git a/package/qt5/qt5base/5.6.2/0006-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/5.6.2/0006-eglfs-rasp-pi-header-inclusion.patch new file mode 100644 index 0000000..f1f6d9b --- /dev/null +++ b/package/qt5/qt5base/5.6.2/0006-eglfs-rasp-pi-header-inclusion.patch @@ -0,0 +1,45 @@ +From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001 +From: Julien Corjon <corjon.j@ecagroup.com> +Date: Tue, 21 Jul 2015 09:58:14 +0200 +Subject: [PATCH] eglfs - fix rasp-pi header inclusion + +eglplateform.h include headers for low level instruction and fail on brcm +headers inclusion + For the brcm presence test we use egl pkg-config file + For the eglfs-plugin compilation we use the egl configuration + +Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339 +Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> +--- + config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 2 ++ + src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro +index ce16a3a..192a8ad 100644 +--- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro ++++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro +@@ -1,6 +1,8 @@ + SOURCES = eglfs-brcm.cpp + + CONFIG -= qt ++CONFIG += link_pkgconfig ++PKGCONFIG += egl + + INCLUDEPATH += $$QMAKE_INCDIR_EGL + +diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro +index 0f493fd..8479496 100644 +--- a/src/plugins/platforms/eglfs/eglfs-plugin.pro ++++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro +@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin + load(qt_plugin) + + QT += platformsupport-private eglfs_device_lib-private ++CONFIG += egl + + SOURCES += $$PWD/qeglfsmain.cpp + +-- +2.1.0 + diff --git a/package/qt5/qt5base/5.6.2/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch b/package/qt5/qt5base/5.6.2/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch new file mode 100644 index 0000000..cbafb39 --- /dev/null +++ b/package/qt5/qt5base/5.6.2/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch @@ -0,0 +1,53 @@ +From b6c602e4264021f98ec2c72316e2a2000bf35e82 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Mon, 14 Nov 2016 23:42:25 +0100 +Subject: [PATCH] eglfs: fix eglfs_mali compile for odroid-mali + +Avoid duplicated struct fbdev_window definition (introduced by [1]) by +renaming struct fbdev_window to shadow_fbdev_window. + +Fixes the following buildroot compile failure ([2]): + +qeglfsmaliintegration.cpp:45:8: error: redefinition of 'struct fbdev_window' + struct fbdev_window { + ^ +In file included from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:28:0, + from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36, + from ../../../eglfs/qeglfsglobal.h:45, + from ../../../eglfs/qeglfsdeviceintegration.h:48, + from qeglfsmaliintegration.h:37, + from qeglfsmaliintegration.cpp:34: + +[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=58bed4cda98e8e25db8adc61c7db73b6853077dc +[2] http://autobuild.buildroot.net/results/48c/48c458c035162169e8ca7c34ae65e9064822f25a + +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + .../eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp +index 43decdf..aeba83f 100644 +--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp ++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp +@@ -42,7 +42,7 @@ + + QT_BEGIN_NAMESPACE + +-struct fbdev_window { ++struct shadow_fbdev_window { + unsigned short width; + unsigned short height; + }; +@@ -85,7 +85,7 @@ EGLNativeWindowType QEglFSMaliIntegration::createNativeWindow(QPlatformWindow *w + Q_UNUSED(window); + Q_UNUSED(format); + +- fbdev_window *fbwin = reinterpret_cast<fbdev_window *>(malloc(sizeof(fbdev_window))); ++ shadow_fbdev_window *fbwin = reinterpret_cast<shadow_fbdev_window *>(malloc(sizeof(shadow_fbdev_window))); + if (NULL == fbwin) + return 0; + +-- +2.8.1 + diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 9808e9b..3f6af8a 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz.mirrorlist sha256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 qtbase-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtbase-opensource-src-5.8.0.tar.xz +sha256 c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005 qtbase-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index bbbaf0f..c09bf58 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -41,12 +41,19 @@ else QT5BASE_CONFIGURE_OPTS += -release endif +ifeq ($(BR2_QT5_VERSION_5_6),y) QT5BASE_CONFIGURE_OPTS += -largefile +endif ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5BASE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3c (examples) QT5BASE_LICENSE_FILES += header.BSD @@ -158,12 +165,14 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples # gstreamer 0.10 support is broken in qt5multimedia +ifeq ($(BR2_QT5_VERSION_5_6),y) ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 QT5BASE_DEPENDENCIES += gst1-plugins-base else QT5BASE_CONFIGURE_OPTS += -no-gstreamer endif +endif ifeq ($(BR2_PACKAGE_LIBINPUT),y) QT5BASE_CONFIGURE_OPTS += -libinput @@ -181,7 +190,11 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration +else QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration +endif QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash index 01819e4..2d84fe4 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtcanvas3d-opensource-src-5.6.2.tar.xz.mirrorlist sha256 d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad qtcanvas3d-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtcanvas3d-opensource-src-5.8.0.tar.xz +sha256 5446f790f526f582df7790e1e1442357f61aac9c23ea9b00d4a791c9d78ccaa3 qtcanvas3d-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 4574f3d..d6b841a 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtconnectivity-opensource-src-5.6.2.tar.xz.mirrorlist sha256 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 qtconnectivity-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtconnectivity-opensource-src-5.8.0.tar.xz +sha256 7b2d01e9d67f6390a9e64bdae62e81a965b0f0b21137cf1a021e08a28bb227f1 qtconnectivity-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index c0a4d40..b005a6f 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -11,8 +11,13 @@ QT5CONNECTIVITY_DEPENDENCIES = qt5base QT5CONNECTIVITY_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5CONNECTIVITY_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5CONNECTIVITY_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5CONNECTIVITY_LICENSE := $(QT5CONNECTIVITY_LICENSE), BSD-3c (examples) endif diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index d8d3a68..98a46f1 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtdeclarative-opensource-src-5.6.2.tar.xz.mirrorlist sha256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da qtdeclarative-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtdeclarative-opensource-src-5.8.0.tar.xz +sha256 32941eb9ad12d8735dfc64de8b50b5ab830a6d8705a421c57369de7cb5708a46 qtdeclarative-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index be3a7b7..7cb3fcc 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -11,8 +11,13 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns QT5DECLARATIVE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5DECLARATIVE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5DECLARATIVE_LICENSE = Commercial license QT5DECLARATIVE_REDISTRIBUTE = NO diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index ae29e3b..ac4167b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtgraphicaleffects-opensource-src-5.6.2.tar.xz.mirrorlist sha256 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e qtgraphicaleffects-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtgraphicaleffects-opensource-src-5.8.0.tar.xz +sha256 5f2a9b50530ac83d7c2b2ce73fbdf03ac61f83a9521e9d4b796fa17a969dd919 qtgraphicaleffects-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index 223374a..36cc686 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -11,8 +11,13 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5GRAPHICALEFFECTS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5GRAPHICALEFFECTS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5GRAPHICALEFFECTS_LICENSE = Commercial license QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 54b58e4..0a63523 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtimageformats-opensource-src-5.6.2.tar.xz.mirrorlist sha256 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4 qtimageformats-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtimageformats-opensource-src-5.8.0.tar.xz +sha256 75045eeac11c96194260badbdb4d3e9eb7b7f9972d18d3491230ea820be4606f qtimageformats-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 921656d..4aad31e 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -11,8 +11,13 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5IMAGEFORMATS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5IMAGEFORMATS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5IMAGEFORMATS_LICENSE = Commercial license QT5IMAGEFORMATS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 374952f..6afc918 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtlocation-opensource-src-5.6.2.tar.xz.mirrorlist sha256 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a qtlocation-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtlocation-opensource-src-5.8.0.tar.xz +sha256 48a1e39ed989f0133aeacaa379e9c3958ec9b08c043626bba503619891d21abb qtlocation-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index 358b162..2d9738e 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -11,8 +11,13 @@ QT5LOCATION_DEPENDENCIES = qt5base QT5LOCATION_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5LOCATION_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5LOCATION_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5LOCATION_LICENSE = Commercial license QT5LOCATION_REDISTRIBUTE = NO diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 56a11fb..ffd8a77 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtmultimedia-opensource-src-5.6.2.tar.xz.mirrorlist sha256 cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf qtmultimedia-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtmultimedia-opensource-src-5.8.0.tar.xz +sha256 a8bc044834f95208261915feefe5e2fdb6761b76f0f99e21062963bd9f9d4a07 qtmultimedia-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 3075ffc..7ce947a 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -11,8 +11,13 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base QT5MULTIMEDIA_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5MULTIMEDIA_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5MULTIMEDIA_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5MULTIMEDIA_LICENSE = Commercial license QT5MULTIMEDIA_REDISTRIBUTE = NO diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 6db589d..95657d2 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols-opensource-src-5.6.2.tar.xz.mirrorlist sha256 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c qtquickcontrols-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols-opensource-src-5.8.0.tar.xz +sha256 04e70d0ccfd9ba882691a5e8f81e3428ae1b72a76bb9f43ba242f1c33bd7b326 qtquickcontrols-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 0d85d48..80a3103 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols2-opensource-src-5.6.2.tar.xz.mirrorlist sha256 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1 qtquickcontrols2-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols2-opensource-src-5.8.0.tar.xz +sha256 b099866ec74f13cf0047274c61f0486d1eba27716fa07b69f682c54d3a4ade1b qtquickcontrols2-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index c8ecb75..6e369d8 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz.mirrorlist sha256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e qtscript-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtscript-opensource-src-5.8.0.tar.xz +sha256 293ab91d2d189d889dc80609aa259190fb7de636d360e904784a5ce1a45e5ad3 qtscript-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 65cd127..307ad6f 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsensors-opensource-src-5.6.2.tar.xz.mirrorlist sha256 a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427 qtsensors-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtsensors-opensource-src-5.8.0.tar.xz +sha256 3a5d0639ecf8cd30c8ca349c353a8f3c424889b53831e70b6d8c481fc45de796 qtsensors-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index 0dd952a..88378ab 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -11,8 +11,13 @@ QT5SENSORS_DEPENDENCIES = qt5base QT5SENSORS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5SENSORS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5SENSORS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5SENSORS_LICENSE = Commercial license QT5SENSORS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 308c365..f15945c 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialbus-opensource-src-5.6.2.tar.xz.mirrorlist sha256 b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826 qtserialbus-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtserialbus-opensource-src-5.8.0.tar.xz +sha256 58343dd9f2e339d4900a2d4b54ee25ed959cf62bacb012fe61e6b99d7958c10a qtserialbus-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 2458e5d..18c590b 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialport-opensource-src-5.6.2.tar.xz.mirrorlist sha256 af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376 qtserialport-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtserialport-opensource-src-5.8.0.tar.xz +sha256 52317fded73ad0beb0a2ecf93124a8e2dfdcf14270a762c1f4fd06fb075506ad qtserialport-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 04df021..c6b7d03 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -11,8 +11,13 @@ QT5SERIALPORT_DEPENDENCIES = qt5base QT5SERIALPORT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5SERIALPORT_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5SERIALPORT_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5SERIALPORT_LICENSE = Commercial license QT5SERIALPORT_REDISTRIBUTE = NO diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 0c9e9eb..6855e85 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsvg-opensource-src-5.6.2.tar.xz.mirrorlist sha256 f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e qtsvg-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtsvg-opensource-src-5.8.0.tar.xz +sha256 9873191c211ab4da9c0bc47b1e3549f475db4d448bba3175e0f86b24eefadc89 qtsvg-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index ebd5cba..3f6965a 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -11,8 +11,13 @@ QT5SVG_DEPENDENCIES = qt5base QT5SVG_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5SVG_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +else QT5SVG_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5SVG_LICENSE = Commercial license QT5SVG_REDISTRIBUTE = NO diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index cc11b28..541d95b 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qttools-opensource-src-5.8.0.tar.xz +sha256 95ec8e76d393b6ba26ffff5041fce41946d2bf3aec1402c6533e24d9fc269d83 qttools-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 6befb8b..8e75ad1 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -20,8 +20,13 @@ QT5TOOLS_DEPENDENCIES += qt5declarative endif ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5TOOLS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL +else QT5TOOLS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5TOOLS_LICENSE = Commercial license QT5TOOLS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 0f9eaae..7fd01efb 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebchannel-opensource-src-5.6.2.tar.xz.mirrorlist sha256 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 qtwebchannel-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebchannel-opensource-src-5.8.0.tar.xz +sha256 5bf5b15413baa235ee2cbfd136ea3b9303b32879b54f9f25bfb4dc96d37d0b4a qtwebchannel-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index c48757b..f1d1e74 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -11,8 +11,13 @@ QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5WEBCHANNEL_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5WEBCHANNEL_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBCHANNEL_LICENSE := $(QT5WEBCHANNEL_LICENSE), BSD-3c (examples) endif diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash index 309f776..4431e2d 100644 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ b/package/qt5/qt5webkit/qt5webkit.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/snapshots/qt/5.6/5.6.2/latest_src/submodules/qtwebkit-opensource-src-5.6.2.tar.xz.mirrorlist sha256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 qtwebkit-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebkit-opensource-src-5.8.0.tar.xz +sha256 79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec qtwebkit-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 3443476..a91e084 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebsockets-opensource-src-5.6.2.tar.xz.mirrorlist sha256 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35 qtwebsockets-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebsockets-opensource-src-5.8.0.tar.xz +sha256 aa110af297d0d3239f346c3ee0cd43621adf463eb62a04941bbfe3fcccb845f5 qtwebsockets-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index 9771556..51d4a53 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -11,8 +11,13 @@ QT5WEBSOCKETS_DEPENDENCIES = qt5base QT5WEBSOCKETS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5WEBSOCKETS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools) +QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 +else QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3 QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 +endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBSOCKETS_LICENSE := $(QT5WEBSOCKETS_LICENSE), BSD-3c (examples) endif diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 297c578..eb0dc6c 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz.mirrorlist sha256 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced qtx11extras-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtx11extras-opensource-src-5.8.0.tar.xz +sha256 bed7f2b5123a9849ec94afa67db5f296e6f527c6330f47a680c83586d3a4280e qtx11extras-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index a0e1209..2573745 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -11,8 +11,13 @@ QT5X11EXTRAS_DEPENDENCIES = qt5base QT5X11EXTRAS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5X11EXTRAS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5X11EXTRAS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif else QT5X11EXTRAS_LICENSE = Commercial license QT5X11EXTRAS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index fa4e97f..c1bb663 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,2 +1,5 @@ # Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtxmlpatterns-opensource-src-5.6.2.tar.xz.mirrorlist sha256 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc qtxmlpatterns-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtxmlpatterns-opensource-src-5.8.0.tar.xz +sha256 7bffa65ea52e54fb1314b45222888612d55eaf51a936a6119b8756266439da04 qtxmlpatterns-opensource-src-5.8.0.tar.xz diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 9fc44df..6aa85a0 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -11,8 +11,13 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base QT5XMLPATTERNS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +ifeq ($(BR2_QT5_VERSION_5_8),y) +QT5XMLPATTERNS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) +QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL +else QT5XMLPATTERNS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3c (examples) endif -- 2.7.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 1/9] qt5: add choice between version 5.6.2 and 5.8.0 2017-01-31 7:59 ` [Buildroot] [PATCH v6 1/9] qt5: add choice between version 5.6.2 and 5.8.0 Zoltan Gyarmati @ 2017-02-02 19:31 ` Peter Seiderer 2017-02-06 13:32 ` Arnout Vandecappelle 2017-02-02 22:01 ` Arnout Vandecappelle 1 sibling, 1 reply; 39+ messages in thread From: Peter Seiderer @ 2017-02-02 19:31 UTC (permalink / raw) To: buildroot Hello *, On Tue, 31 Jan 2017 08:59:03 +0100, Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> wrote: [...] > - qt5base: remove gstreamer related config-option ([5]) > [...] > [5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=7d4da559afb62a779b3d90a65fb679cb5433f203 > [...] > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index bbbaf0f..c09bf58 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -41,12 +41,19 @@ else [...] > > # gstreamer 0.10 support is broken in qt5multimedia > +ifeq ($(BR2_QT5_VERSION_5_6),y) > ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) > QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 > QT5BASE_DEPENDENCIES += gst1-plugins-base > else > QT5BASE_CONFIGURE_OPTS += -no-gstreamer > endif > +endif I think this configuration options should go to qt5multimedia.mk for the Qt5.8 (or not !Qt5.6) case... Regards, Peter $ grep gstreamer build/qt5multimedia-5.8.0/config_help.txt -no-gstreamer ........ Disable support for GStreamer -gstreamer [version] . Enable GStreamer support [auto] ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 1/9] qt5: add choice between version 5.6.2 and 5.8.0 2017-02-02 19:31 ` Peter Seiderer @ 2017-02-06 13:32 ` Arnout Vandecappelle 0 siblings, 0 replies; 39+ messages in thread From: Arnout Vandecappelle @ 2017-02-06 13:32 UTC (permalink / raw) To: buildroot On 02-02-17 20:31, Peter Seiderer wrote: > Hello *, > > On Tue, 31 Jan 2017 08:59:03 +0100, Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> wrote: > > [...] >> - qt5base: remove gstreamer related config-option ([5]) >> > [...] >> [5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=7d4da559afb62a779b3d90a65fb679cb5433f203 >> > [...] >> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk >> index bbbaf0f..c09bf58 100644 >> --- a/package/qt5/qt5base/qt5base.mk >> +++ b/package/qt5/qt5base/qt5base.mk >> @@ -41,12 +41,19 @@ else > [...] >> >> # gstreamer 0.10 support is broken in qt5multimedia >> +ifeq ($(BR2_QT5_VERSION_5_6),y) >> ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) >> QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 >> QT5BASE_DEPENDENCIES += gst1-plugins-base >> else >> QT5BASE_CONFIGURE_OPTS += -no-gstreamer >> endif >> +endif > > I think this configuration options should go to qt5multimedia.mk for > the Qt5.8 (or not !Qt5.6) case... Just to clarify: qt5multimedia.mk now has: ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) QT5MULTIMEDIA_DEPENDENCIES += gst1-plugins-base endif i.e. it doesn't explicitly tell qmake whether or not gstreamer should be enabled. We prefer to explicitly pass enable/disable options to the configuration step, to avoid accidental use of a package that wasn't meant to be used. So Zoltan, Andreas, or Peter: could you make a patch that does that? Note that the series can already be applied without that patch. Regards, Arnout -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 1/9] qt5: add choice between version 5.6.2 and 5.8.0 2017-01-31 7:59 ` [Buildroot] [PATCH v6 1/9] qt5: add choice between version 5.6.2 and 5.8.0 Zoltan Gyarmati 2017-02-02 19:31 ` Peter Seiderer @ 2017-02-02 22:01 ` Arnout Vandecappelle 1 sibling, 0 replies; 39+ messages in thread From: Arnout Vandecappelle @ 2017-02-02 22:01 UTC (permalink / raw) To: buildroot Hi Zoltan, Andreas, Pretty incomplete review, but it will get you a little further :-) On 31-01-17 08:59, Zoltan Gyarmati wrote: > From: Naumann Andreas <ANaumann@ultratronik.de> > > For 5.8.0 > - add hashes > - qt5 need C++11 compliant compiler since 5.7 ([1]) > - use different licenses: since version 5.7 Qt removed the LGPL v2.1 option in favor > of v3 with a different exception > - qt5base: renamed library to EglFSDeviceIntegration ([2]) > - qt5base: remove ras-pi patch, commit c0cc5052097c723d0331a7619d686af9eb93d33c fix it ([3]) > - qt5base: remove 0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch (upstream committed [3b]) > - qt5base: remove obsolete config-option -large ([4]) > - qt5base: remove gstreamer related config-option ([5]) Maybe explicitly add here "GStreamer support is fully moved to qt5multimedia". > > For 5.6.2 > - moved patches to subdir > > [1] http://blog.qt.io/blog/2016/06/16/qt-5-7-released/ > [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ec4eb4db61094179bc6a9ec26ec68fb710177053 > [3] https://codereview.qt-project.org/#/c/167172/ > [3b] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f1b4bd4790860e1ff5afcec111a359bc3a91cfda > [4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108 > [5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=7d4da559afb62a779b3d90a65fb679cb5433f203 > > Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > --- > package/qt5/Config.in | 18 +++++++- > package/qt5/qt5.mk | 8 ++++ > package/qt5/qt53d/qt53d.hash | 3 ++ > .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ------------------ > ...fs-fix-eglfs_mali-compile-for-odroid-mali.patch | 53 ---------------------- > .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ++++++++++++++++++ > ...fs-fix-eglfs_mali-compile-for-odroid-mali.patch | 53 ++++++++++++++++++++++ > package/qt5/qt5base/qt5base.hash | 3 ++ > package/qt5/qt5base/qt5base.mk | 13 ++++++ > package/qt5/qt5canvas3d/qt5canvas3d.hash | 3 ++ > package/qt5/qt5connectivity/qt5connectivity.hash | 3 ++ > package/qt5/qt5connectivity/qt5connectivity.mk | 5 ++ > package/qt5/qt5declarative/qt5declarative.hash | 3 ++ > package/qt5/qt5declarative/qt5declarative.mk | 5 ++ > .../qt5graphicaleffects/qt5graphicaleffects.hash | 3 ++ > .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 5 ++ > package/qt5/qt5imageformats/qt5imageformats.hash | 3 ++ > package/qt5/qt5imageformats/qt5imageformats.mk | 5 ++ > package/qt5/qt5location/qt5location.hash | 3 ++ > package/qt5/qt5location/qt5location.mk | 5 ++ > package/qt5/qt5multimedia/qt5multimedia.hash | 3 ++ > package/qt5/qt5multimedia/qt5multimedia.mk | 5 ++ > package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 3 ++ > .../qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 3 ++ > package/qt5/qt5script/qt5script.hash | 3 ++ > package/qt5/qt5sensors/qt5sensors.hash | 3 ++ > package/qt5/qt5sensors/qt5sensors.mk | 5 ++ > package/qt5/qt5serialbus/qt5serialbus.hash | 3 ++ > package/qt5/qt5serialport/qt5serialport.hash | 3 ++ > package/qt5/qt5serialport/qt5serialport.mk | 5 ++ > package/qt5/qt5svg/qt5svg.hash | 3 ++ > package/qt5/qt5svg/qt5svg.mk | 5 ++ > package/qt5/qt5tools/qt5tools.hash | 3 ++ > package/qt5/qt5tools/qt5tools.mk | 5 ++ > package/qt5/qt5webchannel/qt5webchannel.hash | 3 ++ > package/qt5/qt5webchannel/qt5webchannel.mk | 5 ++ > package/qt5/qt5webkit/qt5webkit.hash | 3 ++ > package/qt5/qt5websockets/qt5websockets.hash | 3 ++ > package/qt5/qt5websockets/qt5websockets.mk | 5 ++ > package/qt5/qt5x11extras/qt5x11extras.hash | 3 ++ > package/qt5/qt5x11extras/qt5x11extras.mk | 5 ++ > package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 3 ++ > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 5 ++ > 43 files changed, 271 insertions(+), 100 deletions(-) > delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch > delete mode 100644 package/qt5/qt5base/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch > create mode 100644 package/qt5/qt5base/5.6.2/0006-eglfs-rasp-pi-header-inclusion.patch > create mode 100644 package/qt5/qt5base/5.6.2/0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch Please generate patches with the -M option, so git detects this as a rename rather than a delete/create. > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > index 234dfdd..eb97fba 100644 > --- a/package/qt5/Config.in > +++ b/package/qt5/Config.in > @@ -11,15 +11,16 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE > depends on !BR2_ARM_CPU_ARMV4 > default y > > -comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" > +comment "Qt5 needs a toolchain w/ wchar, NPTL, C++11, dynamic library" > depends on !BR2_PACKAGE_QT > - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS > + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS The new dependencies are only for v5.8, not for v5.6. So they shouldn't be changed here... > > menuconfig BR2_PACKAGE_QT5 > bool "Qt5" > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_USE_WCHAR > depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 ... and here. Instead, the dependency should be added ... > depends on !BR2_STATIC_LIBS > depends on !BR2_PACKAGE_QT > select BR2_PACKAGE_QT5BASE > @@ -30,6 +31,19 @@ menuconfig BR2_PACKAGE_QT5 > http://qt.io > > if BR2_PACKAGE_QT5 > + > +choice > + prompt "Qt5 version" > + default BR2_QT5_VERSION_5_8 > + > +config BR2_QT5_VERSION_5_8 > + bool "5.8" ... here. Also, I think it makes sense to add a brief help text explaining that 5.8 is (L)GPLv3+ while 5.6 is (L)GPLv2+. That was the reason to offer both versions, right? Also, I think this symbol should be named BR2_QT5_VERSION_LATEST. The idea is that we will keep only two versions: a frozen 5.6 and 5.8 that will evolve into 5.9 etc. We don't want to add legacy symbols every time the version is bumped... > + > +config BR2_QT5_VERSION_5_6 > + bool "5.6" > + > +endchoice > + > source "package/qt5/qt5base/Config.in" > source "package/qt5/qt5canvas3d/Config.in" > source "package/qt5/qt5connectivity/Config.in" [snip] > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index bbbaf0f..c09bf58 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -41,12 +41,19 @@ else > QT5BASE_CONFIGURE_OPTS += -release > endif > > +ifeq ($(BR2_QT5_VERSION_5_6),y) > QT5BASE_CONFIGURE_OPTS += -largefile > +endif > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license > +ifeq ($(BR2_QT5_VERSION_5_8),y) I'd prefer to invert this condition, i.e. check for VERSION_5_6 all the time. Makes it easier to read the code IMHO. > +QT5BASE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) > +QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL > +else > QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) > QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL > +endif > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3c (examples) > QT5BASE_LICENSE_FILES += header.BSD > @@ -158,12 +165,14 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples > > # gstreamer 0.10 support is broken in qt5multimedia The comment should be inside the version condition, otherwise it looks like it relates to the version. > +ifeq ($(BR2_QT5_VERSION_5_6),y) > ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) > QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 > QT5BASE_DEPENDENCIES += gst1-plugins-base > else > QT5BASE_CONFIGURE_OPTS += -no-gstreamer > endif > +endif > > ifeq ($(BR2_PACKAGE_LIBINPUT),y) > QT5BASE_CONFIGURE_OPTS += -libinput > @@ -181,7 +190,11 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql > QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test > QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml > QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL > +ifeq ($(BR2_QT5_VERSION_5_8),y) > +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration > +else > QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration > +endif > > QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui > QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets [snip] > diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk > index c0a4d40..b005a6f 100644 > --- a/package/qt5/qt5connectivity/qt5connectivity.mk > +++ b/package/qt5/qt5connectivity/qt5connectivity.mk > @@ -11,8 +11,13 @@ QT5CONNECTIVITY_DEPENDENCIES = qt5base > QT5CONNECTIVITY_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > +ifeq ($(BR2_QT5_VERSION_5_8),y) Same here, I prefer a condition of 5_6. And in all other files of course. Regards, Arnout > +QT5CONNECTIVITY_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) > +QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL > +else > QT5CONNECTIVITY_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) > QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL > +endif > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > QT5CONNECTIVITY_LICENSE := $(QT5CONNECTIVITY_LICENSE), BSD-3c (examples) > endif [snip] -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 2/9] qt5enginio : move into legacy compatibility 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati 2017-01-31 7:59 ` [Buildroot] [PATCH v6 1/9] qt5: add choice between version 5.6.2 and 5.8.0 Zoltan Gyarmati @ 2017-01-31 7:59 ` Zoltan Gyarmati 2017-02-06 13:51 ` Arnout Vandecappelle 2017-01-31 7:59 ` [Buildroot] [PATCH v6 3/9] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview Zoltan Gyarmati ` (8 subsequent siblings) 10 siblings, 1 reply; 39+ messages in thread From: Zoltan Gyarmati @ 2017-01-31 7:59 UTC (permalink / raw) To: buildroot From: Julien Corjon <corjon.j@ecagroup.com> See https://wiki.qt.io/New_Features_in_Qt_5.7 Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- package/qt5/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index eb97fba..faa58d8 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,7 +48,6 @@ source "package/qt5/qt5base/Config.in" source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5connectivity/Config.in" source "package/qt5/qt5declarative/Config.in" -source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5location/Config.in" @@ -67,6 +66,7 @@ source "package/qt5/qt53d/Config.in" source "package/qt5/qt5quickcontrols2/Config.in" source "package/qt5/qt5serialbus/Config.in" comment "legacy compatibility" +source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5webkit/Config.in" endif -- 2.7.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 2/9] qt5enginio : move into legacy compatibility 2017-01-31 7:59 ` [Buildroot] [PATCH v6 2/9] qt5enginio : move into legacy compatibility Zoltan Gyarmati @ 2017-02-06 13:51 ` Arnout Vandecappelle 0 siblings, 0 replies; 39+ messages in thread From: Arnout Vandecappelle @ 2017-02-06 13:51 UTC (permalink / raw) To: buildroot On 31-01-17 08:59, Zoltan Gyarmati wrote: > From: Julien Corjon <corjon.j@ecagroup.com> > > See https://wiki.qt.io/New_Features_in_Qt_5.7 This is of course not perfect, because we now still have a Qt 5.6 version where it is not legacy compatibility. However, it looks like fixing that would complicate matters too much. Is it really useful to have these subdivisions? Maybe it's better to just add this information in the help text? BTW, if anybody feels up to it: it would be useful to have proper help texts for the qt5 modules. Regards, Arnout > > Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> > Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > --- > package/qt5/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > index eb97fba..faa58d8 100644 > --- a/package/qt5/Config.in > +++ b/package/qt5/Config.in > @@ -48,7 +48,6 @@ source "package/qt5/qt5base/Config.in" > source "package/qt5/qt5canvas3d/Config.in" > source "package/qt5/qt5connectivity/Config.in" > source "package/qt5/qt5declarative/Config.in" > -source "package/qt5/qt5enginio/Config.in" > source "package/qt5/qt5graphicaleffects/Config.in" > source "package/qt5/qt5imageformats/Config.in" > source "package/qt5/qt5location/Config.in" > @@ -67,6 +66,7 @@ source "package/qt5/qt53d/Config.in" > source "package/qt5/qt5quickcontrols2/Config.in" > source "package/qt5/qt5serialbus/Config.in" > comment "legacy compatibility" > +source "package/qt5/qt5enginio/Config.in" > source "package/qt5/qt5script/Config.in" > source "package/qt5/qt5webkit/Config.in" > endif > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 3/9] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati 2017-01-31 7:59 ` [Buildroot] [PATCH v6 1/9] qt5: add choice between version 5.6.2 and 5.8.0 Zoltan Gyarmati 2017-01-31 7:59 ` [Buildroot] [PATCH v6 2/9] qt5enginio : move into legacy compatibility Zoltan Gyarmati @ 2017-01-31 7:59 ` Zoltan Gyarmati 2017-01-31 7:59 ` [Buildroot] [PATCH v6 4/9] Conditional revert "qt5base: install bundled fonts to target" Zoltan Gyarmati ` (7 subsequent siblings) 10 siblings, 0 replies; 39+ messages in thread From: Zoltan Gyarmati @ 2017-01-31 7:59 UTC (permalink / raw) To: buildroot From: Julien Corjon <corjon.j@ecagroup.com> See http://blog.qt.io/blog/2016/06/16/qt-5-7-released/ Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- package/qt5/Config.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index faa58d8..cff118d 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -44,6 +44,7 @@ config BR2_QT5_VERSION_5_6 endchoice +source "package/qt5/qt53d/Config.in" source "package/qt5/qt5base/Config.in" source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5connectivity/Config.in" @@ -53,7 +54,9 @@ source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5location/Config.in" source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quickcontrols/Config.in" +source "package/qt5/qt5quickcontrols2/Config.in" source "package/qt5/qt5sensors/Config.in" +source "package/qt5/qt5serialbus/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5tools/Config.in" @@ -61,10 +64,6 @@ source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" -comment "technology preview" -source "package/qt5/qt53d/Config.in" -source "package/qt5/qt5quickcontrols2/Config.in" -source "package/qt5/qt5serialbus/Config.in" comment "legacy compatibility" source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5script/Config.in" -- 2.7.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 4/9] Conditional revert "qt5base: install bundled fonts to target" 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati ` (2 preceding siblings ...) 2017-01-31 7:59 ` [Buildroot] [PATCH v6 3/9] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview Zoltan Gyarmati @ 2017-01-31 7:59 ` Zoltan Gyarmati 2017-01-31 7:59 ` [Buildroot] [PATCH v6 5/9] qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 Zoltan Gyarmati ` (6 subsequent siblings) 10 siblings, 0 replies; 39+ messages in thread From: Zoltan Gyarmati @ 2017-01-31 7:59 UTC (permalink / raw) To: buildroot From: Julien Corjon <corjon.j@ecagroup.com> qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645 So for Qt Version 5.8.0 this reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384 and part of 186ef9f6f4647ed34b67a3427a5e0e249f0794e7 Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- package/qt5/qt5base/qt5base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index c09bf58..0a70dc8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -260,12 +260,14 @@ define QT5BASE_INSTALL_TARGET_PLUGINS fi endef +ifeq ($(BR2_QT5_VERSION_5_6),y) define QT5BASE_INSTALL_TARGET_FONTS if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \ mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \ cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \ fi endef +endif define QT5BASE_INSTALL_TARGET_EXAMPLES if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \ -- 2.7.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 5/9] qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati ` (3 preceding siblings ...) 2017-01-31 7:59 ` [Buildroot] [PATCH v6 4/9] Conditional revert "qt5base: install bundled fonts to target" Zoltan Gyarmati @ 2017-01-31 7:59 ` Zoltan Gyarmati 2017-02-02 22:20 ` Arnout Vandecappelle 2017-01-31 7:59 ` [Buildroot] [PATCH v6 6/9] qt5quickcontrols: More deterministic target install Zoltan Gyarmati ` (5 subsequent siblings) 10 siblings, 1 reply; 39+ messages in thread From: Zoltan Gyarmati @ 2017-01-31 7:59 UTC (permalink / raw) To: buildroot From: Naumann Andreas <ANaumann@ultratronik.de> Since Qt 5.8.0 provides a software rasterizer we can enable Quick for non-GL platforms. However, some modules provide less functionality without OpenGL, so install steps have to be limited for the softrender only backend: - qtmultimedia does not provide qml Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- package/qt5/qt5declarative/Config.in | 6 +++--- package/qt5/qt5multimedia/qt5multimedia.mk | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index eba4c8d..a8accdb 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -15,11 +15,11 @@ config BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5DECLARATIVE comment "quick module needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 config BR2_PACKAGE_QT5DECLARATIVE_QUICK bool "quick module" - select BR2_PACKAGE_QT5BASE_OPENGL - depends on BR2_PACKAGE_QT5_GL_AVAILABLE + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 endif diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 7ce947a..b11b8d1 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -58,11 +58,14 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS endef endif +# QtMultimedia QMLs have a hard dependency on OpenGL -> not available for softraster backends +ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y) ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) define QT5MULTIMEDIA_INSTALL_TARGET_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ endef endif +endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES -- 2.7.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 5/9] qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 2017-01-31 7:59 ` [Buildroot] [PATCH v6 5/9] qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 Zoltan Gyarmati @ 2017-02-02 22:20 ` Arnout Vandecappelle 2017-02-07 8:41 ` Andreas Naumann 0 siblings, 1 reply; 39+ messages in thread From: Arnout Vandecappelle @ 2017-02-02 22:20 UTC (permalink / raw) To: buildroot On 31-01-17 08:59, Zoltan Gyarmati wrote: > From: Naumann Andreas <ANaumann@ultratronik.de> > > Since Qt 5.8.0 provides a software rasterizer we can enable Quick for non-GL > platforms. However, some modules provide less functionality without OpenGL, > so install steps have to be limited for the softrender only backend: > - qtmultimedia does not provide qml > > Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > --- > package/qt5/qt5declarative/Config.in | 6 +++--- > package/qt5/qt5multimedia/qt5multimedia.mk | 3 +++ > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in > index eba4c8d..a8accdb 100644 > --- a/package/qt5/qt5declarative/Config.in > +++ b/package/qt5/qt5declarative/Config.in > @@ -15,11 +15,11 @@ config BR2_PACKAGE_QT5DECLARATIVE > if BR2_PACKAGE_QT5DECLARATIVE > > comment "quick module needs an OpenGL-capable backend" > - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE > + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 > > config BR2_PACKAGE_QT5DECLARATIVE_QUICK > bool "quick module" > - select BR2_PACKAGE_QT5BASE_OPENGL > - depends on BR2_PACKAGE_QT5_GL_AVAILABLE > + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE > + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 This means that the conditions that are added to be able to select BR2_PACKAGE_QT5DECLARATIVE_QUICK are no longer correct (e.g. in qt5quickcontrols). Since the condition is a bit complicated, it's probably better to add an auxiliary symbol: config BR2_PACKAGE_QT5DECLARATIVE_QUICK_AVAILABLE default y depends on BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_QT5_VERSION_5_6 comment "quick module needs an OpenGL-capable backend" depends on !BR2_PACKAGE_QT5DECLARATIVE_QUICK_AVAILABLE etc. Do that as a separate patch that converts all the existing users of BR2_PACKAGE_QT5DECLARATIVE_QUICK. Note that it has to be checked if all the packages that now depend on BR2_PACKAGE_QT5_GL_AVAILABLE really do work with the softrenderer. > > endif > diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk > index 7ce947a..b11b8d1 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.mk > +++ b/package/qt5/qt5multimedia/qt5multimedia.mk > @@ -58,11 +58,14 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS > endef > endif > > +# QtMultimedia QMLs have a hard dependency on OpenGL -> not available for softraster backends Line is too long - wrap at 80 characters. Just to be sure: if you try to use these QML classes you get a runtime failure, correct? So the only reason not to copy them is that we know they won't work anyway? Regards, Arnout > +ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y) > ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) > define QT5MULTIMEDIA_INSTALL_TARGET_QMLS > cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ > endef > endif > +endif > > ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) > define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 5/9] qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 2017-02-02 22:20 ` Arnout Vandecappelle @ 2017-02-07 8:41 ` Andreas Naumann 2017-02-07 9:39 ` Zoltan Gyarmati 0 siblings, 1 reply; 39+ messages in thread From: Andreas Naumann @ 2017-02-07 8:41 UTC (permalink / raw) To: buildroot Hi, Am 02.02.2017 um 23:20 schrieb Arnout Vandecappelle: > > > On 31-01-17 08:59, Zoltan Gyarmati wrote: >> From: Naumann Andreas <ANaumann@ultratronik.de> >> >> Since Qt 5.8.0 provides a software rasterizer we can enable Quick for non-GL >> platforms. However, some modules provide less functionality without OpenGL, >> so install steps have to be limited for the softrender only backend: >> - qtmultimedia does not provide qml >> >> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> >> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> >> --- >> package/qt5/qt5declarative/Config.in | 6 +++--- >> package/qt5/qt5multimedia/qt5multimedia.mk | 3 +++ >> 2 files changed, 6 insertions(+), 3 deletions(-) >> >> diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in >> index eba4c8d..a8accdb 100644 >> --- a/package/qt5/qt5declarative/Config.in >> +++ b/package/qt5/qt5declarative/Config.in >> @@ -15,11 +15,11 @@ config BR2_PACKAGE_QT5DECLARATIVE >> if BR2_PACKAGE_QT5DECLARATIVE >> >> comment "quick module needs an OpenGL-capable backend" >> - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE >> + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 >> >> config BR2_PACKAGE_QT5DECLARATIVE_QUICK >> bool "quick module" >> - select BR2_PACKAGE_QT5BASE_OPENGL >> - depends on BR2_PACKAGE_QT5_GL_AVAILABLE >> + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE >> + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 > > This means that the conditions that are added to be able to select > BR2_PACKAGE_QT5DECLARATIVE_QUICK are no longer correct (e.g. in > qt5quickcontrols). Since the condition is a bit complicated, it's probably > better to add an auxiliary symbol: > > config BR2_PACKAGE_QT5DECLARATIVE_QUICK_AVAILABLE > default y > depends on BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_QT5_VERSION_5_6 > > comment "quick module needs an OpenGL-capable backend" > depends on !BR2_PACKAGE_QT5DECLARATIVE_QUICK_AVAILABLE > > etc. > > Do that as a separate patch that converts all the existing users of > BR2_PACKAGE_QT5DECLARATIVE_QUICK. > > Note that it has to be checked if all the packages that now depend on > BR2_PACKAGE_QT5_GL_AVAILABLE really do work with the softrenderer. > > Ok, I'll do that once the new patch set is out. > >> >> endif >> diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk >> index 7ce947a..b11b8d1 100644 >> --- a/package/qt5/qt5multimedia/qt5multimedia.mk >> +++ b/package/qt5/qt5multimedia/qt5multimedia.mk >> @@ -58,11 +58,14 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS >> endef >> endif >> >> +# QtMultimedia QMLs have a hard dependency on OpenGL -> not available for softraster backends > > Line is too long - wrap at 80 characters. > > Just to be sure: if you try to use these QML classes you get a runtime failure, > correct? So the only reason not to copy them is that we know they won't work anyway? Yes. I cant quite remember how exactly it failed but it did quite harshly. But that was with the beta version. Not copying the qmls of course also results in an error message for applications which try to include them. So in the end its maybe not worth it, because it also adds maintenance effort in case it is fixed upstream sometime in the future. Going to remove that part. regards, Andreas > > Regards, > Arnout > >> +ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y) >> ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) >> define QT5MULTIMEDIA_INSTALL_TARGET_QMLS >> cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ >> endef >> endif >> +endif >> >> ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) >> define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES >> > ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 5/9] qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 2017-02-07 8:41 ` Andreas Naumann @ 2017-02-07 9:39 ` Zoltan Gyarmati 2017-02-07 9:54 ` Andreas Naumann 0 siblings, 1 reply; 39+ messages in thread From: Zoltan Gyarmati @ 2017-02-07 9:39 UTC (permalink / raw) To: buildroot Dear Andreas & All, just to avoid duplicated efforts: are you planning to work on this series and prepare the next iteration? I can dedicate time to this tomorrow morning earliest, so then either i can start to assemble the patchset based on the collected comments, or test it if one is submitted in the meantime... Thanks, Zoltan Gyarmati https://zgyarmati.de On 02/07/2017 09:41 AM, Andreas Naumann wrote: > Hi, > > Am 02.02.2017 um 23:20 schrieb Arnout Vandecappelle: >> >> >> On 31-01-17 08:59, Zoltan Gyarmati wrote: >>> From: Naumann Andreas <ANaumann@ultratronik.de> >>> >>> Since Qt 5.8.0 provides a software rasterizer we can enable Quick >>> for non-GL >>> platforms. However, some modules provide less functionality without >>> OpenGL, >>> so install steps have to be limited for the softrender only backend: >>> - qtmultimedia does not provide qml >>> >>> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> >>> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> >>> --- >>> package/qt5/qt5declarative/Config.in | 6 +++--- >>> package/qt5/qt5multimedia/qt5multimedia.mk | 3 +++ >>> 2 files changed, 6 insertions(+), 3 deletions(-) >>> >>> diff --git a/package/qt5/qt5declarative/Config.in >>> b/package/qt5/qt5declarative/Config.in >>> index eba4c8d..a8accdb 100644 >>> --- a/package/qt5/qt5declarative/Config.in >>> +++ b/package/qt5/qt5declarative/Config.in >>> @@ -15,11 +15,11 @@ config BR2_PACKAGE_QT5DECLARATIVE >>> if BR2_PACKAGE_QT5DECLARATIVE >>> >>> comment "quick module needs an OpenGL-capable backend" >>> - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE >>> + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 >>> >>> config BR2_PACKAGE_QT5DECLARATIVE_QUICK >>> bool "quick module" >>> - select BR2_PACKAGE_QT5BASE_OPENGL >>> - depends on BR2_PACKAGE_QT5_GL_AVAILABLE >>> + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE >>> + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 >> >> This means that the conditions that are added to be able to select >> BR2_PACKAGE_QT5DECLARATIVE_QUICK are no longer correct (e.g. in >> qt5quickcontrols). Since the condition is a bit complicated, it's >> probably >> better to add an auxiliary symbol: >> >> config BR2_PACKAGE_QT5DECLARATIVE_QUICK_AVAILABLE >> default y >> depends on BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_QT5_VERSION_5_6 >> >> comment "quick module needs an OpenGL-capable backend" >> depends on !BR2_PACKAGE_QT5DECLARATIVE_QUICK_AVAILABLE >> >> etc. >> >> Do that as a separate patch that converts all the existing users of >> BR2_PACKAGE_QT5DECLARATIVE_QUICK. >> >> Note that it has to be checked if all the packages that now depend on >> BR2_PACKAGE_QT5_GL_AVAILABLE really do work with the softrenderer. >> >> > > Ok, I'll do that once the new patch set is out. > >> >>> >>> endif >>> diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk >>> b/package/qt5/qt5multimedia/qt5multimedia.mk >>> index 7ce947a..b11b8d1 100644 >>> --- a/package/qt5/qt5multimedia/qt5multimedia.mk >>> +++ b/package/qt5/qt5multimedia/qt5multimedia.mk >>> @@ -58,11 +58,14 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS >>> endef >>> endif >>> >>> +# QtMultimedia QMLs have a hard dependency on OpenGL -> not >>> available for softraster backends >> >> Line is too long - wrap at 80 characters. >> >> Just to be sure: if you try to use these QML classes you get a >> runtime failure, >> correct? So the only reason not to copy them is that we know they >> won't work anyway? > > Yes. I cant quite remember how exactly it failed but it did quite > harshly. But that was with the beta version. Not copying the qmls of > course also results in an error message for applications which try to > include them. > So in the end its maybe not worth it, because it also adds maintenance > effort in case it is fixed upstream sometime in the future. Going to > remove that part. > > > regards, > Andreas > > >> >> Regards, >> Arnout >> >>> +ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y) >>> ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) >>> define QT5MULTIMEDIA_INSTALL_TARGET_QMLS >>> cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia >>> $(TARGET_DIR)/usr/qml/ >>> endef >>> endif >>> +endif >>> >>> ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) >>> define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES >>> >> -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: OpenPGP digital signature URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170207/1883d06e/attachment.asc> ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 5/9] qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 2017-02-07 9:39 ` Zoltan Gyarmati @ 2017-02-07 9:54 ` Andreas Naumann 0 siblings, 0 replies; 39+ messages in thread From: Andreas Naumann @ 2017-02-07 9:54 UTC (permalink / raw) To: buildroot Hi Zoltan, i was going to wait for yesterdays subset of Thomas to appear (on master?) and then post/rework the sw-rasterize specific patches on top of that. regards, Andreas Am 07.02.2017 um 10:39 schrieb Zoltan Gyarmati: > Dear Andreas & All, > > just to avoid duplicated efforts: are you planning to work on this > series and prepare the next iteration? I can dedicate time to this > tomorrow morning earliest, so then either i can start to assemble the > patchset based on the collected comments, or test it if one is submitted > in the meantime... > > Thanks, > > Zoltan Gyarmati > https://zgyarmati.de > > On 02/07/2017 09:41 AM, Andreas Naumann wrote: >> Hi, >> >> Am 02.02.2017 um 23:20 schrieb Arnout Vandecappelle: >>> >>> >>> On 31-01-17 08:59, Zoltan Gyarmati wrote: >>>> From: Naumann Andreas <ANaumann@ultratronik.de> >>>> >>>> Since Qt 5.8.0 provides a software rasterizer we can enable Quick >>>> for non-GL >>>> platforms. However, some modules provide less functionality without >>>> OpenGL, >>>> so install steps have to be limited for the softrender only backend: >>>> - qtmultimedia does not provide qml >>>> >>>> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> >>>> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> >>>> --- >>>> package/qt5/qt5declarative/Config.in | 6 +++--- >>>> package/qt5/qt5multimedia/qt5multimedia.mk | 3 +++ >>>> 2 files changed, 6 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/package/qt5/qt5declarative/Config.in >>>> b/package/qt5/qt5declarative/Config.in >>>> index eba4c8d..a8accdb 100644 >>>> --- a/package/qt5/qt5declarative/Config.in >>>> +++ b/package/qt5/qt5declarative/Config.in >>>> @@ -15,11 +15,11 @@ config BR2_PACKAGE_QT5DECLARATIVE >>>> if BR2_PACKAGE_QT5DECLARATIVE >>>> >>>> comment "quick module needs an OpenGL-capable backend" >>>> - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE >>>> + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 >>>> >>>> config BR2_PACKAGE_QT5DECLARATIVE_QUICK >>>> bool "quick module" >>>> - select BR2_PACKAGE_QT5BASE_OPENGL >>>> - depends on BR2_PACKAGE_QT5_GL_AVAILABLE >>>> + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE >>>> + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 >>> >>> This means that the conditions that are added to be able to select >>> BR2_PACKAGE_QT5DECLARATIVE_QUICK are no longer correct (e.g. in >>> qt5quickcontrols). Since the condition is a bit complicated, it's >>> probably >>> better to add an auxiliary symbol: >>> >>> config BR2_PACKAGE_QT5DECLARATIVE_QUICK_AVAILABLE >>> default y >>> depends on BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_QT5_VERSION_5_6 >>> >>> comment "quick module needs an OpenGL-capable backend" >>> depends on !BR2_PACKAGE_QT5DECLARATIVE_QUICK_AVAILABLE >>> >>> etc. >>> >>> Do that as a separate patch that converts all the existing users of >>> BR2_PACKAGE_QT5DECLARATIVE_QUICK. >>> >>> Note that it has to be checked if all the packages that now depend on >>> BR2_PACKAGE_QT5_GL_AVAILABLE really do work with the softrenderer. >>> >>> >> >> Ok, I'll do that once the new patch set is out. >> >>> >>>> >>>> endif >>>> diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk >>>> b/package/qt5/qt5multimedia/qt5multimedia.mk >>>> index 7ce947a..b11b8d1 100644 >>>> --- a/package/qt5/qt5multimedia/qt5multimedia.mk >>>> +++ b/package/qt5/qt5multimedia/qt5multimedia.mk >>>> @@ -58,11 +58,14 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS >>>> endef >>>> endif >>>> >>>> +# QtMultimedia QMLs have a hard dependency on OpenGL -> not >>>> available for softraster backends >>> >>> Line is too long - wrap at 80 characters. >>> >>> Just to be sure: if you try to use these QML classes you get a >>> runtime failure, >>> correct? So the only reason not to copy them is that we know they >>> won't work anyway? >> >> Yes. I cant quite remember how exactly it failed but it did quite >> harshly. But that was with the beta version. Not copying the qmls of >> course also results in an error message for applications which try to >> include them. >> So in the end its maybe not worth it, because it also adds maintenance >> effort in case it is fixed upstream sometime in the future. Going to >> remove that part. >> >> >> regards, >> Andreas >> >> >>> >>> Regards, >>> Arnout >>> >>>> +ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y) >>>> ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) >>>> define QT5MULTIMEDIA_INSTALL_TARGET_QMLS >>>> cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia >>>> $(TARGET_DIR)/usr/qml/ >>>> endef >>>> endif >>>> +endif >>>> >>>> ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) >>>> define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES >>>> >>> > > ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 6/9] qt5quickcontrols: More deterministic target install 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati ` (4 preceding siblings ...) 2017-01-31 7:59 ` [Buildroot] [PATCH v6 5/9] qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 Zoltan Gyarmati @ 2017-01-31 7:59 ` Zoltan Gyarmati 2017-01-31 7:59 ` [Buildroot] [PATCH v6 7/9] qt5quickcontrols/qt5quickcontrols2: enable for software renderer for Qt 5.8.0 Zoltan Gyarmati ` (4 subsequent siblings) 10 siblings, 0 replies; 39+ messages in thread From: Zoltan Gyarmati @ 2017-01-31 7:59 UTC (permalink / raw) To: buildroot From: Naumann Andreas <ANaumann@ultratronik.de> Restrict target install to quickcontrols(1) qmls only. Installing everything under qml/QtQuick includes e.g. quickcontrols2 if existent in staging (but not selected). Another issue may arise e.g. for a external package that creates more files than it installs itself under qml/QtQuick. In that case, it would depend on the order of the packages how much gets installed into target. Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index b33ff15..c2946bc 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -31,7 +31,10 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS endef define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick endef $(eval $(generic-package)) -- 2.7.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 7/9] qt5quickcontrols/qt5quickcontrols2: enable for software renderer for Qt 5.8.0 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati ` (5 preceding siblings ...) 2017-01-31 7:59 ` [Buildroot] [PATCH v6 6/9] qt5quickcontrols: More deterministic target install Zoltan Gyarmati @ 2017-01-31 7:59 ` Zoltan Gyarmati 2017-02-01 20:18 ` Peter Seiderer 2017-01-31 7:59 ` [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements Zoltan Gyarmati ` (3 subsequent siblings) 10 siblings, 1 reply; 39+ messages in thread From: Zoltan Gyarmati @ 2017-01-31 7:59 UTC (permalink / raw) To: buildroot From: Naumann Andreas <ANaumann@ultratronik.de> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- package/qt5/qt5quickcontrols/Config.in | 4 ++-- package/qt5/qt5quickcontrols2/Config.in | 4 ++-- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 0fe8465..d1a4fa5 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS bool "qt5quickcontrols" select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE help Qt is a cross-platform application and UI framework for @@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS http://qt.io comment "qt5quickcontrols needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index 1e57674..ea22a2b 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 bool "qt5quickcontrols2" select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 # qt5declarative/quick depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick help Qt is a cross-platform application and UI framework for @@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 http://qt.io comment "qt5quickcontrols2 needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 8de7932..0ef25e2 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -36,6 +36,7 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES endef endif +ifeq ($(BR2_QT5_VERSION_5_6),y) define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs @@ -43,5 +44,16 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) endef +else +define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick + $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) +endef +endif $(eval $(generic-package)) -- 2.7.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 7/9] qt5quickcontrols/qt5quickcontrols2: enable for software renderer for Qt 5.8.0 2017-01-31 7:59 ` [Buildroot] [PATCH v6 7/9] qt5quickcontrols/qt5quickcontrols2: enable for software renderer for Qt 5.8.0 Zoltan Gyarmati @ 2017-02-01 20:18 ` Peter Seiderer 2017-02-02 8:55 ` Zoltan Gyarmati 0 siblings, 1 reply; 39+ messages in thread From: Peter Seiderer @ 2017-02-01 20:18 UTC (permalink / raw) To: buildroot Hello *, On Tue, 31 Jan 2017 08:59:09 +0100, Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> wrote: > From: Naumann Andreas <ANaumann@ultratronik.de> > > Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > --- > package/qt5/qt5quickcontrols/Config.in | 4 ++-- > package/qt5/qt5quickcontrols2/Config.in | 4 ++-- > package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 12 ++++++++++++ > 3 files changed, 16 insertions(+), 4 deletions(-) > > diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in > index 0fe8465..d1a4fa5 100644 > --- a/package/qt5/qt5quickcontrols/Config.in > +++ b/package/qt5/qt5quickcontrols/Config.in > @@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS > bool "qt5quickcontrols" > select BR2_PACKAGE_QT5DECLARATIVE > select BR2_PACKAGE_QT5DECLARATIVE_QUICK > - depends on BR2_PACKAGE_QT5_GL_AVAILABLE > + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > help > Qt is a cross-platform application and UI framework for > @@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS > http://qt.io > > comment "qt5quickcontrols needs an OpenGL-capable backend" > - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE > + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in > index 1e57674..ea22a2b 100644 > --- a/package/qt5/qt5quickcontrols2/Config.in > +++ b/package/qt5/qt5quickcontrols2/Config.in > @@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 > bool "qt5quickcontrols2" > select BR2_PACKAGE_QT5DECLARATIVE > select BR2_PACKAGE_QT5DECLARATIVE_QUICK > - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick > + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 # qt5declarative/quick > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick > help > Qt is a cross-platform application and UI framework for > @@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 > http://qt.io > > comment "qt5quickcontrols2 needs an OpenGL-capable backend" > - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE > + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > index 8de7932..0ef25e2 100644 > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > @@ -36,6 +36,7 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES > endef > endif > > +ifeq ($(BR2_QT5_VERSION_5_6),y) > define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS > cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib > cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs > @@ -43,5 +44,16 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS > cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs > $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) > endef > +else > +define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS > + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib > + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib > + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs > + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs > + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick > + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick > + $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) > +endef > +endif This last part of the patch, fixing the installation for Qt5.8.0 has nothing to do with the patch subject '...enable for software renderer...' and should go to the first patch of the series or to an extra patch.... Regards, Peter > > $(eval $(generic-package)) ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 7/9] qt5quickcontrols/qt5quickcontrols2: enable for software renderer for Qt 5.8.0 2017-02-01 20:18 ` Peter Seiderer @ 2017-02-02 8:55 ` Zoltan Gyarmati 2017-02-02 18:43 ` Peter Seiderer 0 siblings, 1 reply; 39+ messages in thread From: Zoltan Gyarmati @ 2017-02-02 8:55 UTC (permalink / raw) To: buildroot On 02/01/2017 09:18 PM, Peter Seiderer wrote: > Hello *, > > On Tue, 31 Jan 2017 08:59:09 +0100, Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> wrote: > >> From: Naumann Andreas <ANaumann@ultratronik.de> >> >> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> >> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> >> --- >> package/qt5/qt5quickcontrols/Config.in | 4 ++-- >> package/qt5/qt5quickcontrols2/Config.in | 4 ++-- >> package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 12 ++++++++++++ >> 3 files changed, 16 insertions(+), 4 deletions(-) >> >> diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in >> index 0fe8465..d1a4fa5 100644 >> --- a/package/qt5/qt5quickcontrols/Config.in >> +++ b/package/qt5/qt5quickcontrols/Config.in >> @@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS >> bool "qt5quickcontrols" >> select BR2_PACKAGE_QT5DECLARATIVE >> select BR2_PACKAGE_QT5DECLARATIVE_QUICK >> - depends on BR2_PACKAGE_QT5_GL_AVAILABLE >> + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 >> depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE >> help >> Qt is a cross-platform application and UI framework for >> @@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS >> http://qt.io >> >> comment "qt5quickcontrols needs an OpenGL-capable backend" >> - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE >> + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 >> depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE >> diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in >> index 1e57674..ea22a2b 100644 >> --- a/package/qt5/qt5quickcontrols2/Config.in >> +++ b/package/qt5/qt5quickcontrols2/Config.in >> @@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 >> bool "qt5quickcontrols2" >> select BR2_PACKAGE_QT5DECLARATIVE >> select BR2_PACKAGE_QT5DECLARATIVE_QUICK >> - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick >> + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 # qt5declarative/quick >> depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick >> help >> Qt is a cross-platform application and UI framework for >> @@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 >> http://qt.io >> >> comment "qt5quickcontrols2 needs an OpenGL-capable backend" >> - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE >> + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 >> depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE >> diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk >> index 8de7932..0ef25e2 100644 >> --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk >> +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk >> @@ -36,6 +36,7 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES >> endef >> endif >> >> +ifeq ($(BR2_QT5_VERSION_5_6),y) >> define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS >> cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib >> cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs >> @@ -43,5 +44,16 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS >> cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs >> $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) >> endef >> +else >> +define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS >> + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib >> + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib >> + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs >> + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs >> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick >> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick >> + $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) >> +endef >> +endif > This last part of the patch, fixing the installation for Qt5.8.0 has nothing to do with > the patch subject '...enable for software renderer...' and should go to the first patch > of the series or to an extra patch.... Indeed, thanks for the feedback! Did you spot anything else in the patchset? > > Regards, > Peter > > >> >> $(eval $(generic-package)) Thanks, regards, Zoltan Gyarmati https://zgyarmati.de -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: OpenPGP digital signature URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170202/63064c89/attachment.asc> ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 7/9] qt5quickcontrols/qt5quickcontrols2: enable for software renderer for Qt 5.8.0 2017-02-02 8:55 ` Zoltan Gyarmati @ 2017-02-02 18:43 ` Peter Seiderer 0 siblings, 0 replies; 39+ messages in thread From: Peter Seiderer @ 2017-02-02 18:43 UTC (permalink / raw) To: buildroot Hello Zoltan, On Thu, 2 Feb 2017 09:55:31 +0100, Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> wrote: > On 02/01/2017 09:18 PM, Peter Seiderer wrote: > > Hello *, > > > > On Tue, 31 Jan 2017 08:59:09 +0100, Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> wrote: > > > >> From: Naumann Andreas <ANaumann@ultratronik.de> > >> > >> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > >> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > >> --- > >> package/qt5/qt5quickcontrols/Config.in | 4 ++-- > >> package/qt5/qt5quickcontrols2/Config.in | 4 ++-- > >> package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 12 ++++++++++++ > >> 3 files changed, 16 insertions(+), 4 deletions(-) > >> > >> diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in > >> index 0fe8465..d1a4fa5 100644 > >> --- a/package/qt5/qt5quickcontrols/Config.in > >> +++ b/package/qt5/qt5quickcontrols/Config.in > >> @@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS > >> bool "qt5quickcontrols" > >> select BR2_PACKAGE_QT5DECLARATIVE > >> select BR2_PACKAGE_QT5DECLARATIVE_QUICK > >> - depends on BR2_PACKAGE_QT5_GL_AVAILABLE > >> + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 > >> depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > >> help > >> Qt is a cross-platform application and UI framework for > >> @@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS > >> http://qt.io > >> > >> comment "qt5quickcontrols needs an OpenGL-capable backend" > >> - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE > >> + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 > >> depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > >> diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in > >> index 1e57674..ea22a2b 100644 > >> --- a/package/qt5/qt5quickcontrols2/Config.in > >> +++ b/package/qt5/qt5quickcontrols2/Config.in > >> @@ -2,7 +2,7 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 > >> bool "qt5quickcontrols2" > >> select BR2_PACKAGE_QT5DECLARATIVE > >> select BR2_PACKAGE_QT5DECLARATIVE_QUICK > >> - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick > >> + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 # qt5declarative/quick > >> depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick > >> help > >> Qt is a cross-platform application and UI framework for > >> @@ -13,5 +13,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2 > >> http://qt.io > >> > >> comment "qt5quickcontrols2 needs an OpenGL-capable backend" > >> - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE > >> + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 > >> depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > >> diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > >> index 8de7932..0ef25e2 100644 > >> --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > >> +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > >> @@ -36,6 +36,7 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES > >> endef > >> endif > >> > >> +ifeq ($(BR2_QT5_VERSION_5_6),y) > >> define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS > >> cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib > >> cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs > >> @@ -43,5 +44,16 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS > >> cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs > >> $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) > >> endef > >> +else > >> +define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS > >> + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib > >> + cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib > >> + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs > >> + cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs > >> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick > >> + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick > >> + $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) > >> +endef > >> +endif > > This last part of the patch, fixing the installation for Qt5.8.0 has nothing to do with > > the patch subject '...enable for software renderer...' and should go to the first patch > > of the series or to an extra patch.... > > Indeed, thanks for the feedback! Did you spot anything else in the patchset? > Only the suggestion for a new subject for '[PATCH v6 4/9] Conditional revert "qt5base: install bundled fonts to target"' ([1]) and my follow up patch '[PATCH v1] libv4l: qv4l2 needs c++11 (since Qt5.7)' ([2]) needs an update for the Qt5.6/Qt5.8 selection case (coming soon).... Regards, Peter [1] http://lists.busybox.net/pipermail/buildroot/2017-January/182564.html [2] http://lists.busybox.net/pipermail/buildroot/2016-December/180086.html > > > > Regards, > > Peter > > > > > >> > >> $(eval $(generic-package)) > > Thanks, regards, > > Zoltan Gyarmati > https://zgyarmati.de > > ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati ` (6 preceding siblings ...) 2017-01-31 7:59 ` [Buildroot] [PATCH v6 7/9] qt5quickcontrols/qt5quickcontrols2: enable for software renderer for Qt 5.8.0 Zoltan Gyarmati @ 2017-01-31 7:59 ` Zoltan Gyarmati 2017-02-01 21:29 ` Thomas Petazzoni 2017-02-02 23:06 ` Arnout Vandecappelle 2017-01-31 7:59 ` [Buildroot] [PATCH v6 9/9] package/python-pyqt5: add patch to fix build with Qt 5.8.0 Zoltan Gyarmati ` (2 subsequent siblings) 10 siblings, 2 replies; 39+ messages in thread From: Zoltan Gyarmati @ 2017-01-31 7:59 UTC (permalink / raw) To: buildroot From: Naumann Andreas <ANaumann@ultratronik.de> When pyqt5 is used it's obvious that qt5 needs to be selected and configured by the user, hence we enforce it by making pyqt5 depending on qt5, rather than selecting it and depending only on the qt5 requirements. Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- package/python-pyqt5/Config.in | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/package/python-pyqt5/Config.in b/package/python-pyqt5/Config.in index 4eca68a..20ac988 100644 --- a/package/python-pyqt5/Config.in +++ b/package/python-pyqt5/Config.in @@ -1,16 +1,9 @@ -comment "python-pyqt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" - depends on !BR2_PACKAGE_QT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS +comment "python-pyqt5 needs Qt5" + depends on !BR2_PACKAGE_QT5 config BR2_PACKAGE_PYTHON_PYQT5 bool "python-pyqt5" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # qt5 - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 - depends on !BR2_STATIC_LIBS # qt5 - depends on !BR2_PACKAGE_QT # qt5 - select BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT5 select BR2_PACKAGE_PYTHON_SIP help Python bindings for Qt 5 -- 2.7.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements 2017-01-31 7:59 ` [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements Zoltan Gyarmati @ 2017-02-01 21:29 ` Thomas Petazzoni 2017-02-02 8:57 ` Zoltan Gyarmati 2017-02-02 23:06 ` Arnout Vandecappelle 1 sibling, 1 reply; 39+ messages in thread From: Thomas Petazzoni @ 2017-02-01 21:29 UTC (permalink / raw) To: buildroot Hello, On Tue, 31 Jan 2017 08:59:10 +0100, Zoltan Gyarmati wrote: > From: Naumann Andreas <ANaumann@ultratronik.de> > > When pyqt5 is used it's obvious that qt5 needs to be selected and configured > by the user, hence we enforce it by making pyqt5 depending on qt5, rather than > selecting it and depending only on the qt5 requirements. > > Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> The previous version of this patch series from Andreas was doing this change for both python-pyqt and python-pyqt5. But in your new version, you have removed Andreas patch making the change to python-pyqt, and only kept the python-pyqt5 change. Why? Due to this, the handling of python-pyqt would no longer be consistent with the one of python-pyqt5. Thanks, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements 2017-02-01 21:29 ` Thomas Petazzoni @ 2017-02-02 8:57 ` Zoltan Gyarmati 2017-02-02 11:00 ` Thomas Petazzoni 0 siblings, 1 reply; 39+ messages in thread From: Zoltan Gyarmati @ 2017-02-02 8:57 UTC (permalink / raw) To: buildroot On 02/01/2017 10:29 PM, Thomas Petazzoni wrote: > Hello, > > On Tue, 31 Jan 2017 08:59:10 +0100, Zoltan Gyarmati wrote: >> From: Naumann Andreas <ANaumann@ultratronik.de> >> >> When pyqt5 is used it's obvious that qt5 needs to be selected and configured >> by the user, hence we enforce it by making pyqt5 depending on qt5, rather than >> selecting it and depending only on the qt5 requirements. >> >> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> >> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > The previous version of this patch series from Andreas was doing this > change for both python-pyqt and python-pyqt5. But in your new version, > you have removed Andreas patch making the change to python-pyqt, and > only kept the python-pyqt5 change. Why? Due to this, the handling of > python-pyqt would no longer be consistent with the one of python-pyqt5. Ah, i was focusing on the qt5 related things, but you are right, it should be consistent, i'll add it back, thanks for noting this. Did you find any other flaw in the series? > > Thanks, > > Thomas Thanks, Zoltan Gyarmati https://zgyarmati.de -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: OpenPGP digital signature URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170202/84cc8b61/attachment.asc> ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements 2017-02-02 8:57 ` Zoltan Gyarmati @ 2017-02-02 11:00 ` Thomas Petazzoni 0 siblings, 0 replies; 39+ messages in thread From: Thomas Petazzoni @ 2017-02-02 11:00 UTC (permalink / raw) To: buildroot Hello, On Thu, 2 Feb 2017 09:57:57 +0100, Zoltan Gyarmati wrote: > Ah, i was focusing on the qt5 related things, but you are right, it > should be consistent, i'll add it back, thanks for noting this. Did you > find any other flaw in the series? I haven't looked very precisely at the rest of the series yet, so I don't have other comments. I think the review from Peter Seiderer is actually the most important one, so I'll wait for Peter to have a look :) Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements 2017-01-31 7:59 ` [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements Zoltan Gyarmati 2017-02-01 21:29 ` Thomas Petazzoni @ 2017-02-02 23:06 ` Arnout Vandecappelle 2017-02-07 8:22 ` Andreas Naumann 1 sibling, 1 reply; 39+ messages in thread From: Arnout Vandecappelle @ 2017-02-02 23:06 UTC (permalink / raw) To: buildroot On 31-01-17 08:59, Zoltan Gyarmati wrote: > From: Naumann Andreas <ANaumann@ultratronik.de> > > When pyqt5 is used it's obvious that qt5 needs to be selected and configured > by the user, hence we enforce it by making pyqt5 depending on qt5, rather than > selecting it and depending only on the qt5 requirements. I'm not so sure that this really is an improvement. Andreas, can you explain why this is needed? Regards, Arnout > > Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > --- > package/python-pyqt5/Config.in | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/package/python-pyqt5/Config.in b/package/python-pyqt5/Config.in > index 4eca68a..20ac988 100644 > --- a/package/python-pyqt5/Config.in > +++ b/package/python-pyqt5/Config.in > @@ -1,16 +1,9 @@ > -comment "python-pyqt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" > - depends on !BR2_PACKAGE_QT > - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS > +comment "python-pyqt5 needs Qt5" > + depends on !BR2_PACKAGE_QT5 > > config BR2_PACKAGE_PYTHON_PYQT5 > bool "python-pyqt5" > - depends on BR2_INSTALL_LIBSTDCPP > - depends on BR2_USE_WCHAR # qt5 > - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 > - depends on !BR2_STATIC_LIBS # qt5 > - depends on !BR2_PACKAGE_QT # qt5 > - select BR2_PACKAGE_QT5 > + depends on BR2_PACKAGE_QT5 > select BR2_PACKAGE_PYTHON_SIP > help > Python bindings for Qt 5 > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements 2017-02-02 23:06 ` Arnout Vandecappelle @ 2017-02-07 8:22 ` Andreas Naumann 0 siblings, 0 replies; 39+ messages in thread From: Andreas Naumann @ 2017-02-07 8:22 UTC (permalink / raw) To: buildroot Hi, Am 03.02.2017 um 00:06 schrieb Arnout Vandecappelle: > > > On 31-01-17 08:59, Zoltan Gyarmati wrote: >> From: Naumann Andreas <ANaumann@ultratronik.de> >> >> When pyqt5 is used it's obvious that qt5 needs to be selected and configured >> by the user, hence we enforce it by making pyqt5 depending on qt5, rather than >> selecting it and depending only on the qt5 requirements. > > I'm not so sure that this really is an improvement. Andreas, can you explain > why this is needed? Since Qt 5.7 the toolchain needs at least C++11 support so theoretically we need to add that everywhere we select Qt5. Thomas suggested that depending on rather than selecting Qt5 would simplify this. Maybe that fact should also go into the commit message. regards, Andreas > > Regards, > Arnout > >> >> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> >> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> >> --- >> package/python-pyqt5/Config.in | 13 +++---------- >> 1 file changed, 3 insertions(+), 10 deletions(-) >> >> diff --git a/package/python-pyqt5/Config.in b/package/python-pyqt5/Config.in >> index 4eca68a..20ac988 100644 >> --- a/package/python-pyqt5/Config.in >> +++ b/package/python-pyqt5/Config.in >> @@ -1,16 +1,9 @@ >> -comment "python-pyqt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" >> - depends on !BR2_PACKAGE_QT >> - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ >> - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS >> +comment "python-pyqt5 needs Qt5" >> + depends on !BR2_PACKAGE_QT5 >> >> config BR2_PACKAGE_PYTHON_PYQT5 >> bool "python-pyqt5" >> - depends on BR2_INSTALL_LIBSTDCPP >> - depends on BR2_USE_WCHAR # qt5 >> - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 >> - depends on !BR2_STATIC_LIBS # qt5 >> - depends on !BR2_PACKAGE_QT # qt5 >> - select BR2_PACKAGE_QT5 >> + depends on BR2_PACKAGE_QT5 >> select BR2_PACKAGE_PYTHON_SIP >> help >> Python bindings for Qt 5 >> > ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 9/9] package/python-pyqt5: add patch to fix build with Qt 5.8.0 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati ` (7 preceding siblings ...) 2017-01-31 7:59 ` [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements Zoltan Gyarmati @ 2017-01-31 7:59 ` Zoltan Gyarmati 2017-02-02 23:15 ` Arnout Vandecappelle 2017-02-06 15:40 ` [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Thomas Petazzoni 2017-02-07 17:08 ` Thomas Petazzoni 10 siblings, 1 reply; 39+ messages in thread From: Zoltan Gyarmati @ 2017-01-31 7:59 UTC (permalink / raw) To: buildroot Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> --- ...owOkButtonHint-and-WindowCancelButtonHint.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch diff --git a/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch new file mode 100644 index 0000000..146cce0 --- /dev/null +++ b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch @@ -0,0 +1,27 @@ +From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001 +From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> +Date: Mon, 30 Jan 2017 18:28:15 +0100 +Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from + qnamespace.sip as they are removed from qt5.8 + +Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> +--- + sip/QtCore/qnamespace.sip | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip +index 2db83b7..559f410 100644 +--- a/sip/QtCore/qnamespace.sip ++++ b/sip/QtCore/qnamespace.sip +@@ -209,8 +209,6 @@ namespace Qt + WindowContextHelpButtonHint, + WindowShadeButtonHint, + WindowStaysOnTopHint, +- WindowOkButtonHint, +- WindowCancelButtonHint, + WindowStaysOnBottomHint, + WindowCloseButtonHint, + MacWindowToolBarButtonHint, +-- +2.7.4 + -- 2.7.4 ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 9/9] package/python-pyqt5: add patch to fix build with Qt 5.8.0 2017-01-31 7:59 ` [Buildroot] [PATCH v6 9/9] package/python-pyqt5: add patch to fix build with Qt 5.8.0 Zoltan Gyarmati @ 2017-02-02 23:15 ` Arnout Vandecappelle 2017-02-06 8:57 ` Zoltan Gyarmati 0 siblings, 1 reply; 39+ messages in thread From: Arnout Vandecappelle @ 2017-02-02 23:15 UTC (permalink / raw) To: buildroot On 31-01-17 08:59, Zoltan Gyarmati wrote: > Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > --- > ...owOkButtonHint-and-WindowCancelButtonHint.patch | 27 ++++++++++++++++++++++ This is potentially problematic. What if Qt 5.6 is used? Probably it's not a big issue, it just means you can't use these two classes anymore in python, which is probably OK. Regards, Arnout > 1 file changed, 27 insertions(+) > create mode 100644 package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch > > diff --git a/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch > new file mode 100644 > index 0000000..146cce0 > --- /dev/null > +++ b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch > @@ -0,0 +1,27 @@ > +From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001 > +From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > +Date: Mon, 30 Jan 2017 18:28:15 +0100 > +Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from > + qnamespace.sip as they are removed from qt5.8 > + > +Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> > +--- > + sip/QtCore/qnamespace.sip | 2 -- > + 1 file changed, 2 deletions(-) > + > +diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip > +index 2db83b7..559f410 100644 > +--- a/sip/QtCore/qnamespace.sip > ++++ b/sip/QtCore/qnamespace.sip > +@@ -209,8 +209,6 @@ namespace Qt > + WindowContextHelpButtonHint, > + WindowShadeButtonHint, > + WindowStaysOnTopHint, > +- WindowOkButtonHint, > +- WindowCancelButtonHint, > + WindowStaysOnBottomHint, > + WindowCloseButtonHint, > + MacWindowToolBarButtonHint, > +-- > +2.7.4 > + > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 9/9] package/python-pyqt5: add patch to fix build with Qt 5.8.0 2017-02-02 23:15 ` Arnout Vandecappelle @ 2017-02-06 8:57 ` Zoltan Gyarmati 2017-02-06 13:28 ` Arnout Vandecappelle 0 siblings, 1 reply; 39+ messages in thread From: Zoltan Gyarmati @ 2017-02-06 8:57 UTC (permalink / raw) To: buildroot Dear Arnout, Peter, Thomas, ok, thanks for the feedbacks, I'll tailor together a new version in the upcoming days, regards Zoltan Gyarmati https://zgyarmati.de On 02/03/2017 12:15 AM, Arnout Vandecappelle wrote: > > On 31-01-17 08:59, Zoltan Gyarmati wrote: >> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> >> --- >> ...owOkButtonHint-and-WindowCancelButtonHint.patch | 27 ++++++++++++++++++++++ > This is potentially problematic. What if Qt 5.6 is used? > > Probably it's not a big issue, it just means you can't use these two classes > anymore in python, which is probably OK. > > Regards, > Arnout > >> 1 file changed, 27 insertions(+) >> create mode 100644 package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch >> >> diff --git a/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch >> new file mode 100644 >> index 0000000..146cce0 >> --- /dev/null >> +++ b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch >> @@ -0,0 +1,27 @@ >> +From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001 >> +From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> >> +Date: Mon, 30 Jan 2017 18:28:15 +0100 >> +Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from >> + qnamespace.sip as they are removed from qt5.8 >> + >> +Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> >> +--- >> + sip/QtCore/qnamespace.sip | 2 -- >> + 1 file changed, 2 deletions(-) >> + >> +diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip >> +index 2db83b7..559f410 100644 >> +--- a/sip/QtCore/qnamespace.sip >> ++++ b/sip/QtCore/qnamespace.sip >> +@@ -209,8 +209,6 @@ namespace Qt >> + WindowContextHelpButtonHint, >> + WindowShadeButtonHint, >> + WindowStaysOnTopHint, >> +- WindowOkButtonHint, >> +- WindowCancelButtonHint, >> + WindowStaysOnBottomHint, >> + WindowCloseButtonHint, >> + MacWindowToolBarButtonHint, >> +-- >> +2.7.4 >> + >> -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: OpenPGP digital signature URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170206/a63c157e/attachment-0001.asc> ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 9/9] package/python-pyqt5: add patch to fix build with Qt 5.8.0 2017-02-06 8:57 ` Zoltan Gyarmati @ 2017-02-06 13:28 ` Arnout Vandecappelle 0 siblings, 0 replies; 39+ messages in thread From: Arnout Vandecappelle @ 2017-02-06 13:28 UTC (permalink / raw) To: buildroot On 06-02-17 09:57, Zoltan Gyarmati wrote: > Dear Arnout, Peter, Thomas, > > > ok, thanks for the feedbacks, I'll tailor together a new version in the > upcoming days, Thomas is going to apply it now during the BR developer days, so there is no need to resend the series. If there is any patch from the series that is still problematic, Thomas will say so. Regards, Arnout -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati ` (8 preceding siblings ...) 2017-01-31 7:59 ` [Buildroot] [PATCH v6 9/9] package/python-pyqt5: add patch to fix build with Qt 5.8.0 Zoltan Gyarmati @ 2017-02-06 15:40 ` Thomas Petazzoni 2017-02-06 17:44 ` Andreas Naumann 2017-02-07 17:08 ` Thomas Petazzoni 10 siblings, 1 reply; 39+ messages in thread From: Thomas Petazzoni @ 2017-02-06 15:40 UTC (permalink / raw) To: buildroot Hello, On Tue, 31 Jan 2017 08:59:02 +0100, Zoltan Gyarmati wrote: > The Qt 5.8 config (and pyqt5) was tested on Raspberry Pi. As Arnout said we are trying to apply this patch series (or actually a subset of it). We have already fixed the comments that people have raised, and you can see the result at: http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5-bump Unfortunately, this fails to build with the following defconfig: BR2_arm=y BR2_cortex_a8=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_QT5=y BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y BR2_PACKAGE_QT5DECLARATIVE=y BR2_PACKAGE_QT5IMAGEFORMATS=y BR2_PACKAGE_QT5LOCATION=y BR2_PACKAGE_QT5MULTIMEDIA=y BR2_PACKAGE_QT5SENSORS=y BR2_PACKAGE_QT5SERIALBUS=y BR2_PACKAGE_QT5SVG=y BR2_PACKAGE_QT5TOOLS=y BR2_PACKAGE_QT5TOOLS_PIXELTOOL=y BR2_PACKAGE_QT5TOOLS_QTDIAG=y BR2_PACKAGE_QT5TOOLS_QTPATHS=y BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y BR2_PACKAGE_QT5WEBCHANNEL=y BR2_PACKAGE_QT5ENGINIO=y With the following error message during the qt5base build: Project ERROR: Library 'libpng' is not defined. Could you take our branch, and see why there is this build failure ? Note that our branch intentionally doesn't contain the OpenGL related patches of your series, because they are not ready for merging (see the comments). Thanks! Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 2017-02-06 15:40 ` [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Thomas Petazzoni @ 2017-02-06 17:44 ` Andreas Naumann 2017-02-06 20:24 ` Arnout Vandecappelle 0 siblings, 1 reply; 39+ messages in thread From: Andreas Naumann @ 2017-02-06 17:44 UTC (permalink / raw) To: buildroot Hi, first of all, thanks everybody for taking over and pushing this further. My finding on this below.. Am 06.02.2017 um 16:40 schrieb Thomas Petazzoni: > Hello, > > On Tue, 31 Jan 2017 08:59:02 +0100, Zoltan Gyarmati wrote: > >> The Qt 5.8 config (and pyqt5) was tested on Raspberry Pi. > > As Arnout said we are trying to apply this patch series (or actually a > subset of it). We have already fixed the comments that people have > raised, and you can see the result at: > > http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5-bump > > Unfortunately, this fails to build with the following defconfig: > > BR2_arm=y > BR2_cortex_a8=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_PACKAGE_QT5=y > BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y > BR2_PACKAGE_QT5DECLARATIVE=y > BR2_PACKAGE_QT5IMAGEFORMATS=y > BR2_PACKAGE_QT5LOCATION=y > BR2_PACKAGE_QT5MULTIMEDIA=y > BR2_PACKAGE_QT5SENSORS=y > BR2_PACKAGE_QT5SERIALBUS=y > BR2_PACKAGE_QT5SVG=y > BR2_PACKAGE_QT5TOOLS=y > BR2_PACKAGE_QT5TOOLS_PIXELTOOL=y > BR2_PACKAGE_QT5TOOLS_QTDIAG=y > BR2_PACKAGE_QT5TOOLS_QTPATHS=y > BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y > BR2_PACKAGE_QT5WEBCHANNEL=y > BR2_PACKAGE_QT5ENGINIO=y > > With the following error message during the qt5base build: > > Project ERROR: Library 'libpng' is not defined. > > Could you take our branch, and see why there is this build failure ? I have tried your branch and defconfig and see the same failure. Unfortunately I have no idea why it happens, I have never observed that problem. There are reports about these kind of problem, but without a hint for the real reason. https://bugreports.qt.io/browse/QTBUG-57148 https://bugreports.qt.io/browse/QTBUG-57794 After fiddling a little, I can get over it by selecting BR2_PACKAGE_QT5BASE_FONTCONFIG. Unfortunately I run out of time debugging further for now. regards, Andreas > > Note that our branch intentionally doesn't contain the OpenGL related > patches of your series, because they are not ready for merging (see the > comments). > > Thanks! > > Thomas > ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 2017-02-06 17:44 ` Andreas Naumann @ 2017-02-06 20:24 ` Arnout Vandecappelle 2017-02-06 20:36 ` Peter Seiderer 0 siblings, 1 reply; 39+ messages in thread From: Arnout Vandecappelle @ 2017-02-06 20:24 UTC (permalink / raw) To: buildroot On 06-02-17 18:44, Andreas Naumann wrote: > Hi, > > first of all, thanks everybody for taking over and pushing this further. My > finding on this below.. > > Am 06.02.2017 um 16:40 schrieb Thomas Petazzoni: >> Hello, >> >> On Tue, 31 Jan 2017 08:59:02 +0100, Zoltan Gyarmati wrote: >> >>> The Qt 5.8 config (and pyqt5) was tested on Raspberry Pi. >> >> As Arnout said we are trying to apply this patch series (or actually a >> subset of it). We have already fixed the comments that people have >> raised, and you can see the result at: >> >> http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5-bump >> >> Unfortunately, this fails to build with the following defconfig: >> >> BR2_arm=y >> BR2_cortex_a8=y >> BR2_TOOLCHAIN_EXTERNAL=y >> BR2_PACKAGE_QT5=y >> BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y >> BR2_PACKAGE_QT5DECLARATIVE=y >> BR2_PACKAGE_QT5IMAGEFORMATS=y >> BR2_PACKAGE_QT5LOCATION=y >> BR2_PACKAGE_QT5MULTIMEDIA=y >> BR2_PACKAGE_QT5SENSORS=y >> BR2_PACKAGE_QT5SERIALBUS=y >> BR2_PACKAGE_QT5SVG=y >> BR2_PACKAGE_QT5TOOLS=y >> BR2_PACKAGE_QT5TOOLS_PIXELTOOL=y >> BR2_PACKAGE_QT5TOOLS_QTDIAG=y >> BR2_PACKAGE_QT5TOOLS_QTPATHS=y >> BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y >> BR2_PACKAGE_QT5WEBCHANNEL=y >> BR2_PACKAGE_QT5ENGINIO=y >> >> With the following error message during the qt5base build: >> >> Project ERROR: Library 'libpng' is not defined. >> >> Could you take our branch, and see why there is this build failure ? > > I have tried your branch and defconfig and see the same failure. Unfortunately I > have no idea why it happens, I have never observed that problem. > > There are reports about these kind of problem, but without a hint for the real > reason. > https://bugreports.qt.io/browse/QTBUG-57148 That's something else, it happens while building the bundled freetype which we don't do. > https://bugreports.qt.io/browse/QTBUG-57794 That one looks like the same issue. > > After fiddling a little, I can get over it by selecting > BR2_PACKAGE_QT5BASE_FONTCONFIG. Unfortunately I run out of time debugging > further for now. Since it would be really nice to have Qt5.8 in 2017.02, I wouldn't mind working around it with # Not clear why this is needed, the build fails without it select BR2_PACKAGE_QT5BASE_FONTCONFIG if BR2_PACKAGE_QT5_VERSION_LATEST to BR2_PACKAGE_QT5BASE_PNG. Thomas and I looked at it as well for a little while and couldn't come up with an explanation. It would be good however to report our findings in QTBUG-57794. Regards, Arnout -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 2017-02-06 20:24 ` Arnout Vandecappelle @ 2017-02-06 20:36 ` Peter Seiderer 2017-02-06 20:54 ` Arnout Vandecappelle 0 siblings, 1 reply; 39+ messages in thread From: Peter Seiderer @ 2017-02-06 20:36 UTC (permalink / raw) To: buildroot On Mon, 6 Feb 2017 21:24:34 +0100, Arnout Vandecappelle <arnout@mind.be> wrote: > > > On 06-02-17 18:44, Andreas Naumann wrote: > > Hi, > > > > first of all, thanks everybody for taking over and pushing this further. My > > finding on this below.. > > > > Am 06.02.2017 um 16:40 schrieb Thomas Petazzoni: > >> Hello, > >> > >> On Tue, 31 Jan 2017 08:59:02 +0100, Zoltan Gyarmati wrote: > >> > >>> The Qt 5.8 config (and pyqt5) was tested on Raspberry Pi. > >> > >> As Arnout said we are trying to apply this patch series (or actually a > >> subset of it). We have already fixed the comments that people have > >> raised, and you can see the result at: > >> > >> http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5-bump > >> > >> Unfortunately, this fails to build with the following defconfig: > >> > >> BR2_arm=y > >> BR2_cortex_a8=y > >> BR2_TOOLCHAIN_EXTERNAL=y > >> BR2_PACKAGE_QT5=y > >> BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y > >> BR2_PACKAGE_QT5DECLARATIVE=y > >> BR2_PACKAGE_QT5IMAGEFORMATS=y > >> BR2_PACKAGE_QT5LOCATION=y > >> BR2_PACKAGE_QT5MULTIMEDIA=y > >> BR2_PACKAGE_QT5SENSORS=y > >> BR2_PACKAGE_QT5SERIALBUS=y > >> BR2_PACKAGE_QT5SVG=y > >> BR2_PACKAGE_QT5TOOLS=y > >> BR2_PACKAGE_QT5TOOLS_PIXELTOOL=y > >> BR2_PACKAGE_QT5TOOLS_QTDIAG=y > >> BR2_PACKAGE_QT5TOOLS_QTPATHS=y > >> BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y > >> BR2_PACKAGE_QT5WEBCHANNEL=y > >> BR2_PACKAGE_QT5ENGINIO=y > >> > >> With the following error message during the qt5base build: > >> > >> Project ERROR: Library 'libpng' is not defined. > >> > >> Could you take our branch, and see why there is this build failure ? > > > > I have tried your branch and defconfig and see the same failure. Unfortunately I > > have no idea why it happens, I have never observed that problem. > > > > There are reports about these kind of problem, but without a hint for the real > > reason. > > https://bugreports.qt.io/browse/QTBUG-57148 > > That's something else, it happens while building the bundled freetype which we > don't do. > > > https://bugreports.qt.io/browse/QTBUG-57794 > > That one looks like the same issue. > > > > > After fiddling a little, I can get over it by selecting > > BR2_PACKAGE_QT5BASE_FONTCONFIG. Unfortunately I run out of time debugging > > further for now. > > Since it would be really nice to have Qt5.8 in 2017.02, I wouldn't mind working > around it with > > # Not clear why this is needed, the build fails without it > select BR2_PACKAGE_QT5BASE_FONTCONFIG if BR2_PACKAGE_QT5_VERSION_LATEST > > to BR2_PACKAGE_QT5BASE_PNG. Thomas and I looked at it as well for a little while > and couldn't come up with an explanation. > > It would be good however to report our findings in QTBUG-57794. QTBUG-57794 points to QTBUG-58038 [1] with fix attached (see [2] and [3]), may be worth a try? Regards, Peter [1] https://bugreports.qt.io/browse/QTBUG-58038 [2] https://codereview.qt-project.org/181808 [3] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff > > Regards, > Arnout > ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 2017-02-06 20:36 ` Peter Seiderer @ 2017-02-06 20:54 ` Arnout Vandecappelle 2017-02-06 21:06 ` Peter Seiderer 0 siblings, 1 reply; 39+ messages in thread From: Arnout Vandecappelle @ 2017-02-06 20:54 UTC (permalink / raw) To: buildroot On 06-02-17 21:36, Peter Seiderer wrote: > On Mon, 6 Feb 2017 21:24:34 +0100, Arnout Vandecappelle <arnout@mind.be> wrote: > >> >> >> On 06-02-17 18:44, Andreas Naumann wrote: >>> Hi, >>> >>> first of all, thanks everybody for taking over and pushing this further. My >>> finding on this below.. >>> >>> Am 06.02.2017 um 16:40 schrieb Thomas Petazzoni: >>>> Hello, >>>> >>>> On Tue, 31 Jan 2017 08:59:02 +0100, Zoltan Gyarmati wrote: >>>> >>>>> The Qt 5.8 config (and pyqt5) was tested on Raspberry Pi. >>>> >>>> As Arnout said we are trying to apply this patch series (or actually a >>>> subset of it). We have already fixed the comments that people have >>>> raised, and you can see the result at: >>>> >>>> http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5-bump >>>> >>>> Unfortunately, this fails to build with the following defconfig: >>>> >>>> BR2_arm=y >>>> BR2_cortex_a8=y >>>> BR2_TOOLCHAIN_EXTERNAL=y >>>> BR2_PACKAGE_QT5=y >>>> BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y >>>> BR2_PACKAGE_QT5DECLARATIVE=y >>>> BR2_PACKAGE_QT5IMAGEFORMATS=y >>>> BR2_PACKAGE_QT5LOCATION=y >>>> BR2_PACKAGE_QT5MULTIMEDIA=y >>>> BR2_PACKAGE_QT5SENSORS=y >>>> BR2_PACKAGE_QT5SERIALBUS=y >>>> BR2_PACKAGE_QT5SVG=y >>>> BR2_PACKAGE_QT5TOOLS=y >>>> BR2_PACKAGE_QT5TOOLS_PIXELTOOL=y >>>> BR2_PACKAGE_QT5TOOLS_QTDIAG=y >>>> BR2_PACKAGE_QT5TOOLS_QTPATHS=y >>>> BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y >>>> BR2_PACKAGE_QT5WEBCHANNEL=y >>>> BR2_PACKAGE_QT5ENGINIO=y >>>> >>>> With the following error message during the qt5base build: >>>> >>>> Project ERROR: Library 'libpng' is not defined. >>>> >>>> Could you take our branch, and see why there is this build failure ? >>> >>> I have tried your branch and defconfig and see the same failure. Unfortunately I >>> have no idea why it happens, I have never observed that problem. >>> >>> There are reports about these kind of problem, but without a hint for the real >>> reason. >>> https://bugreports.qt.io/browse/QTBUG-57148 >> >> That's something else, it happens while building the bundled freetype which we >> don't do. >> >>> https://bugreports.qt.io/browse/QTBUG-57794 >> >> That one looks like the same issue. >> >>> >>> After fiddling a little, I can get over it by selecting >>> BR2_PACKAGE_QT5BASE_FONTCONFIG. Unfortunately I run out of time debugging >>> further for now. >> >> Since it would be really nice to have Qt5.8 in 2017.02, I wouldn't mind working >> around it with >> >> # Not clear why this is needed, the build fails without it >> select BR2_PACKAGE_QT5BASE_FONTCONFIG if BR2_PACKAGE_QT5_VERSION_LATEST >> >> to BR2_PACKAGE_QT5BASE_PNG. Thomas and I looked at it as well for a little while >> and couldn't come up with an explanation. >> >> It would be good however to report our findings in QTBUG-57794. > > QTBUG-57794 points to QTBUG-58038 [1] with fix attached (see [2] and [3]), > may be worth a try? How did I miss that reference! But that is not the correct fix for us. That fix will make sure that the bundled freetype is built when the system libpng is selected. But we of course want the system freetype, not the bundled one. QTBUG-58038 will indeed fix the build, but it's not what we want. We need to pass -system-freetype and select BR2_PACKAGE_FREETYPE. To be checked: - is this also the case for 5.6? - under which circumstances does freetype have to be selected? Regards, Arnout > > Regards, > Peter > > > [1] https://bugreports.qt.io/browse/QTBUG-58038 > [2] https://codereview.qt-project.org/181808 > [3] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff > > >> >> Regards, >> Arnout >> > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 2017-02-06 20:54 ` Arnout Vandecappelle @ 2017-02-06 21:06 ` Peter Seiderer 2017-02-06 21:09 ` Arnout Vandecappelle 0 siblings, 1 reply; 39+ messages in thread From: Peter Seiderer @ 2017-02-06 21:06 UTC (permalink / raw) To: buildroot Hello Arnout, On Mon, 6 Feb 2017 21:54:15 +0100, Arnout Vandecappelle <arnout@mind.be> wrote: > > > On 06-02-17 21:36, Peter Seiderer wrote: > > On Mon, 6 Feb 2017 21:24:34 +0100, Arnout Vandecappelle <arnout@mind.be> wrote: > > > >> > >> > >> On 06-02-17 18:44, Andreas Naumann wrote: > >>> Hi, > >>> > >>> first of all, thanks everybody for taking over and pushing this further. My > >>> finding on this below.. > >>> > >>> Am 06.02.2017 um 16:40 schrieb Thomas Petazzoni: > >>>> Hello, > >>>> > >>>> On Tue, 31 Jan 2017 08:59:02 +0100, Zoltan Gyarmati wrote: > >>>> > >>>>> The Qt 5.8 config (and pyqt5) was tested on Raspberry Pi. > >>>> > >>>> As Arnout said we are trying to apply this patch series (or actually a > >>>> subset of it). We have already fixed the comments that people have > >>>> raised, and you can see the result at: > >>>> > >>>> http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5-bump > >>>> > >>>> Unfortunately, this fails to build with the following defconfig: > >>>> > >>>> BR2_arm=y > >>>> BR2_cortex_a8=y > >>>> BR2_TOOLCHAIN_EXTERNAL=y > >>>> BR2_PACKAGE_QT5=y > >>>> BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y > >>>> BR2_PACKAGE_QT5DECLARATIVE=y > >>>> BR2_PACKAGE_QT5IMAGEFORMATS=y > >>>> BR2_PACKAGE_QT5LOCATION=y > >>>> BR2_PACKAGE_QT5MULTIMEDIA=y > >>>> BR2_PACKAGE_QT5SENSORS=y > >>>> BR2_PACKAGE_QT5SERIALBUS=y > >>>> BR2_PACKAGE_QT5SVG=y > >>>> BR2_PACKAGE_QT5TOOLS=y > >>>> BR2_PACKAGE_QT5TOOLS_PIXELTOOL=y > >>>> BR2_PACKAGE_QT5TOOLS_QTDIAG=y > >>>> BR2_PACKAGE_QT5TOOLS_QTPATHS=y > >>>> BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y > >>>> BR2_PACKAGE_QT5WEBCHANNEL=y > >>>> BR2_PACKAGE_QT5ENGINIO=y > >>>> > >>>> With the following error message during the qt5base build: > >>>> > >>>> Project ERROR: Library 'libpng' is not defined. > >>>> > >>>> Could you take our branch, and see why there is this build failure ? > >>> > >>> I have tried your branch and defconfig and see the same failure. Unfortunately I > >>> have no idea why it happens, I have never observed that problem. > >>> > >>> There are reports about these kind of problem, but without a hint for the real > >>> reason. > >>> https://bugreports.qt.io/browse/QTBUG-57148 > >> > >> That's something else, it happens while building the bundled freetype which we > >> don't do. > >> > >>> https://bugreports.qt.io/browse/QTBUG-57794 > >> > >> That one looks like the same issue. > >> > >>> > >>> After fiddling a little, I can get over it by selecting > >>> BR2_PACKAGE_QT5BASE_FONTCONFIG. Unfortunately I run out of time debugging > >>> further for now. > >> > >> Since it would be really nice to have Qt5.8 in 2017.02, I wouldn't mind working > >> around it with > >> > >> # Not clear why this is needed, the build fails without it > >> select BR2_PACKAGE_QT5BASE_FONTCONFIG if BR2_PACKAGE_QT5_VERSION_LATEST > >> > >> to BR2_PACKAGE_QT5BASE_PNG. Thomas and I looked at it as well for a little while > >> and couldn't come up with an explanation. > >> > >> It would be good however to report our findings in QTBUG-57794. > > > > QTBUG-57794 points to QTBUG-58038 [1] with fix attached (see [2] and [3]), > > may be worth a try? > > How did I miss that reference! > And the patche worked for me with the given defconfig... > But that is not the correct fix for us. That fix will make sure that the > bundled freetype is built when the system libpng is selected. But we of course > want the system freetype, not the bundled one. QTBUG-58038 will indeed fix the > build, but it's not what we want. We need to pass -system-freetype and select > BR2_PACKAGE_FREETYPE. I think this would be another improvement fix/patch (can be done on top of the patchset)? System freetype is not used at the moment (not for 5.6 and 5.8)... Regards, Peter > > To be checked: > > - is this also the case for 5.6? > > - under which circumstances does freetype have to be selected? > > Regards, > Arnout > > > > > Regards, > > Peter > > > > > > [1] https://bugreports.qt.io/browse/QTBUG-58038 > > [2] https://codereview.qt-project.org/181808 > > [3] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff > > > > > >> > >> Regards, > >> Arnout > >> > > > ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 2017-02-06 21:06 ` Peter Seiderer @ 2017-02-06 21:09 ` Arnout Vandecappelle 2017-02-06 21:27 ` Peter Seiderer 0 siblings, 1 reply; 39+ messages in thread From: Arnout Vandecappelle @ 2017-02-06 21:09 UTC (permalink / raw) To: buildroot On 06-02-17 22:06, Peter Seiderer wrote: > Hello Arnout, > > On Mon, 6 Feb 2017 21:54:15 +0100, Arnout Vandecappelle <arnout@mind.be> wrote: > >> >> >> On 06-02-17 21:36, Peter Seiderer wrote: >>> On Mon, 6 Feb 2017 21:24:34 +0100, Arnout Vandecappelle <arnout@mind.be> wrote: >>> >>>> >>>> >>>> On 06-02-17 18:44, Andreas Naumann wrote: >>>>> Hi, >>>>> >>>>> first of all, thanks everybody for taking over and pushing this further. My >>>>> finding on this below.. >>>>> >>>>> Am 06.02.2017 um 16:40 schrieb Thomas Petazzoni: >>>>>> Hello, >>>>>> >>>>>> On Tue, 31 Jan 2017 08:59:02 +0100, Zoltan Gyarmati wrote: >>>>>> >>>>>>> The Qt 5.8 config (and pyqt5) was tested on Raspberry Pi. >>>>>> >>>>>> As Arnout said we are trying to apply this patch series (or actually a >>>>>> subset of it). We have already fixed the comments that people have >>>>>> raised, and you can see the result at: >>>>>> >>>>>> http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5-bump >>>>>> >>>>>> Unfortunately, this fails to build with the following defconfig: >>>>>> >>>>>> BR2_arm=y >>>>>> BR2_cortex_a8=y >>>>>> BR2_TOOLCHAIN_EXTERNAL=y >>>>>> BR2_PACKAGE_QT5=y >>>>>> BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y >>>>>> BR2_PACKAGE_QT5DECLARATIVE=y >>>>>> BR2_PACKAGE_QT5IMAGEFORMATS=y >>>>>> BR2_PACKAGE_QT5LOCATION=y >>>>>> BR2_PACKAGE_QT5MULTIMEDIA=y >>>>>> BR2_PACKAGE_QT5SENSORS=y >>>>>> BR2_PACKAGE_QT5SERIALBUS=y >>>>>> BR2_PACKAGE_QT5SVG=y >>>>>> BR2_PACKAGE_QT5TOOLS=y >>>>>> BR2_PACKAGE_QT5TOOLS_PIXELTOOL=y >>>>>> BR2_PACKAGE_QT5TOOLS_QTDIAG=y >>>>>> BR2_PACKAGE_QT5TOOLS_QTPATHS=y >>>>>> BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y >>>>>> BR2_PACKAGE_QT5WEBCHANNEL=y >>>>>> BR2_PACKAGE_QT5ENGINIO=y >>>>>> >>>>>> With the following error message during the qt5base build: >>>>>> >>>>>> Project ERROR: Library 'libpng' is not defined. >>>>>> >>>>>> Could you take our branch, and see why there is this build failure ? >>>>> >>>>> I have tried your branch and defconfig and see the same failure. Unfortunately I >>>>> have no idea why it happens, I have never observed that problem. >>>>> >>>>> There are reports about these kind of problem, but without a hint for the real >>>>> reason. >>>>> https://bugreports.qt.io/browse/QTBUG-57148 >>>> >>>> That's something else, it happens while building the bundled freetype which we >>>> don't do. >>>> >>>>> https://bugreports.qt.io/browse/QTBUG-57794 >>>> >>>> That one looks like the same issue. >>>> >>>>> >>>>> After fiddling a little, I can get over it by selecting >>>>> BR2_PACKAGE_QT5BASE_FONTCONFIG. Unfortunately I run out of time debugging >>>>> further for now. >>>> >>>> Since it would be really nice to have Qt5.8 in 2017.02, I wouldn't mind working >>>> around it with >>>> >>>> # Not clear why this is needed, the build fails without it >>>> select BR2_PACKAGE_QT5BASE_FONTCONFIG if BR2_PACKAGE_QT5_VERSION_LATEST >>>> >>>> to BR2_PACKAGE_QT5BASE_PNG. Thomas and I looked at it as well for a little while >>>> and couldn't come up with an explanation. >>>> >>>> It would be good however to report our findings in QTBUG-57794. >>> >>> QTBUG-57794 points to QTBUG-58038 [1] with fix attached (see [2] and [3]), >>> may be worth a try? >> >> How did I miss that reference! >> > > And the patche worked for me with the given defconfig... > >> But that is not the correct fix for us. That fix will make sure that the >> bundled freetype is built when the system libpng is selected. But we of course >> want the system freetype, not the bundled one. QTBUG-58038 will indeed fix the >> build, but it's not what we want. We need to pass -system-freetype and select >> BR2_PACKAGE_FREETYPE. > > I think this would be another improvement fix/patch (can be done on top of the > patchset)? So what you propose is to first commit 5.8 with the patch from QTBUG-58038, and subsequently add -system-freetype and remove the patch again? Regards, Arnout > System freetype is not used at the moment (not for 5.6 and 5.8)... -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 2017-02-06 21:09 ` Arnout Vandecappelle @ 2017-02-06 21:27 ` Peter Seiderer 0 siblings, 0 replies; 39+ messages in thread From: Peter Seiderer @ 2017-02-06 21:27 UTC (permalink / raw) To: buildroot Hello Arnout, On Mon, 6 Feb 2017 22:09:21 +0100, Arnout Vandecappelle <arnout@mind.be> wrote: > > > On 06-02-17 22:06, Peter Seiderer wrote: > > Hello Arnout, > > > > On Mon, 6 Feb 2017 21:54:15 +0100, Arnout Vandecappelle <arnout@mind.be> wrote: > > > >> > >> > >> On 06-02-17 21:36, Peter Seiderer wrote: > >>> On Mon, 6 Feb 2017 21:24:34 +0100, Arnout Vandecappelle <arnout@mind.be> wrote: > >>> > >>>> > >>>> > >>>> On 06-02-17 18:44, Andreas Naumann wrote: > >>>>> Hi, > >>>>> > >>>>> first of all, thanks everybody for taking over and pushing this further. My > >>>>> finding on this below.. > >>>>> > >>>>> Am 06.02.2017 um 16:40 schrieb Thomas Petazzoni: > >>>>>> Hello, > >>>>>> > >>>>>> On Tue, 31 Jan 2017 08:59:02 +0100, Zoltan Gyarmati wrote: > >>>>>> > >>>>>>> The Qt 5.8 config (and pyqt5) was tested on Raspberry Pi. > >>>>>> > >>>>>> As Arnout said we are trying to apply this patch series (or actually a > >>>>>> subset of it). We have already fixed the comments that people have > >>>>>> raised, and you can see the result at: > >>>>>> > >>>>>> http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5-bump > >>>>>> > >>>>>> Unfortunately, this fails to build with the following defconfig: > >>>>>> > >>>>>> BR2_arm=y > >>>>>> BR2_cortex_a8=y > >>>>>> BR2_TOOLCHAIN_EXTERNAL=y > >>>>>> BR2_PACKAGE_QT5=y > >>>>>> BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y > >>>>>> BR2_PACKAGE_QT5DECLARATIVE=y > >>>>>> BR2_PACKAGE_QT5IMAGEFORMATS=y > >>>>>> BR2_PACKAGE_QT5LOCATION=y > >>>>>> BR2_PACKAGE_QT5MULTIMEDIA=y > >>>>>> BR2_PACKAGE_QT5SENSORS=y > >>>>>> BR2_PACKAGE_QT5SERIALBUS=y > >>>>>> BR2_PACKAGE_QT5SVG=y > >>>>>> BR2_PACKAGE_QT5TOOLS=y > >>>>>> BR2_PACKAGE_QT5TOOLS_PIXELTOOL=y > >>>>>> BR2_PACKAGE_QT5TOOLS_QTDIAG=y > >>>>>> BR2_PACKAGE_QT5TOOLS_QTPATHS=y > >>>>>> BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y > >>>>>> BR2_PACKAGE_QT5WEBCHANNEL=y > >>>>>> BR2_PACKAGE_QT5ENGINIO=y > >>>>>> > >>>>>> With the following error message during the qt5base build: > >>>>>> > >>>>>> Project ERROR: Library 'libpng' is not defined. > >>>>>> > >>>>>> Could you take our branch, and see why there is this build failure ? > >>>>> > >>>>> I have tried your branch and defconfig and see the same failure. Unfortunately I > >>>>> have no idea why it happens, I have never observed that problem. > >>>>> > >>>>> There are reports about these kind of problem, but without a hint for the real > >>>>> reason. > >>>>> https://bugreports.qt.io/browse/QTBUG-57148 > >>>> > >>>> That's something else, it happens while building the bundled freetype which we > >>>> don't do. > >>>> > >>>>> https://bugreports.qt.io/browse/QTBUG-57794 > >>>> > >>>> That one looks like the same issue. > >>>> > >>>>> > >>>>> After fiddling a little, I can get over it by selecting > >>>>> BR2_PACKAGE_QT5BASE_FONTCONFIG. Unfortunately I run out of time debugging > >>>>> further for now. > >>>> > >>>> Since it would be really nice to have Qt5.8 in 2017.02, I wouldn't mind working > >>>> around it with > >>>> > >>>> # Not clear why this is needed, the build fails without it > >>>> select BR2_PACKAGE_QT5BASE_FONTCONFIG if BR2_PACKAGE_QT5_VERSION_LATEST > >>>> > >>>> to BR2_PACKAGE_QT5BASE_PNG. Thomas and I looked at it as well for a little while > >>>> and couldn't come up with an explanation. > >>>> > >>>> It would be good however to report our findings in QTBUG-57794. > >>> > >>> QTBUG-57794 points to QTBUG-58038 [1] with fix attached (see [2] and [3]), > >>> may be worth a try? > >> > >> How did I miss that reference! > >> > > > > And the patche worked for me with the given defconfig... > > > >> But that is not the correct fix for us. That fix will make sure that the > >> bundled freetype is built when the system libpng is selected. But we of course > >> want the system freetype, not the bundled one. QTBUG-58038 will indeed fix the > >> build, but it's not what we want. We need to pass -system-freetype and select > >> BR2_PACKAGE_FREETYPE. > > > > I think this would be another improvement fix/patch (can be done on top of the > > patchset)? > > So what you propose is to first commit 5.8 with the patch from QTBUG-58038, and > subsequently add -system-freetype and remove the patch again? > Yes (and no need to remove the patch which fixes a real problem with compiling the bundled freetype library and can for sure be removed with the next version bump to 5.8.1). It is not the cleanest thing to do but fixes the build problem... Changing from bundled freetype to system freetype is a real enhancement of the buildroot qt5base package (bundled freetype-2.6.1, system freetype-2.7.1) and should be done in an extra patch (even if it fixes/avoids the bundled compile problem)? For some other libs (eg. sqlite) buildroot supports the system vs. bundled option....in case we support this for freetype the patch needed too... Regards, Peter > Regards, > Arnout > > > System freetype is not used at the moment (not for 5.6 and 5.8)... > ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati ` (9 preceding siblings ...) 2017-02-06 15:40 ` [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Thomas Petazzoni @ 2017-02-07 17:08 ` Thomas Petazzoni 2017-02-07 17:21 ` Zoltan Gyarmati 10 siblings, 1 reply; 39+ messages in thread From: Thomas Petazzoni @ 2017-02-07 17:08 UTC (permalink / raw) To: buildroot Andreas, Zoltan, Peter, First of all, thanks a lot for all your work on Qt5. Qt is definitely a very important package in Buildroot, so it's great to have a group of contributors taking care of it. On Tue, 31 Jan 2017 08:59:02 +0100, Zoltan Gyarmati wrote: > Julien Corjon (3): > qt5enginio : move into legacy compatibility > qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview I've applied those two patches. However, I am not entirely happy with them, because the status of each module (tech preview, legacy) actually depends on whether you consider Qt 5.6 or 5.8. So maybe we should remove this classification entirely, and instead document the status of each module in their Config.in help text. This way, we can say in the help text: "This module is considered tech preview in Qt 5.6, but is in the core Qt since 5.8", etc. Could one of you work on this? It should be an easy thing. > Conditional revert "qt5base: install bundled fonts to target" This commit is applied. > Naumann Andreas (6): > qt5: add choice between version 5.6.2 and 5.8.0 This is applied, with a number of changes: [Thomas: - tweak commit log about GStreamer related changes, suggested by Arnout - move the gcc 4.8 dependency from the main qt5 option to just the qt5.8 selection, so that qt5.6 can still be built if gcc < 4.8 is used. Noticed by Arnout. - rename the options of the version selection to not include the version number itself so that we don't have to keep legacy symbols. Noticed by Arnout. - introduce changes to qt5quickcontrols2.mk needed to handle qt5.6 vs. qt5.8, borrowed from a later patch in the series. - add patch for python-pyqt5 to fix the build with Qt 5.8. - add fix to libv4l.mk from Peter Seiderer to fix the build with Qt 5.8. - renumber patches for 5.6.2, suggested by Arnout.] > qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 This is not applied, as there were still some comments. Could you address them and resubmit an updated version? > qt5quickcontrols: More deterministic target install Applied. > qt5quickcontrols/qt5quickcontrols2: enable for software renderer for > Qt 5.8.0 Not applied, it's related to "qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0". > python-pyqt5: Depend directly on Qt5 rather than its toolchain > requirements Applied, ans also the corresponding python-pyqt change. > python-pyqt5: Fix for Qt 5.8.0 Applied, but merged into the 5.8 bump, since it's needed. I've also merged into the same commit the freetype related build fix from Peter Seiderer, and the v4l2 fix also from Peter. Could you monitor the autobuilders in the next few days and see if Qt related issues pop up? We really wanted to have Qt 5.8 in 2017.02, for which we will release rc1 in a few days. It was a bit of a risky decision, so we hope that we won't have too many build issues following this bump. And if we do, that we'll have your help to fix them up :-) Thanks again! Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 2017-02-07 17:08 ` Thomas Petazzoni @ 2017-02-07 17:21 ` Zoltan Gyarmati 0 siblings, 0 replies; 39+ messages in thread From: Zoltan Gyarmati @ 2017-02-07 17:21 UTC (permalink / raw) To: buildroot Dear All, On 02/07/2017 06:08 PM, Thomas Petazzoni wrote: > Andreas, Zoltan, Peter, > > First of all, thanks a lot for all your work on Qt5. Qt is definitely a > very important package in Buildroot, so it's great to have a group of > contributors taking care of it. > > On Tue, 31 Jan 2017 08:59:02 +0100, Zoltan Gyarmati wrote: > >> Julien Corjon (3): >> qt5enginio : move into legacy compatibility >> qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview > I've applied those two patches. However, I am not entirely happy with > them, because the status of each module (tech preview, legacy) actually > depends on whether you consider Qt 5.6 or 5.8. So maybe we should > remove this classification entirely, and instead document the status of > each module in their Config.in help text. This way, we can say in the > help text: "This module is considered tech preview in Qt 5.6, but is in > the core Qt since 5.8", etc. > > Could one of you work on this? It should be an easy thing. I can take this, together with the per module config help texts proposed by Arnout. Expect this patchset by tomorrow morning. > >> Conditional revert "qt5base: install bundled fonts to target" > This commit is applied. > >> Naumann Andreas (6): >> qt5: add choice between version 5.6.2 and 5.8.0 > This is applied, with a number of changes: > > [Thomas: > - tweak commit log about GStreamer related changes, suggested by Arnout > - move the gcc 4.8 dependency from the main qt5 option to just the > qt5.8 selection, so that qt5.6 can still be built if gcc < 4.8 is > used. Noticed by Arnout. > - rename the options of the version selection to not include the > version number itself so that we don't have to keep legacy > symbols. Noticed by Arnout. > - introduce changes to qt5quickcontrols2.mk needed to handle qt5.6 > vs. qt5.8, borrowed from a later patch in the series. > - add patch for python-pyqt5 to fix the build with Qt 5.8. > - add fix to libv4l.mk from Peter Seiderer to fix the build with Qt > 5.8. > - renumber patches for 5.6.2, suggested by Arnout.] > >> qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 > This is not applied, as there were still some comments. Could you > address them and resubmit an updated version? > >> qt5quickcontrols: More deterministic target install > Applied. > >> qt5quickcontrols/qt5quickcontrols2: enable for software renderer for >> Qt 5.8.0 > Not applied, it's related to "qt5declarative: enable Quick for non-GL > platforms for Qt 5.8.0". > >> python-pyqt5: Depend directly on Qt5 rather than its toolchain >> requirements > Applied, ans also the corresponding python-pyqt change. > >> python-pyqt5: Fix for Qt 5.8.0 > Applied, but merged into the 5.8 bump, since it's needed. I've also > merged into the same commit the freetype related build fix from Peter > Seiderer, and the v4l2 fix also from Peter. > > Could you monitor the autobuilders in the next few days and see if Qt > related issues pop up? Yep, > > We really wanted to have Qt 5.8 in 2017.02, for which we will release > rc1 in a few days. It was a bit of a risky decision, so we hope that we > won't have too many build issues following this bump. And if we do, > that we'll have your help to fix them up :-) > > Thanks again! > > Thomas Thanks, Zoltan Gyarmati https://zgyarmati.de -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: OpenPGP digital signature URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170207/28596dd3/attachment.asc> ^ permalink raw reply [flat|nested] 39+ messages in thread
end of thread, other threads:[~2017-02-07 17:21 UTC | newest] Thread overview: 39+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-01-31 7:59 [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Zoltan Gyarmati 2017-01-31 7:59 ` [Buildroot] [PATCH v6 1/9] qt5: add choice between version 5.6.2 and 5.8.0 Zoltan Gyarmati 2017-02-02 19:31 ` Peter Seiderer 2017-02-06 13:32 ` Arnout Vandecappelle 2017-02-02 22:01 ` Arnout Vandecappelle 2017-01-31 7:59 ` [Buildroot] [PATCH v6 2/9] qt5enginio : move into legacy compatibility Zoltan Gyarmati 2017-02-06 13:51 ` Arnout Vandecappelle 2017-01-31 7:59 ` [Buildroot] [PATCH v6 3/9] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview Zoltan Gyarmati 2017-01-31 7:59 ` [Buildroot] [PATCH v6 4/9] Conditional revert "qt5base: install bundled fonts to target" Zoltan Gyarmati 2017-01-31 7:59 ` [Buildroot] [PATCH v6 5/9] qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 Zoltan Gyarmati 2017-02-02 22:20 ` Arnout Vandecappelle 2017-02-07 8:41 ` Andreas Naumann 2017-02-07 9:39 ` Zoltan Gyarmati 2017-02-07 9:54 ` Andreas Naumann 2017-01-31 7:59 ` [Buildroot] [PATCH v6 6/9] qt5quickcontrols: More deterministic target install Zoltan Gyarmati 2017-01-31 7:59 ` [Buildroot] [PATCH v6 7/9] qt5quickcontrols/qt5quickcontrols2: enable for software renderer for Qt 5.8.0 Zoltan Gyarmati 2017-02-01 20:18 ` Peter Seiderer 2017-02-02 8:55 ` Zoltan Gyarmati 2017-02-02 18:43 ` Peter Seiderer 2017-01-31 7:59 ` [Buildroot] [PATCH v6 8/9] python-pyqt5: Depend directly on Qt5 rather than its toolchain requirements Zoltan Gyarmati 2017-02-01 21:29 ` Thomas Petazzoni 2017-02-02 8:57 ` Zoltan Gyarmati 2017-02-02 11:00 ` Thomas Petazzoni 2017-02-02 23:06 ` Arnout Vandecappelle 2017-02-07 8:22 ` Andreas Naumann 2017-01-31 7:59 ` [Buildroot] [PATCH v6 9/9] package/python-pyqt5: add patch to fix build with Qt 5.8.0 Zoltan Gyarmati 2017-02-02 23:15 ` Arnout Vandecappelle 2017-02-06 8:57 ` Zoltan Gyarmati 2017-02-06 13:28 ` Arnout Vandecappelle 2017-02-06 15:40 ` [Buildroot] [PATCH v6 0/9] bump/choice for qt 5.8.0 Thomas Petazzoni 2017-02-06 17:44 ` Andreas Naumann 2017-02-06 20:24 ` Arnout Vandecappelle 2017-02-06 20:36 ` Peter Seiderer 2017-02-06 20:54 ` Arnout Vandecappelle 2017-02-06 21:06 ` Peter Seiderer 2017-02-06 21:09 ` Arnout Vandecappelle 2017-02-06 21:27 ` Peter Seiderer 2017-02-07 17:08 ` Thomas Petazzoni 2017-02-07 17:21 ` Zoltan Gyarmati
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.