* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc
@ 2016-12-13 14:59 Andreas Naumann
2016-12-13 14:59 ` [Buildroot] [PATCH v3 1/7] qt5: Remove all hashes Andreas Naumann
` (8 more replies)
0 siblings, 9 replies; 41+ messages in thread
From: Andreas Naumann @ 2016-12-13 14:59 UTC (permalink / raw)
To: buildroot
This is a rework of Julien and my previous work with the -rc version, which
now is available as a snapshot.
I have tried to adress the comments given by Julien and Arnout. In addition I
updated the license stuff, hope that this is correct.
As a result of https://bugreports.qt.io/browse/QTBUG-57039, I could make the
patch for directfb slightly smaller. However for non GL platforms there is
still an issue (QTBUG-57176).
A new change is the removal of gstreamer config-options in qt5base since this
is now completely done in qtmultimedia.
Andreas Naumann (4):
qt5: Remove all hashes
qt5: bump to 5.8.0-rc
qt5declarative: enable Quick for non-GL platforms
qt5quickcontrols1/2: enable for software renderer
Julien Corjon (3):
qt5enginio : move into legacy compatibility
qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview
Revert "qt5base: install bundled fonts to target"
package/qt5/Config.in | 14 +++----
package/qt5/qt5.mk | 6 +--
package/qt5/qt53d/qt53d.hash | 2 -
.../0001-directfb-Fix-for-non-GL-platform.patch | 39 +++++++++++++++++++
.../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ----------------------
package/qt5/qt5base/qt5base.hash | 2 -
package/qt5/qt5base/qt5base.mk | 24 ++----------
package/qt5/qt5canvas3d/qt5canvas3d.hash | 2 -
package/qt5/qt5connectivity/qt5connectivity.hash | 2 -
package/qt5/qt5connectivity/qt5connectivity.mk | 4 +-
package/qt5/qt5declarative/Config.in | 6 +--
package/qt5/qt5declarative/qt5declarative.hash | 2 -
package/qt5/qt5declarative/qt5declarative.mk | 4 +-
package/qt5/qt5enginio/qt5enginio.hash | 2 -
.../qt5graphicaleffects/qt5graphicaleffects.hash | 2 -
.../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 +-
package/qt5/qt5imageformats/qt5imageformats.hash | 2 -
package/qt5/qt5imageformats/qt5imageformats.mk | 4 +-
package/qt5/qt5location/qt5location.hash | 2 -
package/qt5/qt5location/qt5location.mk | 4 +-
package/qt5/qt5multimedia/qt5multimedia.hash | 2 -
package/qt5/qt5multimedia/qt5multimedia.mk | 7 +++-
package/qt5/qt5quickcontrols/Config.in | 4 --
package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 -
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 ++-
package/qt5/qt5quickcontrols2/Config.in | 4 --
.../qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 -
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 8 ++--
package/qt5/qt5script/qt5script.hash | 2 -
package/qt5/qt5sensors/qt5sensors.hash | 2 -
package/qt5/qt5sensors/qt5sensors.mk | 4 +-
package/qt5/qt5serialbus/qt5serialbus.hash | 2 -
package/qt5/qt5serialport/qt5serialport.hash | 2 -
package/qt5/qt5serialport/qt5serialport.mk | 4 +-
package/qt5/qt5svg/qt5svg.hash | 2 -
package/qt5/qt5svg/qt5svg.mk | 4 +-
package/qt5/qt5tools/qt5tools.hash | 2 -
package/qt5/qt5tools/qt5tools.mk | 4 +-
package/qt5/qt5webchannel/qt5webchannel.hash | 2 -
package/qt5/qt5webchannel/qt5webchannel.mk | 4 +-
...004-Remove-unused-check-for-private_tests.patch | 40 +++++++++++++++++++
package/qt5/qt5webkit/qt5webkit.hash | 2 -
package/qt5/qt5websockets/qt5websockets.hash | 2 -
package/qt5/qt5websockets/qt5websockets.mk | 4 +-
package/qt5/qt5x11extras/qt5x11extras.hash | 2 -
package/qt5/qt5x11extras/qt5x11extras.mk | 4 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 -
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 +-
48 files changed, 133 insertions(+), 167 deletions(-)
delete mode 100644 package/qt5/qt53d/qt53d.hash
create mode 100644 package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch
delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
delete mode 100644 package/qt5/qt5base/qt5base.hash
delete mode 100644 package/qt5/qt5canvas3d/qt5canvas3d.hash
delete mode 100644 package/qt5/qt5connectivity/qt5connectivity.hash
delete mode 100644 package/qt5/qt5declarative/qt5declarative.hash
delete mode 100644 package/qt5/qt5enginio/qt5enginio.hash
delete mode 100644 package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
delete mode 100644 package/qt5/qt5imageformats/qt5imageformats.hash
delete mode 100644 package/qt5/qt5location/qt5location.hash
delete mode 100644 package/qt5/qt5multimedia/qt5multimedia.hash
delete mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.hash
delete mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
delete mode 100644 package/qt5/qt5script/qt5script.hash
delete mode 100644 package/qt5/qt5sensors/qt5sensors.hash
delete mode 100644 package/qt5/qt5serialbus/qt5serialbus.hash
delete mode 100644 package/qt5/qt5serialport/qt5serialport.hash
delete mode 100644 package/qt5/qt5svg/qt5svg.hash
delete mode 100644 package/qt5/qt5tools/qt5tools.hash
delete mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash
create mode 100644 package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch
delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash
delete mode 100644 package/qt5/qt5websockets/qt5websockets.hash
delete mode 100644 package/qt5/qt5x11extras/qt5x11extras.hash
delete mode 100644 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
--
1.9.1
^ permalink raw reply [flat|nested] 41+ messages in thread* [Buildroot] [PATCH v3 1/7] qt5: Remove all hashes 2016-12-13 14:59 [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Andreas Naumann @ 2016-12-13 14:59 ` Andreas Naumann 2016-12-13 15:50 ` Thomas Petazzoni 2016-12-13 14:59 ` [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc Andreas Naumann ` (7 subsequent siblings) 8 siblings, 1 reply; 41+ messages in thread From: Andreas Naumann @ 2016-12-13 14:59 UTC (permalink / raw) To: buildroot Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> --- package/qt5/qt53d/qt53d.hash | 2 -- package/qt5/qt5base/qt5base.hash | 2 -- package/qt5/qt5canvas3d/qt5canvas3d.hash | 2 -- package/qt5/qt5connectivity/qt5connectivity.hash | 2 -- package/qt5/qt5declarative/qt5declarative.hash | 2 -- package/qt5/qt5enginio/qt5enginio.hash | 2 -- package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 -- package/qt5/qt5imageformats/qt5imageformats.hash | 2 -- package/qt5/qt5location/qt5location.hash | 2 -- package/qt5/qt5multimedia/qt5multimedia.hash | 2 -- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 -- package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 -- package/qt5/qt5script/qt5script.hash | 2 -- package/qt5/qt5sensors/qt5sensors.hash | 2 -- package/qt5/qt5serialbus/qt5serialbus.hash | 2 -- package/qt5/qt5serialport/qt5serialport.hash | 2 -- package/qt5/qt5svg/qt5svg.hash | 2 -- package/qt5/qt5tools/qt5tools.hash | 2 -- package/qt5/qt5webchannel/qt5webchannel.hash | 2 -- package/qt5/qt5webkit/qt5webkit.hash | 2 -- package/qt5/qt5websockets/qt5websockets.hash | 2 -- package/qt5/qt5x11extras/qt5x11extras.hash | 2 -- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 -- 23 files changed, 46 deletions(-) delete mode 100644 package/qt5/qt53d/qt53d.hash delete mode 100644 package/qt5/qt5base/qt5base.hash delete mode 100644 package/qt5/qt5canvas3d/qt5canvas3d.hash delete mode 100644 package/qt5/qt5connectivity/qt5connectivity.hash delete mode 100644 package/qt5/qt5declarative/qt5declarative.hash delete mode 100644 package/qt5/qt5enginio/qt5enginio.hash delete mode 100644 package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash delete mode 100644 package/qt5/qt5imageformats/qt5imageformats.hash delete mode 100644 package/qt5/qt5location/qt5location.hash delete mode 100644 package/qt5/qt5multimedia/qt5multimedia.hash delete mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.hash delete mode 100644 package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash delete mode 100644 package/qt5/qt5script/qt5script.hash delete mode 100644 package/qt5/qt5sensors/qt5sensors.hash delete mode 100644 package/qt5/qt5serialbus/qt5serialbus.hash delete mode 100644 package/qt5/qt5serialport/qt5serialport.hash delete mode 100644 package/qt5/qt5svg/qt5svg.hash delete mode 100644 package/qt5/qt5tools/qt5tools.hash delete mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash delete mode 100644 package/qt5/qt5webkit/qt5webkit.hash delete mode 100644 package/qt5/qt5websockets/qt5websockets.hash delete mode 100644 package/qt5/qt5x11extras/qt5x11extras.hash delete mode 100644 package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash deleted file mode 100644 index 7179380..0000000 --- a/package/qt5/qt53d/qt53d.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash deleted file mode 100644 index 9808e9b..0000000 --- a/package/qt5/qt5base/qt5base.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash deleted file mode 100644 index 01819e4..0000000 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash deleted file mode 100644 index 4574f3d..0000000 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash deleted file mode 100644 index d8d3a68..0000000 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5enginio/qt5enginio.hash b/package/qt5/qt5enginio/qt5enginio.hash deleted file mode 100644 index 9951834..0000000 --- a/package/qt5/qt5enginio/qt5enginio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtenginio-opensource-src-1.6.2.tar.xz.mirrorlist -sha256 90ffc38d214a75ab0ef90a4760843f12bc073ae49c17de24c677d1d403bddcc3 qtenginio-opensource-src-1.6.2.tar.xz diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash deleted file mode 100644 index ae29e3b..0000000 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash deleted file mode 100644 index 54b58e4..0000000 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash deleted file mode 100644 index 374952f..0000000 --- a/package/qt5/qt5location/qt5location.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash deleted file mode 100644 index 56a11fb..0000000 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash deleted file mode 100644 index 6db589d..0000000 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash deleted file mode 100644 index 0d85d48..0000000 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash deleted file mode 100644 index c8ecb75..0000000 --- a/package/qt5/qt5script/qt5script.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash deleted file mode 100644 index 65cd127..0000000 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash deleted file mode 100644 index 308c365..0000000 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash deleted file mode 100644 index 2458e5d..0000000 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash deleted file mode 100644 index 0c9e9eb..0000000 --- a/package/qt5/qt5svg/qt5svg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash deleted file mode 100644 index cc11b28..0000000 --- a/package/qt5/qt5tools/qt5tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash deleted file mode 100644 index 0f9eaae..0000000 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash deleted file mode 100644 index 309f776..0000000 --- a/package/qt5/qt5webkit/qt5webkit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash deleted file mode 100644 index 3443476..0000000 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash deleted file mode 100644 index 297c578..0000000 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash deleted file mode 100644 index fa4e97f..0000000 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 -- 1.9.1 ^ permalink raw reply related [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 1/7] qt5: Remove all hashes 2016-12-13 14:59 ` [Buildroot] [PATCH v3 1/7] qt5: Remove all hashes Andreas Naumann @ 2016-12-13 15:50 ` Thomas Petazzoni 2016-12-13 16:35 ` Andreas Naumann 0 siblings, 1 reply; 41+ messages in thread From: Thomas Petazzoni @ 2016-12-13 15:50 UTC (permalink / raw) To: buildroot Hello, On Tue, 13 Dec 2016 15:59:25 +0100, Andreas Naumann wrote: > Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Why are you removing hashes? You're now using the tarballs available at http://download.qt.io/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/, so there's no reason to remove the hashes. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 1/7] qt5: Remove all hashes 2016-12-13 15:50 ` Thomas Petazzoni @ 2016-12-13 16:35 ` Andreas Naumann 0 siblings, 0 replies; 41+ messages in thread From: Andreas Naumann @ 2016-12-13 16:35 UTC (permalink / raw) To: buildroot Hi, Am 13.12.2016 um 16:50 schrieb Thomas Petazzoni: > Hello, > > On Tue, 13 Dec 2016 15:59:25 +0100, Andreas Naumann wrote: >> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > > Why are you removing hashes? You're now using the tarballs available at > http://download.qt.io/snapshots/qt/5.8/5.8.0-rc/latest_src/submodules/, > so there's no reason to remove the hashes. Unfortunately the tarballs under snapshots/.../latest_src change until they "finalize" the version. That is, when the version appears under development_releases/... for alpha/beta/rc or official_releases/... for the final release. That has not been done with rc yet, although was planned for today. So in order to work with the early version I just removed the hashes. As for your other suggestion to actually apply these patches in order to give some exposure.. I'd wait at least until the rc really is fixed (and update hashes then). regards, Andreas > > Thomas > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc 2016-12-13 14:59 [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 1/7] qt5: Remove all hashes Andreas Naumann @ 2016-12-13 14:59 ` Andreas Naumann 2016-12-13 15:53 ` Thomas Petazzoni ` (2 more replies) 2016-12-13 14:59 ` [Buildroot] [PATCH v3 3/7] qt5enginio : move into legacy compatibility Andreas Naumann ` (6 subsequent siblings) 8 siblings, 3 replies; 41+ messages in thread From: Andreas Naumann @ 2016-12-13 14:59 UTC (permalink / raw) To: buildroot - qt5 need C++11 compliant compiler since 5.7 ([1]) - updated licenses: since version 5.7 Qt removed the (L)GPL 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 obsolete config-option -large ([4]) - qt5base: remove gstreamer related config-option ([5]) - qt5base: add 001-directfb-Fix-for-non-GL-platform.patch ([6]) - qt5webkit: add 0004-Remove-unused-check-for-private_tests.patch ([7]) [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/ [4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108 [5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=7d4da559afb62a779b3d90a65fb679cb5433f203 [6] https://bugreports.qt.io/browse/QTBUG-57176 [7] https://bugreports.qt.io/browse/QTBUG-55950 Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> --- package/qt5/Config.in | 5 ++- package/qt5/qt5.mk | 6 +-- .../0001-directfb-Fix-for-non-GL-platform.patch | 39 +++++++++++++++++++ .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ---------------------- package/qt5/qt5base/qt5base.mk | 16 ++------ package/qt5/qt5connectivity/qt5connectivity.mk | 4 +- package/qt5/qt5declarative/qt5declarative.mk | 4 +- .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 +- package/qt5/qt5imageformats/qt5imageformats.mk | 4 +- package/qt5/qt5location/qt5location.mk | 4 +- package/qt5/qt5multimedia/qt5multimedia.mk | 4 +- package/qt5/qt5sensors/qt5sensors.mk | 4 +- package/qt5/qt5serialport/qt5serialport.mk | 4 +- package/qt5/qt5svg/qt5svg.mk | 4 +- package/qt5/qt5tools/qt5tools.mk | 4 +- package/qt5/qt5webchannel/qt5webchannel.mk | 4 +- ...004-Remove-unused-check-for-private_tests.patch | 40 +++++++++++++++++++ package/qt5/qt5websockets/qt5websockets.mk | 4 +- package/qt5/qt5x11extras/qt5x11extras.mk | 4 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 +- 20 files changed, 116 insertions(+), 91 deletions(-) create mode 100644 package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch create mode 100644 package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 234dfdd..77e7e09 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 diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index e937e23..8d1f568 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -1,6 +1,6 @@ -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_VERSION_MAJOR = 5.8 +QT5_VERSION = $(QT5_VERSION_MAJOR).0-rc +QT5_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch b/package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch new file mode 100644 index 0000000..54f6aca --- /dev/null +++ b/package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch @@ -0,0 +1,39 @@ +From 5c4d88e55759cc64a6fcfb9059bc480fa5a19ee2 Mon Sep 17 00:00:00 2001 +From: Andreas Naumann <anaumann@ultratronik.de> +Date: Tue, 13 Dec 2016 15:23:17 +0100 +Subject: [PATCH] directfb: Fix for non-GL platform + +directfb has generally no dependency on egl so include support for it +only in the specific case of directfb_egl. + +Task-number: QTBUG-57176 +Change-Id: I73983f2c9deb789cd19ad59576e29d56ea2dfae1 +Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> +--- + src/plugins/platforms/directfb/directfb.pro | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro +index 4e95aeb..e500d8c 100644 +--- a/src/plugins/platforms/directfb/directfb.pro ++++ b/src/plugins/platforms/directfb/directfb.pro +@@ -3,7 +3,7 @@ TARGET = qdirectfb + QT += \ + core-private gui-private \ + eventdispatcher_support-private service_support-private \ +- fontdatabase_support-private egl_support-private ++ fontdatabase_support-private + + QMAKE_USE += directfb + +@@ -28,6 +28,7 @@ HEADERS = qdirectfbintegration.h \ + + # ### port the GL context + contains(QT_CONFIG, directfb_egl) { ++ QT += egl_support-private + HEADERS += qdirectfb_egl.h + SOURCES += qdirectfb_egl.cpp + DEFINES += DIRECTFB_GL_EGL +-- +1.9.1 + 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/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 7840a6e..79ad868 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -41,12 +41,10 @@ else QT5BASE_CONFIGURE_OPTS += -release endif -QT5BASE_CONFIGURE_OPTS += -largefile - ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license -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 +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 = Commercial license QT5BASE_REDISTRIBUTE = NO @@ -153,14 +151,6 @@ 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_PACKAGE_GST1_PLUGINS_BASE),y) -QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 -QT5BASE_DEPENDENCIES += gst1-plugins-base -else -QT5BASE_CONFIGURE_OPTS += -no-gstreamer -endif - # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa @@ -170,7 +160,7 @@ 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 -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 0f7257d..6270362 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -11,8 +11,8 @@ QT5CONNECTIVITY_DEPENDENCIES = qt5base QT5CONNECTIVITY_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5CONNECTIVITY_REDISTRIBUTE = NO diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index e5a3674..5d27556 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -11,8 +11,8 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns QT5DECLARATIVE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5DECLARATIVE_REDISTRIBUTE = NO diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index 223374a..4dab74a 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -11,8 +11,8 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 921656d..52a5760 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -11,8 +11,8 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5IMAGEFORMATS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index 358b162..8708783 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -11,8 +11,8 @@ QT5LOCATION_DEPENDENCIES = qt5base QT5LOCATION_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5LOCATION_REDISTRIBUTE = NO diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index eb50ac1..e5faa4c 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -11,8 +11,8 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base QT5MULTIMEDIA_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5MULTIMEDIA_REDISTRIBUTE = NO diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index 0dd952a..035926d 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -11,8 +11,8 @@ QT5SENSORS_DEPENDENCIES = qt5base QT5SENSORS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5SENSORS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 04df021..1afb396 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -11,8 +11,8 @@ QT5SERIALPORT_DEPENDENCIES = qt5base QT5SERIALPORT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5SERIALPORT_REDISTRIBUTE = NO diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index ebd5cba..f1a1597 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -11,8 +11,8 @@ QT5SVG_DEPENDENCIES = qt5base QT5SVG_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5SVG_REDISTRIBUTE = NO diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index 6befb8b..f7749b5 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -20,8 +20,8 @@ QT5TOOLS_DEPENDENCIES += qt5declarative endif ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5TOOLS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 9e94914..1c33360 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -11,8 +11,8 @@ QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets QT5WEBCHANNEL_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5WEBCHANNEL_REDISTRIBUTE = NO diff --git a/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch b/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch new file mode 100644 index 0000000..69f4229 --- /dev/null +++ b/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch @@ -0,0 +1,40 @@ +From 646ea4ff9efb13d69428b785b4545209f1fac63d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org> +Date: Wed, 14 Sep 2016 23:51:14 +0200 +Subject: [PATCH] Remove unused check for private_tests + +It turns out that qt_developer_build is never used anyway. + +I did some git archeology and it looks like it was nuked when doing the +5.2 merge from upstream. The original purpose was apparently to control +-Werror, which is nowadays controlled by CONFIG -= production_build. + +This actually fixes the build, as the QT_FOR_CONFIG += core-private which +would have been required for qtConfig(private_tests) is missing. + +Task-number: QTBUG-55950 +Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3 + +Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> +--- + Tools/qmake/mkspecs/features/default_pre.prf | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf +index 6bb52d0..8aa806d 100644 +--- a/Tools/qmake/mkspecs/features/default_pre.prf ++++ b/Tools/qmake/mkspecs/features/default_pre.prf +@@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL + scratchbox: PYTHON = python2.6 + else: PYTHON = python + +-# We use private_tests to detect developer build, since the destdir will +-# always be our webkit build dir. This might change as configure changes. +-qtConfig(private_tests): CONFIG += qt_developer_build +- + # By default we enable "production build", and build-webkit, which is + # used by bots and developers, will disable it, to enable warnings etc. + CONFIG += production_build +-- +2.9.3 + diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index f1200c2..6580a79 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -11,8 +11,8 @@ QT5WEBSOCKETS_DEPENDENCIES = qt5base QT5WEBSOCKETS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3 -QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 +QT5WEBSOCKETS_LICENSE = GPLv2 or LGPLv3, GPLv3 with exception(tools) +QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 else QT5WEBSOCKETS_LICENSE = Commercial license QT5WEBSOCKETS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index a0e1209..53fedb2 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -11,8 +11,8 @@ QT5X11EXTRAS_DEPENDENCIES = qt5base QT5X11EXTRAS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5X11EXTRAS_REDISTRIBUTE = NO diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 31477a7..2a002f3 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -11,8 +11,8 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base QT5XMLPATTERNS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -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 +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 = Commercial license QT5XMLPATTERNS_REDISTRIBUTE = NO -- 1.9.1 ^ permalink raw reply related [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc 2016-12-13 14:59 ` [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc Andreas Naumann @ 2016-12-13 15:53 ` Thomas Petazzoni 2016-12-16 20:30 ` Peter Seiderer 2016-12-16 22:03 ` Peter Seiderer 2 siblings, 0 replies; 41+ messages in thread From: Thomas Petazzoni @ 2016-12-13 15:53 UTC (permalink / raw) To: buildroot Hello, On Tue, 13 Dec 2016 15:59:26 +0100, Andreas Naumann wrote: > 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 This new dependency needs to be propagated to places where BR2_PACKAGE_QT5 is selected: package/python-pyqt5/Config.in: select BR2_PACKAGE_QT5 However, my feeling is that python-pyqt5 should not be selecting BR2_PACKAGE_QT5. It should use "depends on BR2_PACKAGE_QT5", it makes more sense. When you want python-qt5 it's really obvious that you need Qt5, so for the user it's logical to enable Qt5 and then Python-Qt5. Bottom line: you could add a patch in your patch series that changes the python-qt5 package to use a "depends on". Thanks, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc 2016-12-13 14:59 ` [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc Andreas Naumann 2016-12-13 15:53 ` Thomas Petazzoni @ 2016-12-16 20:30 ` Peter Seiderer 2016-12-19 9:50 ` Andreas Naumann 2016-12-16 22:03 ` Peter Seiderer 2 siblings, 1 reply; 41+ messages in thread From: Peter Seiderer @ 2016-12-16 20:30 UTC (permalink / raw) To: buildroot Hello Andreas, On Tue, 13 Dec 2016 15:59:26 +0100, Andreas Naumann <anaumann@ultratronik.de> wrote: > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 7840a6e..79ad868 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -41,12 +41,10 @@ else > QT5BASE_CONFIGURE_OPTS += -release > endif > > -QT5BASE_CONFIGURE_OPTS += -largefile > - > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license > -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 > +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 = Commercial license > QT5BASE_REDISTRIBUTE = NO I think it should be 'GPLv2+ or LGPLv3' for core/qtbase, see e.g (random) source file header root/src/corelib/kernel/qabstracteventdispatcher.h ([1]): ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPL3 included in the ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or (at your option) the GNU General ** Public license version 3 or any later version approved by the KDE Free ** Qt Foundation. The licenses are as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ** included in the packaging of this file. Please review the following ** information to ensure the GNU General Public License requirements will ** be met: https://www.gnu.org/licenses/gpl-2.0.html and ** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ On the Qt website only LGPLv3 and GPLv3 are mentioned ([2]), the licenses overview image at [3] says 'GPLGv2+/LGPLv3'. The Qt examples are licensed under BSD ([4]).... Regards, Peter [1] https://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/kernel/qabstracteventdispatcher.h [2] http://doc.qt.io/qt-5/licensing.html [3] https://www.ics.com/blog/changes-qt-licensing [4] https://code.qt.io/cgit/qt/qtbase.git/tree/examples/gui/analogclock/main.cpp ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc 2016-12-16 20:30 ` Peter Seiderer @ 2016-12-19 9:50 ` Andreas Naumann 2016-12-19 20:31 ` Peter Seiderer 0 siblings, 1 reply; 41+ messages in thread From: Andreas Naumann @ 2016-12-19 9:50 UTC (permalink / raw) To: buildroot Am 16.12.2016 um 21:30 schrieb Peter Seiderer: > Hello Andreas, > > On Tue, 13 Dec 2016 15:59:26 +0100, Andreas Naumann <anaumann@ultratronik.de> wrote: > > >> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk >> index 7840a6e..79ad868 100644 >> --- a/package/qt5/qt5base/qt5base.mk >> +++ b/package/qt5/qt5base/qt5base.mk >> @@ -41,12 +41,10 @@ else >> QT5BASE_CONFIGURE_OPTS += -release >> endif >> >> -QT5BASE_CONFIGURE_OPTS += -largefile >> - >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license >> -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 >> +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 = Commercial license >> QT5BASE_REDISTRIBUTE = NO > > > I think it should be 'GPLv2+ or LGPLv3' for core/qtbase, see e.g (random) source file > header root/src/corelib/kernel/qabstracteventdispatcher.h ([1]): > > ** $QT_BEGIN_LICENSE:LGPL$ > ** Commercial License Usage > ** Licensees holding valid commercial Qt licenses may use this file in > ** accordance with the commercial license agreement provided with the > ** Software or, alternatively, in accordance with the terms contained in > ** a written agreement between you and The Qt Company. For licensing terms > ** and conditions see https://www.qt.io/terms-conditions. For further > ** information use the contact form at https://www.qt.io/contact-us. > ** > ** GNU Lesser General Public License Usage > ** Alternatively, this file may be used under the terms of the GNU Lesser > ** General Public License version 3 as published by the Free Software > ** Foundation and appearing in the file LICENSE.LGPL3 included in the > ** packaging of this file. Please review the following information to > ** ensure the GNU Lesser General Public License version 3 requirements > ** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. > ** > ** GNU General Public License Usage > ** Alternatively, this file may be used under the terms of the GNU > ** General Public License version 2.0 or (at your option) the GNU General > ** Public license version 3 or any later version approved by the KDE Free > ** Qt Foundation. The licenses are as published by the Free Software > ** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 > ** included in the packaging of this file. Please review the following > ** information to ensure the GNU General Public License requirements will > ** be met: https://www.gnu.org/licenses/gpl-2.0.html and > ** https://www.gnu.org/licenses/gpl-3.0.html. > ** > ** $QT_END_LICENSE$ Thanks for pointing that out. For my changes I mainly used the entry in dist/changes-5.7.0 and I somehow overread the words "and later" in * GNU General Public License v2.0 (LICENSE.GPL2) and later > > On the Qt website only LGPLv3 and GPLv3 are mentioned ([2]), the licenses > overview image at [3] says 'GPLGv2+/LGPLv3'. According to your posted example header we can assume the later is correct right? > > The Qt examples are licensed under BSD ([4]).... As can be seen in [2] lot of modules are licensed under BSD, MIT, Apache and so on. Do we have to list them all? regards, Andreas > > Regards, > Peter > > [1] https://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/kernel/qabstracteventdispatcher.h > [2] http://doc.qt.io/qt-5/licensing.html > [3] https://www.ics.com/blog/changes-qt-licensing > [4] https://code.qt.io/cgit/qt/qtbase.git/tree/examples/gui/analogclock/main.cpp > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc 2016-12-19 9:50 ` Andreas Naumann @ 2016-12-19 20:31 ` Peter Seiderer 0 siblings, 0 replies; 41+ messages in thread From: Peter Seiderer @ 2016-12-19 20:31 UTC (permalink / raw) To: buildroot Hello Andreas, On Mon, 19 Dec 2016 10:50:55 +0100, Andreas Naumann <dev@andin.de> wrote: > > > Am 16.12.2016 um 21:30 schrieb Peter Seiderer: > > Hello Andreas, > > > > On Tue, 13 Dec 2016 15:59:26 +0100, Andreas Naumann <anaumann@ultratronik.de> wrote: > > > > > >> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > >> index 7840a6e..79ad868 100644 > >> --- a/package/qt5/qt5base/qt5base.mk > >> +++ b/package/qt5/qt5base/qt5base.mk > >> @@ -41,12 +41,10 @@ else > >> QT5BASE_CONFIGURE_OPTS += -release > >> endif > >> > >> -QT5BASE_CONFIGURE_OPTS += -largefile > >> - > >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > >> QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license > >> -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 > >> +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 = Commercial license > >> QT5BASE_REDISTRIBUTE = NO > > > > > > I think it should be 'GPLv2+ or LGPLv3' for core/qtbase, see e.g (random) source file > > header root/src/corelib/kernel/qabstracteventdispatcher.h ([1]): > > > > ** $QT_BEGIN_LICENSE:LGPL$ > > ** Commercial License Usage > > ** Licensees holding valid commercial Qt licenses may use this file in > > ** accordance with the commercial license agreement provided with the > > ** Software or, alternatively, in accordance with the terms contained in > > ** a written agreement between you and The Qt Company. For licensing terms > > ** and conditions see https://www.qt.io/terms-conditions. For further > > ** information use the contact form at https://www.qt.io/contact-us. > > ** > > ** GNU Lesser General Public License Usage > > ** Alternatively, this file may be used under the terms of the GNU Lesser > > ** General Public License version 3 as published by the Free Software > > ** Foundation and appearing in the file LICENSE.LGPL3 included in the > > ** packaging of this file. Please review the following information to > > ** ensure the GNU Lesser General Public License version 3 requirements > > ** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. > > ** > > ** GNU General Public License Usage > > ** Alternatively, this file may be used under the terms of the GNU > > ** General Public License version 2.0 or (at your option) the GNU General > > ** Public license version 3 or any later version approved by the KDE Free > > ** Qt Foundation. The licenses are as published by the Free Software > > ** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 > > ** included in the packaging of this file. Please review the following > > ** information to ensure the GNU General Public License requirements will > > ** be met: https://www.gnu.org/licenses/gpl-2.0.html and > > ** https://www.gnu.org/licenses/gpl-3.0.html. > > ** > > ** $QT_END_LICENSE$ > > Thanks for pointing that out. For my changes I mainly used the entry in > dist/changes-5.7.0 and I somehow overread the words "and later" in > * GNU General Public License v2.0 (LICENSE.GPL2) and later > > > > > On the Qt website only LGPLv3 and GPLv3 are mentioned ([2]), the licenses > > overview image at [3] says 'GPLGv2+/LGPLv3'. > > According to your posted example header we can assume the later is > correct right? Yes, I think so... The correct lines should be (I hope without further typos from my side): 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 And just send a proposed patch to add: ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3c (examples) QT5BASE_LICENSE_FILES += header.BSD endif for the examples... > > > > > The Qt examples are licensed under BSD ([4]).... > > As can be seen in [2] lot of modules are licensed under BSD, MIT, Apache > and so on. Do we have to list them all? > I hope not at this detail level..., but I am not a lawyer..., maybe a link to the page would be helpful (even if it is only in a comment above the QT5BASE_LICENSE line)... Regards, Peter > > regards, > Andreas > > > > > > Regards, > > Peter > > > > [1] https://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/kernel/qabstracteventdispatcher.h > > [2] http://doc.qt.io/qt-5/licensing.html > > [3] https://www.ics.com/blog/changes-qt-licensing > > [4] https://code.qt.io/cgit/qt/qtbase.git/tree/examples/gui/analogclock/main.cpp > > _______________________________________________ > > buildroot mailing list > > buildroot at busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot > > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc 2016-12-13 14:59 ` [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc Andreas Naumann 2016-12-13 15:53 ` Thomas Petazzoni 2016-12-16 20:30 ` Peter Seiderer @ 2016-12-16 22:03 ` Peter Seiderer 2016-12-19 9:28 ` Andreas Naumann 2 siblings, 1 reply; 41+ messages in thread From: Peter Seiderer @ 2016-12-16 22:03 UTC (permalink / raw) To: buildroot Hello Andreas, On Tue, 13 Dec 2016 15:59:26 +0100, Andreas Naumann <anaumann@ultratronik.de> wrote: > - qt5 need C++11 compliant compiler since 5.7 ([1]) > - updated licenses: since version 5.7 Qt removed the (L)GPL 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]) Missing (for buildroot git master): - qt5base removed of 0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch (upstream committed [3b]) Regards, Peter [3b] https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp?id=f1b4bd4790860e1ff5afcec111a359bc3a91cfda > - qt5base: remove obsolete config-option -large ([4]) > - qt5base: remove gstreamer related config-option ([5]) > - qt5base: add 001-directfb-Fix-for-non-GL-platform.patch ([6]) > - qt5webkit: add 0004-Remove-unused-check-for-private_tests.patch ([7]) > > [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/ > [4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108 > [5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=7d4da559afb62a779b3d90a65fb679cb5433f203 > [6] https://bugreports.qt.io/browse/QTBUG-57176 > [7] https://bugreports.qt.io/browse/QTBUG-55950 > > Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> > --- > package/qt5/Config.in | 5 ++- > package/qt5/qt5.mk | 6 +-- > .../0001-directfb-Fix-for-non-GL-platform.patch | 39 +++++++++++++++++++ > .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ---------------------- > package/qt5/qt5base/qt5base.mk | 16 ++------ > package/qt5/qt5connectivity/qt5connectivity.mk | 4 +- > package/qt5/qt5declarative/qt5declarative.mk | 4 +- > .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 +- > package/qt5/qt5imageformats/qt5imageformats.mk | 4 +- > package/qt5/qt5location/qt5location.mk | 4 +- > package/qt5/qt5multimedia/qt5multimedia.mk | 4 +- > package/qt5/qt5sensors/qt5sensors.mk | 4 +- > package/qt5/qt5serialport/qt5serialport.mk | 4 +- > package/qt5/qt5svg/qt5svg.mk | 4 +- > package/qt5/qt5tools/qt5tools.mk | 4 +- > package/qt5/qt5webchannel/qt5webchannel.mk | 4 +- > ...004-Remove-unused-check-for-private_tests.patch | 40 +++++++++++++++++++ > package/qt5/qt5websockets/qt5websockets.mk | 4 +- > package/qt5/qt5x11extras/qt5x11extras.mk | 4 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 +- > 20 files changed, 116 insertions(+), 91 deletions(-) > create mode 100644 package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch > delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch > create mode 100644 package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > index 234dfdd..77e7e09 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 > diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk > index e937e23..8d1f568 100644 > --- a/package/qt5/qt5.mk > +++ b/package/qt5/qt5.mk > @@ -1,6 +1,6 @@ > -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_VERSION_MAJOR = 5.8 > +QT5_VERSION = $(QT5_VERSION_MAJOR).0-rc > +QT5_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules > QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules > include $(sort $(wildcard package/qt5/*/*.mk)) > > diff --git a/package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch b/package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch > new file mode 100644 > index 0000000..54f6aca > --- /dev/null > +++ b/package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch > @@ -0,0 +1,39 @@ > +From 5c4d88e55759cc64a6fcfb9059bc480fa5a19ee2 Mon Sep 17 00:00:00 2001 > +From: Andreas Naumann <anaumann@ultratronik.de> > +Date: Tue, 13 Dec 2016 15:23:17 +0100 > +Subject: [PATCH] directfb: Fix for non-GL platform > + > +directfb has generally no dependency on egl so include support for it > +only in the specific case of directfb_egl. > + > +Task-number: QTBUG-57176 > +Change-Id: I73983f2c9deb789cd19ad59576e29d56ea2dfae1 > +Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > +--- > + src/plugins/platforms/directfb/directfb.pro | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro > +index 4e95aeb..e500d8c 100644 > +--- a/src/plugins/platforms/directfb/directfb.pro > ++++ b/src/plugins/platforms/directfb/directfb.pro > +@@ -3,7 +3,7 @@ TARGET = qdirectfb > + QT += \ > + core-private gui-private \ > + eventdispatcher_support-private service_support-private \ > +- fontdatabase_support-private egl_support-private > ++ fontdatabase_support-private > + > + QMAKE_USE += directfb > + > +@@ -28,6 +28,7 @@ HEADERS = qdirectfbintegration.h \ > + > + # ### port the GL context > + contains(QT_CONFIG, directfb_egl) { > ++ QT += egl_support-private > + HEADERS += qdirectfb_egl.h > + SOURCES += qdirectfb_egl.cpp > + DEFINES += DIRECTFB_GL_EGL > +-- > +1.9.1 > + > 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/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 7840a6e..79ad868 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -41,12 +41,10 @@ else > QT5BASE_CONFIGURE_OPTS += -release > endif > > -QT5BASE_CONFIGURE_OPTS += -largefile > - > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license > -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 > +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 = Commercial license > QT5BASE_REDISTRIBUTE = NO > @@ -153,14 +151,6 @@ 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_PACKAGE_GST1_PLUGINS_BASE),y) > -QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 > -QT5BASE_DEPENDENCIES += gst1-plugins-base > -else > -QT5BASE_CONFIGURE_OPTS += -no-gstreamer > -endif > - > # Build the list of libraries to be installed on the target > QT5BASE_INSTALL_LIBS_y += Qt5Core > QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa > @@ -170,7 +160,7 @@ 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 > -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration > +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration > > QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui > QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets > diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk > index 0f7257d..6270362 100644 > --- a/package/qt5/qt5connectivity/qt5connectivity.mk > +++ b/package/qt5/qt5connectivity/qt5connectivity.mk > @@ -11,8 +11,8 @@ QT5CONNECTIVITY_DEPENDENCIES = qt5base > QT5CONNECTIVITY_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5CONNECTIVITY_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk > index e5a3674..5d27556 100644 > --- a/package/qt5/qt5declarative/qt5declarative.mk > +++ b/package/qt5/qt5declarative/qt5declarative.mk > @@ -11,8 +11,8 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns > QT5DECLARATIVE_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5DECLARATIVE_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > index 223374a..4dab74a 100644 > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > @@ -11,8 +11,8 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative > QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk > index 921656d..52a5760 100644 > --- a/package/qt5/qt5imageformats/qt5imageformats.mk > +++ b/package/qt5/qt5imageformats/qt5imageformats.mk > @@ -11,8 +11,8 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base > QT5IMAGEFORMATS_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5IMAGEFORMATS_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk > index 358b162..8708783 100644 > --- a/package/qt5/qt5location/qt5location.mk > +++ b/package/qt5/qt5location/qt5location.mk > @@ -11,8 +11,8 @@ QT5LOCATION_DEPENDENCIES = qt5base > QT5LOCATION_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5LOCATION_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk > index eb50ac1..e5faa4c 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.mk > +++ b/package/qt5/qt5multimedia/qt5multimedia.mk > @@ -11,8 +11,8 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base > QT5MULTIMEDIA_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5MULTIMEDIA_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk > index 0dd952a..035926d 100644 > --- a/package/qt5/qt5sensors/qt5sensors.mk > +++ b/package/qt5/qt5sensors/qt5sensors.mk > @@ -11,8 +11,8 @@ QT5SENSORS_DEPENDENCIES = qt5base > QT5SENSORS_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5SENSORS_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk > index 04df021..1afb396 100644 > --- a/package/qt5/qt5serialport/qt5serialport.mk > +++ b/package/qt5/qt5serialport/qt5serialport.mk > @@ -11,8 +11,8 @@ QT5SERIALPORT_DEPENDENCIES = qt5base > QT5SERIALPORT_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5SERIALPORT_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk > index ebd5cba..f1a1597 100644 > --- a/package/qt5/qt5svg/qt5svg.mk > +++ b/package/qt5/qt5svg/qt5svg.mk > @@ -11,8 +11,8 @@ QT5SVG_DEPENDENCIES = qt5base > QT5SVG_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5SVG_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk > index 6befb8b..f7749b5 100644 > --- a/package/qt5/qt5tools/qt5tools.mk > +++ b/package/qt5/qt5tools/qt5tools.mk > @@ -20,8 +20,8 @@ QT5TOOLS_DEPENDENCIES += qt5declarative > endif > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5TOOLS_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk > index 9e94914..1c33360 100644 > --- a/package/qt5/qt5webchannel/qt5webchannel.mk > +++ b/package/qt5/qt5webchannel/qt5webchannel.mk > @@ -11,8 +11,8 @@ QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets > QT5WEBCHANNEL_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5WEBCHANNEL_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch b/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch > new file mode 100644 > index 0000000..69f4229 > --- /dev/null > +++ b/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch > @@ -0,0 +1,40 @@ > +From 646ea4ff9efb13d69428b785b4545209f1fac63d Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org> > +Date: Wed, 14 Sep 2016 23:51:14 +0200 > +Subject: [PATCH] Remove unused check for private_tests > + > +It turns out that qt_developer_build is never used anyway. > + > +I did some git archeology and it looks like it was nuked when doing the > +5.2 merge from upstream. The original purpose was apparently to control > +-Werror, which is nowadays controlled by CONFIG -= production_build. > + > +This actually fixes the build, as the QT_FOR_CONFIG += core-private which > +would have been required for qtConfig(private_tests) is missing. > + > +Task-number: QTBUG-55950 > +Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3 > + > +Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> > +--- > + Tools/qmake/mkspecs/features/default_pre.prf | 4 ---- > + 1 file changed, 4 deletions(-) > + > +diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf > +index 6bb52d0..8aa806d 100644 > +--- a/Tools/qmake/mkspecs/features/default_pre.prf > ++++ b/Tools/qmake/mkspecs/features/default_pre.prf > +@@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL > + scratchbox: PYTHON = python2.6 > + else: PYTHON = python > + > +-# We use private_tests to detect developer build, since the destdir will > +-# always be our webkit build dir. This might change as configure changes. > +-qtConfig(private_tests): CONFIG += qt_developer_build > +- > + # By default we enable "production build", and build-webkit, which is > + # used by bots and developers, will disable it, to enable warnings etc. > + CONFIG += production_build > +-- > +2.9.3 > + > diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk > index f1200c2..6580a79 100644 > --- a/package/qt5/qt5websockets/qt5websockets.mk > +++ b/package/qt5/qt5websockets/qt5websockets.mk > @@ -11,8 +11,8 @@ QT5WEBSOCKETS_DEPENDENCIES = qt5base > QT5WEBSOCKETS_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3 > -QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 > +QT5WEBSOCKETS_LICENSE = GPLv2 or LGPLv3, GPLv3 with exception(tools) > +QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 > else > QT5WEBSOCKETS_LICENSE = Commercial license > QT5WEBSOCKETS_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk > index a0e1209..53fedb2 100644 > --- a/package/qt5/qt5x11extras/qt5x11extras.mk > +++ b/package/qt5/qt5x11extras/qt5x11extras.mk > @@ -11,8 +11,8 @@ QT5X11EXTRAS_DEPENDENCIES = qt5base > QT5X11EXTRAS_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5X11EXTRAS_REDISTRIBUTE = NO > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > index 31477a7..2a002f3 100644 > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > @@ -11,8 +11,8 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base > QT5XMLPATTERNS_INSTALL_STAGING = YES > > ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) > -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 > +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 = Commercial license > QT5XMLPATTERNS_REDISTRIBUTE = NO ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc 2016-12-16 22:03 ` Peter Seiderer @ 2016-12-19 9:28 ` Andreas Naumann 0 siblings, 0 replies; 41+ messages in thread From: Andreas Naumann @ 2016-12-19 9:28 UTC (permalink / raw) To: buildroot Hi Am 16.12.2016 um 23:03 schrieb Peter Seiderer: > Hello Andreas, > > On Tue, 13 Dec 2016 15:59:26 +0100, Andreas Naumann <anaumann@ultratronik.de> wrote: > >> - qt5 need C++11 compliant compiler since 5.7 ([1]) >> - updated licenses: since version 5.7 Qt removed the (L)GPL 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]) > > Missing (for buildroot git master): > > - qt5base removed of 0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch (upstream committed [3b]) > OK. thanks, Andreas > Regards, > Peter > > [3b] https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp?id=f1b4bd4790860e1ff5afcec111a359bc3a91cfda > >> - qt5base: remove obsolete config-option -large ([4]) >> - qt5base: remove gstreamer related config-option ([5]) >> - qt5base: add 001-directfb-Fix-for-non-GL-platform.patch ([6]) >> - qt5webkit: add 0004-Remove-unused-check-for-private_tests.patch ([7]) >> >> [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/ >> [4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108 >> [5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=7d4da559afb62a779b3d90a65fb679cb5433f203 >> [6] https://bugreports.qt.io/browse/QTBUG-57176 >> [7] https://bugreports.qt.io/browse/QTBUG-55950 >> >> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> >> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> >> --- >> package/qt5/Config.in | 5 ++- >> package/qt5/qt5.mk | 6 +-- >> .../0001-directfb-Fix-for-non-GL-platform.patch | 39 +++++++++++++++++++ >> .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ---------------------- >> package/qt5/qt5base/qt5base.mk | 16 ++------ >> package/qt5/qt5connectivity/qt5connectivity.mk | 4 +- >> package/qt5/qt5declarative/qt5declarative.mk | 4 +- >> .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 +- >> package/qt5/qt5imageformats/qt5imageformats.mk | 4 +- >> package/qt5/qt5location/qt5location.mk | 4 +- >> package/qt5/qt5multimedia/qt5multimedia.mk | 4 +- >> package/qt5/qt5sensors/qt5sensors.mk | 4 +- >> package/qt5/qt5serialport/qt5serialport.mk | 4 +- >> package/qt5/qt5svg/qt5svg.mk | 4 +- >> package/qt5/qt5tools/qt5tools.mk | 4 +- >> package/qt5/qt5webchannel/qt5webchannel.mk | 4 +- >> ...004-Remove-unused-check-for-private_tests.patch | 40 +++++++++++++++++++ >> package/qt5/qt5websockets/qt5websockets.mk | 4 +- >> package/qt5/qt5x11extras/qt5x11extras.mk | 4 +- >> package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 +- >> 20 files changed, 116 insertions(+), 91 deletions(-) >> create mode 100644 package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch >> delete mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch >> create mode 100644 package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch >> >> diff --git a/package/qt5/Config.in b/package/qt5/Config.in >> index 234dfdd..77e7e09 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 >> diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk >> index e937e23..8d1f568 100644 >> --- a/package/qt5/qt5.mk >> +++ b/package/qt5/qt5.mk >> @@ -1,6 +1,6 @@ >> -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_VERSION_MAJOR = 5.8 >> +QT5_VERSION = $(QT5_VERSION_MAJOR).0-rc >> +QT5_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules >> QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules >> include $(sort $(wildcard package/qt5/*/*.mk)) >> >> diff --git a/package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch b/package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch >> new file mode 100644 >> index 0000000..54f6aca >> --- /dev/null >> +++ b/package/qt5/qt5base/0001-directfb-Fix-for-non-GL-platform.patch >> @@ -0,0 +1,39 @@ >> +From 5c4d88e55759cc64a6fcfb9059bc480fa5a19ee2 Mon Sep 17 00:00:00 2001 >> +From: Andreas Naumann <anaumann@ultratronik.de> >> +Date: Tue, 13 Dec 2016 15:23:17 +0100 >> +Subject: [PATCH] directfb: Fix for non-GL platform >> + >> +directfb has generally no dependency on egl so include support for it >> +only in the specific case of directfb_egl. >> + >> +Task-number: QTBUG-57176 >> +Change-Id: I73983f2c9deb789cd19ad59576e29d56ea2dfae1 >> +Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> >> +--- >> + src/plugins/platforms/directfb/directfb.pro | 3 ++- >> + 1 file changed, 2 insertions(+), 1 deletion(-) >> + >> +diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro >> +index 4e95aeb..e500d8c 100644 >> +--- a/src/plugins/platforms/directfb/directfb.pro >> ++++ b/src/plugins/platforms/directfb/directfb.pro >> +@@ -3,7 +3,7 @@ TARGET = qdirectfb >> + QT += \ >> + core-private gui-private \ >> + eventdispatcher_support-private service_support-private \ >> +- fontdatabase_support-private egl_support-private >> ++ fontdatabase_support-private >> + >> + QMAKE_USE += directfb >> + >> +@@ -28,6 +28,7 @@ HEADERS = qdirectfbintegration.h \ >> + >> + # ### port the GL context >> + contains(QT_CONFIG, directfb_egl) { >> ++ QT += egl_support-private >> + HEADERS += qdirectfb_egl.h >> + SOURCES += qdirectfb_egl.cpp >> + DEFINES += DIRECTFB_GL_EGL >> +-- >> +1.9.1 >> + >> 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/qt5base.mk b/package/qt5/qt5base/qt5base.mk >> index 7840a6e..79ad868 100644 >> --- a/package/qt5/qt5base/qt5base.mk >> +++ b/package/qt5/qt5base/qt5base.mk >> @@ -41,12 +41,10 @@ else >> QT5BASE_CONFIGURE_OPTS += -release >> endif >> >> -QT5BASE_CONFIGURE_OPTS += -largefile >> - >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license >> -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 >> +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 = Commercial license >> QT5BASE_REDISTRIBUTE = NO >> @@ -153,14 +151,6 @@ 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_PACKAGE_GST1_PLUGINS_BASE),y) >> -QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 >> -QT5BASE_DEPENDENCIES += gst1-plugins-base >> -else >> -QT5BASE_CONFIGURE_OPTS += -no-gstreamer >> -endif >> - >> # Build the list of libraries to be installed on the target >> QT5BASE_INSTALL_LIBS_y += Qt5Core >> QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa >> @@ -170,7 +160,7 @@ 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 >> -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration >> +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration >> >> QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui >> QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets >> diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk >> index 0f7257d..6270362 100644 >> --- a/package/qt5/qt5connectivity/qt5connectivity.mk >> +++ b/package/qt5/qt5connectivity/qt5connectivity.mk >> @@ -11,8 +11,8 @@ QT5CONNECTIVITY_DEPENDENCIES = qt5base >> QT5CONNECTIVITY_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5CONNECTIVITY_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk >> index e5a3674..5d27556 100644 >> --- a/package/qt5/qt5declarative/qt5declarative.mk >> +++ b/package/qt5/qt5declarative/qt5declarative.mk >> @@ -11,8 +11,8 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns >> QT5DECLARATIVE_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5DECLARATIVE_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk >> index 223374a..4dab74a 100644 >> --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk >> +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk >> @@ -11,8 +11,8 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative >> QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk >> index 921656d..52a5760 100644 >> --- a/package/qt5/qt5imageformats/qt5imageformats.mk >> +++ b/package/qt5/qt5imageformats/qt5imageformats.mk >> @@ -11,8 +11,8 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base >> QT5IMAGEFORMATS_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5IMAGEFORMATS_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk >> index 358b162..8708783 100644 >> --- a/package/qt5/qt5location/qt5location.mk >> +++ b/package/qt5/qt5location/qt5location.mk >> @@ -11,8 +11,8 @@ QT5LOCATION_DEPENDENCIES = qt5base >> QT5LOCATION_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5LOCATION_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk >> index eb50ac1..e5faa4c 100644 >> --- a/package/qt5/qt5multimedia/qt5multimedia.mk >> +++ b/package/qt5/qt5multimedia/qt5multimedia.mk >> @@ -11,8 +11,8 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base >> QT5MULTIMEDIA_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5MULTIMEDIA_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk >> index 0dd952a..035926d 100644 >> --- a/package/qt5/qt5sensors/qt5sensors.mk >> +++ b/package/qt5/qt5sensors/qt5sensors.mk >> @@ -11,8 +11,8 @@ QT5SENSORS_DEPENDENCIES = qt5base >> QT5SENSORS_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5SENSORS_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk >> index 04df021..1afb396 100644 >> --- a/package/qt5/qt5serialport/qt5serialport.mk >> +++ b/package/qt5/qt5serialport/qt5serialport.mk >> @@ -11,8 +11,8 @@ QT5SERIALPORT_DEPENDENCIES = qt5base >> QT5SERIALPORT_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5SERIALPORT_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk >> index ebd5cba..f1a1597 100644 >> --- a/package/qt5/qt5svg/qt5svg.mk >> +++ b/package/qt5/qt5svg/qt5svg.mk >> @@ -11,8 +11,8 @@ QT5SVG_DEPENDENCIES = qt5base >> QT5SVG_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5SVG_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk >> index 6befb8b..f7749b5 100644 >> --- a/package/qt5/qt5tools/qt5tools.mk >> +++ b/package/qt5/qt5tools/qt5tools.mk >> @@ -20,8 +20,8 @@ QT5TOOLS_DEPENDENCIES += qt5declarative >> endif >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5TOOLS_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk >> index 9e94914..1c33360 100644 >> --- a/package/qt5/qt5webchannel/qt5webchannel.mk >> +++ b/package/qt5/qt5webchannel/qt5webchannel.mk >> @@ -11,8 +11,8 @@ QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets >> QT5WEBCHANNEL_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5WEBCHANNEL_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch b/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch >> new file mode 100644 >> index 0000000..69f4229 >> --- /dev/null >> +++ b/package/qt5/qt5webkit/0004-Remove-unused-check-for-private_tests.patch >> @@ -0,0 +1,40 @@ >> +From 646ea4ff9efb13d69428b785b4545209f1fac63d Mon Sep 17 00:00:00 2001 >> +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org> >> +Date: Wed, 14 Sep 2016 23:51:14 +0200 >> +Subject: [PATCH] Remove unused check for private_tests >> + >> +It turns out that qt_developer_build is never used anyway. >> + >> +I did some git archeology and it looks like it was nuked when doing the >> +5.2 merge from upstream. The original purpose was apparently to control >> +-Werror, which is nowadays controlled by CONFIG -= production_build. >> + >> +This actually fixes the build, as the QT_FOR_CONFIG += core-private which >> +would have been required for qtConfig(private_tests) is missing. >> + >> +Task-number: QTBUG-55950 >> +Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3 >> + >> +Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> >> +--- >> + Tools/qmake/mkspecs/features/default_pre.prf | 4 ---- >> + 1 file changed, 4 deletions(-) >> + >> +diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf >> +index 6bb52d0..8aa806d 100644 >> +--- a/Tools/qmake/mkspecs/features/default_pre.prf >> ++++ b/Tools/qmake/mkspecs/features/default_pre.prf >> +@@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL >> + scratchbox: PYTHON = python2.6 >> + else: PYTHON = python >> + >> +-# We use private_tests to detect developer build, since the destdir will >> +-# always be our webkit build dir. This might change as configure changes. >> +-qtConfig(private_tests): CONFIG += qt_developer_build >> +- >> + # By default we enable "production build", and build-webkit, which is >> + # used by bots and developers, will disable it, to enable warnings etc. >> + CONFIG += production_build >> +-- >> +2.9.3 >> + >> diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk >> index f1200c2..6580a79 100644 >> --- a/package/qt5/qt5websockets/qt5websockets.mk >> +++ b/package/qt5/qt5websockets/qt5websockets.mk >> @@ -11,8 +11,8 @@ QT5WEBSOCKETS_DEPENDENCIES = qt5base >> QT5WEBSOCKETS_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3 >> -QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 >> +QT5WEBSOCKETS_LICENSE = GPLv2 or LGPLv3, GPLv3 with exception(tools) >> +QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 >> else >> QT5WEBSOCKETS_LICENSE = Commercial license >> QT5WEBSOCKETS_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk >> index a0e1209..53fedb2 100644 >> --- a/package/qt5/qt5x11extras/qt5x11extras.mk >> +++ b/package/qt5/qt5x11extras/qt5x11extras.mk >> @@ -11,8 +11,8 @@ QT5X11EXTRAS_DEPENDENCIES = qt5base >> QT5X11EXTRAS_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5X11EXTRAS_REDISTRIBUTE = NO >> diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk >> index 31477a7..2a002f3 100644 >> --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk >> +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk >> @@ -11,8 +11,8 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base >> QT5XMLPATTERNS_INSTALL_STAGING = YES >> >> ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) >> -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 >> +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 = Commercial license >> QT5XMLPATTERNS_REDISTRIBUTE = NO > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 3/7] qt5enginio : move into legacy compatibility 2016-12-13 14:59 [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 1/7] qt5: Remove all hashes Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc Andreas Naumann @ 2016-12-13 14:59 ` Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 4/7] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview Andreas Naumann ` (5 subsequent siblings) 8 siblings, 0 replies; 41+ messages in thread From: Andreas Naumann @ 2016-12-13 14: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> --- 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 77e7e09..7fe0bfc 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -35,7 +35,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" @@ -54,6 +53,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 -- 1.9.1 ^ permalink raw reply related [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 4/7] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview 2016-12-13 14:59 [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Andreas Naumann ` (2 preceding siblings ...) 2016-12-13 14:59 ` [Buildroot] [PATCH v3 3/7] qt5enginio : move into legacy compatibility Andreas Naumann @ 2016-12-13 14:59 ` Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 5/7] Revert "qt5base: install bundled fonts to target" Andreas Naumann ` (4 subsequent siblings) 8 siblings, 0 replies; 41+ messages in thread From: Andreas Naumann @ 2016-12-13 14: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> --- 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 7fe0bfc..18dad52 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -31,6 +31,7 @@ menuconfig BR2_PACKAGE_QT5 http://qt.io if BR2_PACKAGE_QT5 +source "package/qt5/qt53d/Config.in" source "package/qt5/qt5base/Config.in" source "package/qt5/qt5canvas3d/Config.in" source "package/qt5/qt5connectivity/Config.in" @@ -40,7 +41,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" @@ -48,10 +51,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" -- 1.9.1 ^ permalink raw reply related [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 5/7] Revert "qt5base: install bundled fonts to target" 2016-12-13 14:59 [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Andreas Naumann ` (3 preceding siblings ...) 2016-12-13 14:59 ` [Buildroot] [PATCH v3 4/7] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview Andreas Naumann @ 2016-12-13 14:59 ` Andreas Naumann 2016-12-16 20:47 ` Peter Seiderer 2016-12-13 14:59 ` [Buildroot] [PATCH v3 6/7] qt5declarative: enable Quick for non-GL platforms Andreas Naumann ` (3 subsequent siblings) 8 siblings, 1 reply; 41+ messages in thread From: Andreas Naumann @ 2016-12-13 14:59 UTC (permalink / raw) To: buildroot From: Julien Corjon <corjon.j@ecagroup.com> qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645 This reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384. Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> --- package/qt5/qt5base/qt5base.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 79ad868..fffadad 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -230,14 +230,6 @@ define QT5BASE_INSTALL_TARGET_PLUGINS done endef -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 - - define QT5BASE_INSTALL_TARGET_EXAMPLES example_dirs=$$(cd $(@D)/examples; find . -mindepth 1 -maxdepth 1 -type d); \ for example in $${example_dirs}; do \ -- 1.9.1 ^ permalink raw reply related [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 5/7] Revert "qt5base: install bundled fonts to target" 2016-12-13 14:59 ` [Buildroot] [PATCH v3 5/7] Revert "qt5base: install bundled fonts to target" Andreas Naumann @ 2016-12-16 20:47 ` Peter Seiderer 2016-12-19 9:13 ` Andreas Naumann 0 siblings, 1 reply; 41+ messages in thread From: Peter Seiderer @ 2016-12-16 20:47 UTC (permalink / raw) To: buildroot Hello Andreas, On Tue, 13 Dec 2016 15:59:29 +0100, Andreas Naumann <anaumann@ultratronik.de> wrote: > From: Julien Corjon <corjon.j@ecagroup.com> > > qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645 > > This reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384. > > Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> > Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> > --- > package/qt5/qt5base/qt5base.mk | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 79ad868..fffadad 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -230,14 +230,6 @@ define QT5BASE_INSTALL_TARGET_PLUGINS > done > endef > > -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 > - > - > define QT5BASE_INSTALL_TARGET_EXAMPLES > example_dirs=$$(cd $(@D)/examples; find . -mindepth 1 -maxdepth 1 -type d); \ > for example in $${example_dirs}; do \ The revert is not complete, there are two occurrence of QT5BASE_INSTALL_TARGET_FONTS left: diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index d240a0a58..5ae0b016e 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -235,14 +235,12 @@ endef ifeq ($(BR2_STATIC_LIBS),y) define QT5BASE_INSTALL_TARGET_CMDS - $(QT5BASE_INSTALL_TARGET_FONTS) $(QT5BASE_INSTALL_TARGET_EXAMPLES) endef else define QT5BASE_INSTALL_TARGET_CMDS $(QT5BASE_INSTALL_TARGET_LIBS) $(QT5BASE_INSTALL_TARGET_PLUGINS) - $(QT5BASE_INSTALL_TARGET_FONTS) $(QT5BASE_INSTALL_TARGET_EXAMPLES) endef endif Regards, Peter ^ permalink raw reply related [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 5/7] Revert "qt5base: install bundled fonts to target" 2016-12-16 20:47 ` Peter Seiderer @ 2016-12-19 9:13 ` Andreas Naumann 0 siblings, 0 replies; 41+ messages in thread From: Andreas Naumann @ 2016-12-19 9:13 UTC (permalink / raw) To: buildroot Hi Peter, >> >> qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645 >> >> This reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384. >> >> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> >> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> >> --- >> package/qt5/qt5base/qt5base.mk | 8 -------- >> 1 file changed, 8 deletions(-) >> >> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk >> index 79ad868..fffadad 100644 >> --- a/package/qt5/qt5base/qt5base.mk >> +++ b/package/qt5/qt5base/qt5base.mk >> @@ -230,14 +230,6 @@ define QT5BASE_INSTALL_TARGET_PLUGINS >> done >> endef >> >> -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 >> - >> - >> define QT5BASE_INSTALL_TARGET_EXAMPLES >> example_dirs=$$(cd $(@D)/examples; find . -mindepth 1 -maxdepth 1 -type d); \ >> for example in $${example_dirs}; do \ > > The revert is not complete, there are two occurrence of QT5BASE_INSTALL_TARGET_FONTS left: > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index d240a0a58..5ae0b016e 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -235,14 +235,12 @@ endef > > ifeq ($(BR2_STATIC_LIBS),y) > define QT5BASE_INSTALL_TARGET_CMDS > - $(QT5BASE_INSTALL_TARGET_FONTS) > $(QT5BASE_INSTALL_TARGET_EXAMPLES) > endef > else > define QT5BASE_INSTALL_TARGET_CMDS > $(QT5BASE_INSTALL_TARGET_LIBS) > $(QT5BASE_INSTALL_TARGET_PLUGINS) > - $(QT5BASE_INSTALL_TARGET_FONTS) > $(QT5BASE_INSTALL_TARGET_EXAMPLES) > endef > endif Of course. Will fix, thanks. Andreas > > > Regards, > Peter > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 6/7] qt5declarative: enable Quick for non-GL platforms 2016-12-13 14:59 [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Andreas Naumann ` (4 preceding siblings ...) 2016-12-13 14:59 ` [Buildroot] [PATCH v3 5/7] Revert "qt5base: install bundled fonts to target" Andreas Naumann @ 2016-12-13 14:59 ` Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 7/7] qt5quickcontrols1/2: enable for software renderer Andreas Naumann ` (2 subsequent siblings) 8 siblings, 0 replies; 41+ messages in thread From: Andreas Naumann @ 2016-12-13 14:59 UTC (permalink / raw) To: buildroot 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> --- package/qt5/qt5declarative/Config.in | 6 +----- package/qt5/qt5multimedia/qt5multimedia.mk | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index 6f89dda..233220e 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -14,13 +14,9 @@ config BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5DECLARATIVE -comment "quick module needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE - 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 config BR2_PACKAGE_QT5DECLARATIVE_EXAMPLES bool "qt5 declarative examples" diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index e5faa4c..6eb8dca 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -63,11 +63,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 define QT5MULTIMEDIA_INSTALL_TARGET_CMDS $(QT5MULTIMEDIA_INSTALL_TARGET_LIBS) -- 1.9.1 ^ permalink raw reply related [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 7/7] qt5quickcontrols1/2: enable for software renderer 2016-12-13 14:59 [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Andreas Naumann ` (5 preceding siblings ...) 2016-12-13 14:59 ` [Buildroot] [PATCH v3 6/7] qt5declarative: enable Quick for non-GL platforms Andreas Naumann @ 2016-12-13 14:59 ` Andreas Naumann 2016-12-13 15:49 ` [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Thomas Petazzoni 2016-12-17 14:46 ` Thomas Petazzoni 8 siblings, 0 replies; 41+ messages in thread From: Andreas Naumann @ 2016-12-13 14:59 UTC (permalink / raw) To: buildroot Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> --- package/qt5/qt5quickcontrols/Config.in | 4 ---- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 5 ++++- package/qt5/qt5quickcontrols2/Config.in | 4 ---- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 8 +++++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in index 0fe8465..e977c9a 100644 --- a/package/qt5/qt5quickcontrols/Config.in +++ b/package/qt5/qt5quickcontrols/Config.in @@ -2,7 +2,6 @@ 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_JSCORE_AVAILABLE help Qt is a cross-platform application and UI framework for @@ -12,6 +11,3 @@ 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_JSCORE_AVAILABLE 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)) diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in index 1e57674..6db1d4a 100644 --- a/package/qt5/qt5quickcontrols2/Config.in +++ b/package/qt5/qt5quickcontrols2/Config.in @@ -2,7 +2,6 @@ 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_JSCORE_AVAILABLE # qt5declarative/quick help Qt is a cross-platform application and UI framework for @@ -12,6 +11,3 @@ 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_JSCORE_AVAILABLE diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index a5ad3f6..1a2949c 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -31,10 +31,12 @@ define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS endef 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 + 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/templates $(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 endef $(eval $(generic-package)) -- 1.9.1 ^ permalink raw reply related [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 14:59 [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Andreas Naumann ` (6 preceding siblings ...) 2016-12-13 14:59 ` [Buildroot] [PATCH v3 7/7] qt5quickcontrols1/2: enable for software renderer Andreas Naumann @ 2016-12-13 15:49 ` Thomas Petazzoni 2016-12-13 16:15 ` Peter Korsgaard 2016-12-13 16:24 ` Andreas Naumann 2016-12-17 14:46 ` Thomas Petazzoni 8 siblings, 2 replies; 41+ messages in thread From: Thomas Petazzoni @ 2016-12-13 15:49 UTC (permalink / raw) To: buildroot Hello, On Tue, 13 Dec 2016 15:59:24 +0100, Andreas Naumann wrote: > This is a rework of Julien and my previous work with the -rc version, which > now is available as a snapshot. > > I have tried to adress the comments given by Julien and Arnout. In addition I > updated the license stuff, hope that this is correct. > > As a result of https://bugreports.qt.io/browse/QTBUG-57039, I could make the > patch for directfb slightly smaller. However for non GL platforms there is > still an issue (QTBUG-57176). > > A new change is the removal of gstreamer config-options in qt5base since this > is now completely done in qtmultimedia. Thanks for working on Qt packaging, definitely very important for Buildroot. Do you know when the final 5.8 is supposed to be released? If it's released before Buildroot 2017.02, then we could take your patches right now, and update them to the final release when it comes out. This way, they would get some exposure (both in terms of Buildroot users exposure, and in terms of autobuilder testing). Thanks, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 15:49 ` [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Thomas Petazzoni @ 2016-12-13 16:15 ` Peter Korsgaard 2016-12-13 16:22 ` Thomas Petazzoni 2016-12-17 14:47 ` Thomas Petazzoni 2016-12-13 16:24 ` Andreas Naumann 1 sibling, 2 replies; 41+ messages in thread From: Peter Korsgaard @ 2016-12-13 16:15 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Hi, > Thanks for working on Qt packaging, definitely very important for > Buildroot. > Do you know when the final 5.8 is supposed to be released? If it's > released before Buildroot 2017.02, then we could take your patches > right now, and update them to the final release when it comes out. This > way, they would get some exposure (both in terms of Buildroot users > exposure, and in terms of autobuilder testing). Related to that - With the move to GPLv3, should we keep v5.6 around next to v5.8 for a while (as a version selection or separate packages)? Maintaining both is not really nice, but GPLv3 is an issue for some people/companies. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 16:15 ` Peter Korsgaard @ 2016-12-13 16:22 ` Thomas Petazzoni 2016-12-13 16:34 ` Peter Korsgaard ` (2 more replies) 2016-12-17 14:47 ` Thomas Petazzoni 1 sibling, 3 replies; 41+ messages in thread From: Thomas Petazzoni @ 2016-12-13 16:22 UTC (permalink / raw) To: buildroot Hello, On Tue, 13 Dec 2016 17:15:37 +0100, Peter Korsgaard wrote: > Related to that - With the move to GPLv3, should we keep v5.6 around > next to v5.8 for a while (as a version selection or separate packages)? > > Maintaining both is not really nice, but GPLv3 is an issue for some > people/companies. I agree that this license change can be an issue for some people/companies. However, for them, staying on Qt 5.6 is no a viable solution long term either, right. Also, do we do this for Samba ? For gcc ? For the myriad of other projects that moved to GPLv3 ? Isn't it going to be a pain to maintain both versions in parallel? A Config.in choice doesn't get randomized on our autobuilders, so the older version would never be tested. So I'm not particularly thrilled with supporting both versions :/ Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 16:22 ` Thomas Petazzoni @ 2016-12-13 16:34 ` Peter Korsgaard 2016-12-13 16:34 ` François Perrad 2016-12-13 16:54 ` Andreas Naumann 2 siblings, 0 replies; 41+ messages in thread From: Peter Korsgaard @ 2016-12-13 16:34 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Hello, > On Tue, 13 Dec 2016 17:15:37 +0100, Peter Korsgaard wrote: >> Related to that - With the move to GPLv3, should we keep v5.6 around >> next to v5.8 for a while (as a version selection or separate packages)? >> >> Maintaining both is not really nice, but GPLv3 is an issue for some >> people/companies. > I agree that this license change can be an issue for some > people/companies. However, for them, staying on Qt 5.6 is no a viable > solution long term either, right. No, indeed not - But it is something that there has been quite some "noise" about in the news. > Also, do we do this for Samba ? For gcc ? For the myriad of other > projects that moved to GPLv3 ? We kept the old samba package around for quite some time after adding samba4, and we still have qt 4.x. IANAL, but the GPLv3 issue is less a problem for the toolchain than for libraries. > Isn't it going to be a pain to maintain both versions in parallel? A > Config.in choice doesn't get randomized on our autobuilders, so the > older version would never be tested. Yes, it is a pain. And introducing a separate BR2_PACKAGE_QT58 (or whatever) package also isn't nice. > So I'm not particularly thrilled with supporting both versions :/ Me neither, but it is something we need to decide about, which is why I'm bringing the question. What do others say? How is E.G. yocto handling it? -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 16:22 ` Thomas Petazzoni 2016-12-13 16:34 ` Peter Korsgaard @ 2016-12-13 16:34 ` François Perrad 2016-12-13 16:46 ` Peter Korsgaard 2016-12-13 16:54 ` Andreas Naumann 2 siblings, 1 reply; 41+ messages in thread From: François Perrad @ 2016-12-13 16:34 UTC (permalink / raw) To: buildroot 2016-12-13 17:22 GMT+01:00 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>: > Hello, > > On Tue, 13 Dec 2016 17:15:37 +0100, Peter Korsgaard wrote: > >> Related to that - With the move to GPLv3, should we keep v5.6 around >> next to v5.8 for a while (as a version selection or separate packages)? >> >> Maintaining both is not really nice, but GPLv3 is an issue for some >> people/companies. > > I agree that this license change can be an issue for some > people/companies. However, for them, staying on Qt 5.6 is no a viable > solution long term either, right. > The main point from my point of view: Qt 5.6 has a Long Term Support (like Qt 4.8), see https://blog.qt.io/blog/2015/12/18/introducing-long-term-support/ So many people/companies will stay with Qt 5.6 Fran?ois > Also, do we do this for Samba ? For gcc ? For the myriad of other > projects that moved to GPLv3 ? > > Isn't it going to be a pain to maintain both versions in parallel? A > Config.in choice doesn't get randomized on our autobuilders, so the > older version would never be tested. > > So I'm not particularly thrilled with supporting both versions :/ > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 16:34 ` François Perrad @ 2016-12-13 16:46 ` Peter Korsgaard 2016-12-13 21:13 ` Thomas Petazzoni 2016-12-14 9:50 ` Will Wagner 0 siblings, 2 replies; 41+ messages in thread From: Peter Korsgaard @ 2016-12-13 16:46 UTC (permalink / raw) To: buildroot >>>>> "Fran?ois" == Fran?ois Perrad <francois.perrad@gadz.org> writes: Hi, > The main point from my point of view: > Qt 5.6 has a Long Term Support (like Qt 4.8), see > https://blog.qt.io/blog/2015/12/18/introducing-long-term-support/ > So many people/companies will stay with Qt 5.6 Ok, so perhaps we should drop Qt 4.x and have separate packages for 5.6 and 5.x (with .x >= 8)? -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 16:46 ` Peter Korsgaard @ 2016-12-13 21:13 ` Thomas Petazzoni 2016-12-14 9:50 ` Will Wagner 1 sibling, 0 replies; 41+ messages in thread From: Thomas Petazzoni @ 2016-12-13 21:13 UTC (permalink / raw) To: buildroot Hello, On Tue, 13 Dec 2016 17:46:42 +0100, Peter Korsgaard wrote: > > So many people/companies will stay with Qt 5.6 > > Ok, so perhaps we should drop Qt 4.x and have separate packages for 5.6 > and 5.x (with .x >= 8)? Separate packages mean that we have to change all packages that currently use qt5, so that they can use either 5.6 or 5.8 (or later). Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 16:46 ` Peter Korsgaard 2016-12-13 21:13 ` Thomas Petazzoni @ 2016-12-14 9:50 ` Will Wagner 1 sibling, 0 replies; 41+ messages in thread From: Will Wagner @ 2016-12-14 9:50 UTC (permalink / raw) To: buildroot On 13/12/2016 16:46, Peter Korsgaard wrote: >>>>>> "Fran?ois" == Fran?ois Perrad <francois.perrad@gadz.org> writes: > > Hi, > > > The main point from my point of view: > > Qt 5.6 has a Long Term Support (like Qt 4.8), see > > https://blog.qt.io/blog/2015/12/18/introducing-long-term-support/ > > > So many people/companies will stay with Qt 5.6 > > Ok, so perhaps we should drop Qt 4.x and have separate packages for 5.6 > and 5.x (with .x >= 8)? > That would get my vote. Keeping 5.6 LTS around longer would be great -- ------------------------------------------------------------------------ Will Wagner will_wagner at carallon.com Engineering Manager Office Tel: +44 (0)20 7471 9400 Carallon Ltd, International House, Ealing Broadway, London, W5 5DB ------------------------------------------------------------------------ ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 16:22 ` Thomas Petazzoni 2016-12-13 16:34 ` Peter Korsgaard 2016-12-13 16:34 ` François Perrad @ 2016-12-13 16:54 ` Andreas Naumann 2 siblings, 0 replies; 41+ messages in thread From: Andreas Naumann @ 2016-12-13 16:54 UTC (permalink / raw) To: buildroot Hi, Am 13.12.2016 um 17:22 schrieb Thomas Petazzoni: > Hello, > > On Tue, 13 Dec 2016 17:15:37 +0100, Peter Korsgaard wrote: > >> Related to that - With the move to GPLv3, should we keep v5.6 around >> next to v5.8 for a while (as a version selection or separate packages)? >> >> Maintaining both is not really nice, but GPLv3 is an issue for some >> people/companies. > > I agree that this license change can be an issue for some > people/companies. However, for them, staying on Qt 5.6 is no a viable > solution long term either, right. > > Also, do we do this for Samba ? For gcc ? For the myriad of other > projects that moved to GPLv3 ? > > Isn't it going to be a pain to maintain both versions in parallel? A > Config.in choice doesn't get randomized on our autobuilders, so the > older version would never be tested. > > So I'm not particularly thrilled with supporting both versions :/ I agree. If its really an issue, maybe the effort is better spent maintaining an older buildroot version which provides more packages with non-GPLv3 options? However, as for the tivoization and other issues, my conception was that GPLv3 didnt change much, but is more explicit about it. So in effect, if a particular usage would violate GPLv3, would it not most likely also violate earlier versions? Seems just as risky to me, but I know next to nothing in law things... regards, Andreas > > Thomas > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 16:15 ` Peter Korsgaard 2016-12-13 16:22 ` Thomas Petazzoni @ 2016-12-17 14:47 ` Thomas Petazzoni 1 sibling, 0 replies; 41+ messages in thread From: Thomas Petazzoni @ 2016-12-17 14:47 UTC (permalink / raw) To: buildroot Hello, On Tue, 13 Dec 2016 17:15:37 +0100, Peter Korsgaard wrote: > Related to that - With the move to GPLv3, should we keep v5.6 around > next to v5.8 for a while (as a version selection or separate packages)? In the end, what do we do for this issue? Thanks, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 15:49 ` [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Thomas Petazzoni 2016-12-13 16:15 ` Peter Korsgaard @ 2016-12-13 16:24 ` Andreas Naumann 2016-12-13 16:44 ` Thomas Petazzoni 1 sibling, 1 reply; 41+ messages in thread From: Andreas Naumann @ 2016-12-13 16:24 UTC (permalink / raw) To: buildroot Hi Thomas, Am 13.12.2016 um 16:49 schrieb Thomas Petazzoni: > > Thanks for working on Qt packaging, definitely very important for > Buildroot. > > Do you know when the final 5.8 is supposed to be released? If it's > released before Buildroot 2017.02, then we could take your patches > right now, and update them to the final release when it comes out. This > way, they would get some exposure (both in terms of Buildroot users > exposure, and in terms of autobuilder testing). According to https://wiki.qt.io/Qt_5.8_Release the final release is expected January 5th. So it should easily make it into our 2017.02 release. Of course the early exposure would be highly beneficial. regards, Andreas > > Thanks, > > Thomas > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 16:24 ` Andreas Naumann @ 2016-12-13 16:44 ` Thomas Petazzoni 0 siblings, 0 replies; 41+ messages in thread From: Thomas Petazzoni @ 2016-12-13 16:44 UTC (permalink / raw) To: buildroot Hello, On Tue, 13 Dec 2016 17:24:44 +0100, Andreas Naumann wrote: > > Do you know when the final 5.8 is supposed to be released? If it's > > released before Buildroot 2017.02, then we could take your patches > > right now, and update them to the final release when it comes out. This > > way, they would get some exposure (both in terms of Buildroot users > > exposure, and in terms of autobuilder testing). > > According to https://wiki.qt.io/Qt_5.8_Release the final release is > expected January 5th. So it should easily make it into our 2017.02 > release. Of course the early exposure would be highly beneficial. OK, so we definitely want to merge your patches soon. Thanks! Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-13 14:59 [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Andreas Naumann ` (7 preceding siblings ...) 2016-12-13 15:49 ` [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Thomas Petazzoni @ 2016-12-17 14:46 ` Thomas Petazzoni 2016-12-19 9:13 ` Andreas Naumann 8 siblings, 1 reply; 41+ messages in thread From: Thomas Petazzoni @ 2016-12-17 14:46 UTC (permalink / raw) To: buildroot Hello, On Tue, 13 Dec 2016 15:59:24 +0100, Andreas Naumann wrote: > Andreas Naumann (4): > qt5: Remove all hashes > qt5: bump to 5.8.0-rc > qt5declarative: enable Quick for non-GL platforms > qt5quickcontrols1/2: enable for software renderer > > Julien Corjon (3): > qt5enginio : move into legacy compatibility > qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview > Revert "qt5base: install bundled fonts to target" I've marked the set of patches as "Changes Requested" in our patch tracking system. Can you resubmit when a "fixed" -rc release of Qt 5.8 is published? Also, you had a few comments during the review, if you could take them into account, it would be nice. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-17 14:46 ` Thomas Petazzoni @ 2016-12-19 9:13 ` Andreas Naumann 2016-12-19 9:26 ` Thomas Petazzoni 0 siblings, 1 reply; 41+ messages in thread From: Andreas Naumann @ 2016-12-19 9:13 UTC (permalink / raw) To: buildroot Hi, Am 17.12.2016 um 15:46 schrieb Thomas Petazzoni: > Hello, > > On Tue, 13 Dec 2016 15:59:24 +0100, Andreas Naumann wrote: > >> Andreas Naumann (4): >> qt5: Remove all hashes >> qt5: bump to 5.8.0-rc >> qt5declarative: enable Quick for non-GL platforms >> qt5quickcontrols1/2: enable for software renderer >> >> Julien Corjon (3): >> qt5enginio : move into legacy compatibility >> qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview >> Revert "qt5base: install bundled fonts to target" > > I've marked the set of patches as "Changes Requested" in our patch > tracking system. Can you resubmit when a "fixed" -rc release of Qt 5.8 > is published? > > Also, you had a few comments during the review, if you could take them > into account, it would be nice. I'll try to fix yours and Peters issues/comments today. In the meanwhile Qt updated their planned -rc release for tomorrow, 20th December. So I guess I'll wait for that to happen, update the hashes also and provide a v4 wednesday or so. On the question of supporting two versions: For the moment I lack the time and a good idea of how to do it without duplicating lots of code. Regards, Andreas > > Thanks a lot! > > Thomas > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-19 9:13 ` Andreas Naumann @ 2016-12-19 9:26 ` Thomas Petazzoni 2016-12-21 9:13 ` Andreas Naumann 0 siblings, 1 reply; 41+ messages in thread From: Thomas Petazzoni @ 2016-12-19 9:26 UTC (permalink / raw) To: buildroot Hello, On Mon, 19 Dec 2016 10:13:29 +0100, Andreas Naumann wrote: > I'll try to fix yours and Peters issues/comments today. In the meanwhile > Qt updated their planned -rc release for tomorrow, 20th December. So I > guess I'll wait for that to happen, update the hashes also and provide a > v4 wednesday or so. Sounds good, thanks. > On the question of supporting two versions: For the moment I lack the > time and a good idea of how to do it without duplicating lots of code. I'm not sure how to handle that yet. I'll try to chat with Peter about this. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-19 9:26 ` Thomas Petazzoni @ 2016-12-21 9:13 ` Andreas Naumann 2016-12-21 9:20 ` Thomas Petazzoni 0 siblings, 1 reply; 41+ messages in thread From: Andreas Naumann @ 2016-12-21 9:13 UTC (permalink / raw) To: buildroot Hi, Am 19.12.2016 um 10:26 schrieb Thomas Petazzoni: > Hello, > > On Mon, 19 Dec 2016 10:13:29 +0100, Andreas Naumann wrote: > >> I'll try to fix yours and Peters issues/comments today. In the meanwhile >> Qt updated their planned -rc release for tomorrow, 20th December. So I >> guess I'll wait for that to happen, update the hashes also and provide a >> v4 wednesday or so. > > Sounds good, thanks. > >> On the question of supporting two versions: For the moment I lack the >> time and a good idea of how to do it without duplicating lots of code. > > I'm not sure how to handle that yet. I'll try to chat with Peter about > this. > One idea i just had has to do with Peters question how Yocto deals with it. Their meta-qt5 layer has branches for all the past Yocto releases that are maintained. Each of them has a fixed qt-version. So in that regard is not much different from our situation. However, if you want to use an older Qt-Version with a newer Yocto-Version it may be a matter of checking out a different meta-qt5 branch. With that in mind I thought of our br2-external trees, which we now can have multiple of. There would probably be some way to combine mainline buildroot and an older version of the qt5 packages as external, but lots of questions arise here also. Variable names, additional repos, maintenance... So no, I dont think thats a good proposal. But all other solutions I can think of involve some kind of ugly code duplication, increased complexity (ifeq...) and so on. And maintenance will have to be done regardless of the implementation. So with that in mind, I turn to my initial thought of last week. If people/companies need maintenance of older versions, why not maintain the buildroot release that has them? With IoT and the need to for long term support, combined efforts for maintenance would be rather helpful, right? so much for my ponderings, Andreas > Thomas > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-21 9:13 ` Andreas Naumann @ 2016-12-21 9:20 ` Thomas Petazzoni 2017-01-02 8:55 ` Andreas Naumann 0 siblings, 1 reply; 41+ messages in thread From: Thomas Petazzoni @ 2016-12-21 9:20 UTC (permalink / raw) To: buildroot Hello, On Wed, 21 Dec 2016 10:13:27 +0100, Andreas Naumann wrote: > One idea i just had has to do with Peters question how Yocto deals with > it. Their meta-qt5 layer has branches for all the past Yocto releases > that are maintained. Each of them has a fixed qt-version. So in that > regard is not much different from our situation. > However, if you want to use an older Qt-Version with a newer > Yocto-Version it may be a matter of checking out a different meta-qt5 > branch. > > With that in mind I thought of our br2-external trees, which we now can > have multiple of. There would probably be some way to combine mainline > buildroot and an older version of the qt5 packages as external, but lots > of questions arise here also. Variable names, additional repos, > maintenance... That just doesn't work in Buildroot: you can have a single package with a given name. If your different packages for the different Qt versions have different names, then it's a nightmare because all packages that depend on Qt need to handle the different possibilities. > So no, I dont think thats a good proposal. But all other solutions I can > think of involve some kind of ugly code duplication, increased > complexity (ifeq...) and so on. And maintenance will have to be done > regardless of the implementation. > So with that in mind, I turn to my initial thought of last week. If > people/companies need maintenance of older versions, why not maintain > the buildroot release that has them? With IoT and the need to for long > term support, combined efforts for maintenance would be rather helpful, > right? We discussed this with Peter, and we would like for now to support both versions within the same package, with a "choice ... endchoice" that allows to choose between the LTS release and the latest release. If you look at your patch switching to 5.8 there is in fact very, very little change in the .mk files, so that can be handled with a bunch of ifeq () conditions. Thanks! Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2016-12-21 9:20 ` Thomas Petazzoni @ 2017-01-02 8:55 ` Andreas Naumann 2017-01-03 12:35 ` Thomas Petazzoni 0 siblings, 1 reply; 41+ messages in thread From: Andreas Naumann @ 2017-01-02 8:55 UTC (permalink / raw) To: buildroot Hi, <snip> >> >> With that in mind I thought of our br2-external trees, which we now can >> have multiple of. There would probably be some way to combine mainline >> buildroot and an older version of the qt5 packages as external, but lots >> of questions arise here also. Variable names, additional repos, >> maintenance... > > That just doesn't work in Buildroot: you can have a single package with > a given name. If your different packages for the different Qt versions > have different names, then it's a nightmare because all packages that > depend on Qt need to handle the different possibilities. Ok, was just an idea. > >> So no, I dont think thats a good proposal. But all other solutions I can >> think of involve some kind of ugly code duplication, increased >> complexity (ifeq...) and so on. And maintenance will have to be done >> regardless of the implementation. >> So with that in mind, I turn to my initial thought of last week. If >> people/companies need maintenance of older versions, why not maintain >> the buildroot release that has them? With IoT and the need to for long >> term support, combined efforts for maintenance would be rather helpful, >> right? > > We discussed this with Peter, and we would like for now to support both > versions within the same package, with a "choice ... endchoice" that > allows to choose between the LTS release and the latest release. > > If you look at your patch switching to 5.8 there is in fact very, very > little change in the .mk files, so that can be handled with a bunch of > ifeq () conditions. Ok, so the policy for the future would be to support 5.6/LTS + latest release? For the hash files, is it possible to just add another line? About how to go on: I'm not clear if my v4 set stayed without comments, for above not being integrated or just Christmas/New Years. Also, the proposed release date of 5.8 moved to the 17th of January in the meanwhile. What would be a good next step? Happy new year! Andreas > > Thanks! > > Thomas > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2017-01-02 8:55 ` Andreas Naumann @ 2017-01-03 12:35 ` Thomas Petazzoni 2017-01-04 17:02 ` Andreas Naumann 0 siblings, 1 reply; 41+ messages in thread From: Thomas Petazzoni @ 2017-01-03 12:35 UTC (permalink / raw) To: buildroot Hello, On Mon, 2 Jan 2017 09:55:13 +0100, Andreas Naumann wrote: > > If you look at your patch switching to 5.8 there is in fact very, very > > little change in the .mk files, so that can be handled with a bunch of > > ifeq () conditions. > > Ok, so the policy for the future would be to support 5.6/LTS + latest > release? Yes, latest LTS and latest release. > For the hash files, is it possible to just add another line? Yes, it is possible to have as many lines as you want in a hash file, matching different files. > About how to go on: I'm not clear if my v4 set stayed without comments, > for above not being integrated or just Christmas/New Years. People haven't had the time to review it. I will not personally be able to look into it within the next two weeks, but hopefully someone else can have a look. However, I guess we need a version of the series that keeps the LTS version around. > Also, the proposed release date of 5.8 moved to the 17th of January > in the meanwhile. What would be a good next step? Definitely. Thanks! Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2017-01-03 12:35 ` Thomas Petazzoni @ 2017-01-04 17:02 ` Andreas Naumann 2017-01-15 22:04 ` Thomas Petazzoni 0 siblings, 1 reply; 41+ messages in thread From: Andreas Naumann @ 2017-01-04 17:02 UTC (permalink / raw) To: buildroot Hi, Am 03.01.2017 um 13:35 schrieb Thomas Petazzoni: > Hello, > > On Mon, 2 Jan 2017 09:55:13 +0100, Andreas Naumann wrote: > >>> If you look at your patch switching to 5.8 there is in fact very, very >>> little change in the .mk files, so that can be handled with a bunch of >>> ifeq () conditions. >> >> Ok, so the policy for the future would be to support 5.6/LTS + latest >> release? > > Yes, latest LTS and latest release. > >> For the hash files, is it possible to just add another line? > > Yes, it is possible to have as many lines as you want in a hash file, > matching different files. > >> About how to go on: I'm not clear if my v4 set stayed without comments, >> for above not being integrated or just Christmas/New Years. > > People haven't had the time to review it. I will not personally be able > to look into it within the next two weeks, but hopefully someone else > can have a look. > > However, I guess we need a version of the series that keeps the LTS > version around. Ok, I'll see if I get to it. What should be the default? Regards, Andreas > >> Also, the proposed release date of 5.8 moved to the 17th of January >> in the meanwhile. What would be a good next step? > > Definitely. > > Thanks! > > Thomas > ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2017-01-04 17:02 ` Andreas Naumann @ 2017-01-15 22:04 ` Thomas Petazzoni 2017-01-24 9:50 ` Zoltan Gyarmati 0 siblings, 1 reply; 41+ messages in thread From: Thomas Petazzoni @ 2017-01-15 22:04 UTC (permalink / raw) To: buildroot Hello, On Wed, 4 Jan 2017 18:02:02 +0100, Andreas Naumann wrote: > > However, I guess we need a version of the series that keeps the LTS > > version around. > Ok, I'll see if I get to it. What should be the default? I'm not sure. I believe Buildroot generally default to the latest version for most components, so we should probably do the same as well here. Best regards, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2017-01-15 22:04 ` Thomas Petazzoni @ 2017-01-24 9:50 ` Zoltan Gyarmati 2017-01-24 13:59 ` Andreas Naumann 0 siblings, 1 reply; 41+ messages in thread From: Zoltan Gyarmati @ 2017-01-24 9:50 UTC (permalink / raw) To: buildroot Dear All, i agree with Thomas on setting the latest version as default. If one needs the LTS version, probably s/he will be aware of the fact that it has to be set explicitly. @Andreas, as Qt 5.8 is out, are you planning to update and re-submit your patches? If you do so, I'll be more than happy to test them and provide feedback. Thanks, regards Zoltan Gyarmati https://zgyarmati.de On 01/15/2017 11:04 PM, Thomas Petazzoni wrote: > Hello, > > On Wed, 4 Jan 2017 18:02:02 +0100, Andreas Naumann wrote: > >>> However, I guess we need a version of the series that keeps the LTS >>> version around. >> Ok, I'll see if I get to it. What should be the default? > I'm not sure. I believe Buildroot generally default to the latest > version for most components, so we should probably do the same as well > here. > > Best regards, > > Thomas -------------- 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/20170124/f1dfe7d9/attachment.asc> ^ permalink raw reply [flat|nested] 41+ messages in thread
* [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc 2017-01-24 9:50 ` Zoltan Gyarmati @ 2017-01-24 13:59 ` Andreas Naumann 0 siblings, 0 replies; 41+ messages in thread From: Andreas Naumann @ 2017-01-24 13:59 UTC (permalink / raw) To: buildroot Hi, Am 24.01.2017 um 10:50 schrieb Zoltan Gyarmati: > Dear All, > > i agree with Thomas on setting the latest version as default. If one > needs the LTS version, probably s/he will be aware of the fact that it > has to be set explicitly. > > @Andreas, as Qt 5.8 is out, are you planning to update and re-submit > your patches? If you do so, I'll be more than happy to test them and > provide feedback. yes I am. I implemented the choice last week and was waiting for the release. Now I need to regenerate hashes, run some compile test.. regards, Andreas > > Thanks, regards > > Zoltan Gyarmati > https://zgyarmati.de > > On 01/15/2017 11:04 PM, Thomas Petazzoni wrote: >> Hello, >> >> On Wed, 4 Jan 2017 18:02:02 +0100, Andreas Naumann wrote: >> >>>> However, I guess we need a version of the series that keeps the LTS >>>> version around. >>> Ok, I'll see if I get to it. What should be the default? >> I'm not sure. I believe Buildroot generally default to the latest >> version for most components, so we should probably do the same as well >> here. >> >> Best regards, >> >> Thomas > > ^ permalink raw reply [flat|nested] 41+ messages in thread
end of thread, other threads:[~2017-01-24 13:59 UTC | newest] Thread overview: 41+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-12-13 14:59 [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 1/7] qt5: Remove all hashes Andreas Naumann 2016-12-13 15:50 ` Thomas Petazzoni 2016-12-13 16:35 ` Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 2/7] qt5: bump to 5.8.0-rc Andreas Naumann 2016-12-13 15:53 ` Thomas Petazzoni 2016-12-16 20:30 ` Peter Seiderer 2016-12-19 9:50 ` Andreas Naumann 2016-12-19 20:31 ` Peter Seiderer 2016-12-16 22:03 ` Peter Seiderer 2016-12-19 9:28 ` Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 3/7] qt5enginio : move into legacy compatibility Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 4/7] qt53d/qt5quickcontrols2/qt5serialbus : move out of tech preview Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 5/7] Revert "qt5base: install bundled fonts to target" Andreas Naumann 2016-12-16 20:47 ` Peter Seiderer 2016-12-19 9:13 ` Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 6/7] qt5declarative: enable Quick for non-GL platforms Andreas Naumann 2016-12-13 14:59 ` [Buildroot] [PATCH v3 7/7] qt5quickcontrols1/2: enable for software renderer Andreas Naumann 2016-12-13 15:49 ` [Buildroot] [PATCH v3 0/7] qt5 bump to 5.8.0-rc Thomas Petazzoni 2016-12-13 16:15 ` Peter Korsgaard 2016-12-13 16:22 ` Thomas Petazzoni 2016-12-13 16:34 ` Peter Korsgaard 2016-12-13 16:34 ` François Perrad 2016-12-13 16:46 ` Peter Korsgaard 2016-12-13 21:13 ` Thomas Petazzoni 2016-12-14 9:50 ` Will Wagner 2016-12-13 16:54 ` Andreas Naumann 2016-12-17 14:47 ` Thomas Petazzoni 2016-12-13 16:24 ` Andreas Naumann 2016-12-13 16:44 ` Thomas Petazzoni 2016-12-17 14:46 ` Thomas Petazzoni 2016-12-19 9:13 ` Andreas Naumann 2016-12-19 9:26 ` Thomas Petazzoni 2016-12-21 9:13 ` Andreas Naumann 2016-12-21 9:20 ` Thomas Petazzoni 2017-01-02 8:55 ` Andreas Naumann 2017-01-03 12:35 ` Thomas Petazzoni 2017-01-04 17:02 ` Andreas Naumann 2017-01-15 22:04 ` Thomas Petazzoni 2017-01-24 9:50 ` Zoltan Gyarmati 2017-01-24 13:59 ` Andreas Naumann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox