summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5base
Commit message (Collapse)AuthorAgeFilesLines
* qt5base: add qmake.conf fixup for i.MX platformsGary Bisson2017-11-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | As stated in QTBUG-61156 [1], since Qt5.9 all the Qt apps fail to start on i.MX platforms. The reason is that the qmake.conf should apparently now specify which eglfs backend to use. It can be seen in the qmake.conf example for i.MX [2]. It has also been integrated into the Yocto meta-freescale layer [3]. Although this issue can be worked around by exporting a variable (QT_QPA_EGLFS_INTEGRATION=eglfs_viv), this patch aims at providing a more user-friendly approach by modifying qmake.conf when created. [1]: https://bugreports.qt.io/browse/QTBUG-61156 [2]: https://github.com/qt/qtbase/blob/5.9/mkspecs/devices/linux-imx6-g%2B%2B/qmake.conf#L35 [3]: https://github.com/Freescale/meta-freescale/blob/master/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch [Peter: simplify conditional, add comment explaining why] Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> Tested-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* qt5base: add 3rdparty/harfbuzz-ng license file hashPeter Seiderer2017-11-051-0/+1
| | | | | Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* qt5base: make harfbuzz support selectablePeter Seiderer2017-10-212-0/+24
| | | | | | | | | | If selected use: - system/buildroot harfbuzz in case __sync for 4 bytes is supported - qt harfbuzz otherwise (using QAtomic instead) Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* qt5: bump LTS version to 5.6.3Peter Seiderer2017-10-214-55/+2
| | | | | | | | | | | | | | | | | | | | | qt5base: - move hash file to 5.6.3 - move 0001-eglfs-rasp-pi-header-inclusion.patch to 5.6.3 - remove 0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch (upstream committed [1]) qt5declarative: - move patches to 5.6.3 qt5quickcontrols2: - move hash file to 5.6.3 qt5webkit: - move patches to 5.6.3 [1] http://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.6&id=f1b4bd4790860e1ff5afcec111a359bc3a91cfda Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5: bump latest version to 5.9.2Peter Seiderer2017-10-173-82/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt5base: - removed 0001-Fix-error-attribute-target-crc-is-unknown.patch (upstream committed, see [1]) - removed 0002-examples-fix-compile-without-opengl-support.patch (upstream committed, see [2]) qt5declarative: - removed 0001-Fix-alignment-issue-on-ARMv7.patch (upstream committed, see [3]) - moved 0001-examples-photoviewer-needs-widgets-support.patch to 5.6.2 only (upstream 5.9.2 committed, see [4]) - moved 0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch to 5.6.2 only (similare patch upstream committed, see [5]) qt5location: - removed 0001-Fix-plugins-build-dependency.patch (upstream committed, see [6]) qt5webchannel: - fix webchannel.js installation to target (the locatinon of the file webchannel.js changed from src/webchannel/qwebchannel.js to examples/webchannel/shared/qwebchannel.js, see commit [7]) qt5webengine: - removed 0001-Always-compile-QWebEnginePage-print.patch (upstream committed, see [8]) - keep 0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch (upstream committed, see [9], but reverted afterwards, see [10]) qt5webkit: - fall back to 5.9.1 (no 5.9.2 package provided, see [11] and [12]). [1] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=b7722c251c3a0938c7c71fc3da47fdbe920060b7 [2] http://code.qt.io/cgit/qt/qtbase.git/commit/?id=6ce4b680cdde7827a6ed4d00dbeb7e7e91569433 [3] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=03c2661b1243cc529fc3d8cfa65073f1da420307 [4] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=452a78d0ac4a1579733a8ab641be24c9b7c0dd96 [5] http://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=fa52bb665d6beb77a951c14c8edcba3541850afc [6] http://code.qt.io/cgit/qt/qtlocation.git/commit/?id=3ac051c4549575634cecc706175b019f4ed4c3bf [7] https://code.qt.io/cgit/qt/qtwebchannel.git/commit/?id=e7f150abaa8e81d3e404e9631a49341a7f7623d1 [8] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=085c2c529473bbe9dd7c8c5698a45053520cc423 [9] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=d4c621f6a6b87f2a86069fa393b9f7c4f9e7b9ad [10] http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=c11c2c8981e647c1eb2c6753ce77d436b92fff87 [11] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200724 [12] https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/#comment-1200746 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Tested-by: Joshua Henderson <joshua.henderson@microchip.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5: add license file hashes for all submodulesJoshua Henderson2017-10-172-0/+15
| | | | | | | | | | | | | Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> Reviewed-by: Peter Seiderer <ps.report@gmx.net> ---- Changes v2 --> v3: - use 'Hashes for license files:' instead of repeated 'Hash for license file' (suggested by Thomas Petazzoni) Changes v2: - add reviewed-by and minor commit title change (removed package prefix) Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/qt5base: only build libgtk3 support for X11 backendJoshua Henderson2017-08-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | libgtk3 can conditionally be build with or without the X11 backend unlike libgtk2. If libgtk3 is enabled and the X11 backend is not enabled for BR2_PACKAGE_QT5_VERSION_LATEST, QT_EGL_NO_X11 or MESA_EGL_NO_X11_HEADERS needs to be defined. The proper way is to patch Qt to use pkg-config to fetch the correct flags [1], or to add it to arch.conf like is done in commit 7d286be4f9. For now, however, just disable libgtk3 support unless the X11 backend is used. Fixes http://autobuild.buildroot.net/results/6f3c2fcb0a44cd13ef4c73822d4d08f923291099 [1] https://codereview.qt-project.org/#/c/198906/ Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Brent Sink <brents_3@hotmail.com> Cc: Naoki Matsumoto <n-matsumoto@melcoinc.co.jp> [Arnout: - extend commit message - improve comment - also pass -no-gtk if libgtk3 is not selected] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* qt5base: fix examples compile without opengl supportPeter Seiderer2017-08-081-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes [1]: make[1]: Entering directory '.../build/qt5base-5.9.1/examples/opengl' cd hellowindow/ && ( test -e Makefile || .../build/qt5base-5.9.1/bin/qmake -o Makefile .../build/qt5base-5.9.1/examples/opengl/hellowindow/hellowindow.pro ) && make -f Makefile make[2]: Entering directory '.../build/qt5base-5.9.1/examples/opengl/hellowindow' .../host/bin/sparc-linux-g++ -c -pipe -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os --sysroot=.../host/sparc-buildroot-linux-uclibc/sysroot -O2 -O3 -fno-exceptions -Wall -W -D_REENTRANT -fPIC -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -I. -I../../../include/QtGui/5.9.1 -I../../../include/QtGui/5.9.1/QtGui -I../../../include -I../../../include/QtGui -I../../../include/QtCore/5.9.1 -I../../../include/QtCore/5.9.1/QtCore -I../../../include/QtCore -I.moc -I../../../mkspecs/devices/linux-buildroot-g++ -o .obj/hellowindow.o hellowindow.cpp In file included from hellowindow.cpp:51:0: hellowindow.h:96:5: error: ‘QOpenGLShaderProgram’ does not name a type QOpenGLShaderProgram *m_program; ^~~~~~~~~~~~~~~~~~~~ hellowindow.h:97:5: error: ‘QOpenGLBuffer’ does not name a type QOpenGLBuffer m_vbo; ^~~~~~~~~~~~~ hellowindow.cpp: In constructor ‘Renderer::Renderer(const QSurfaceFormat&, Renderer*, QScreen*)’: hellowindow.cpp:62:40: error: invalid use of incomplete type ‘class QOpenGLContext’ m_context = new QOpenGLContext(this); ^ In file included from ../../../include/QtGui/qsurfaceformat.h:1:0, from ../../../include/QtGui/../../src/gui/kernel/qsurface.h:45, from ../../../include/QtGui/qsurface.h:1, from ../../../include/QtGui/../../src/gui/kernel/qwindow.h:51, from ../../../include/QtGui/qwindow.h:1, from ../../../include/QtGui/QWindow:1, from hellowindow.h:51, from hellowindow.cpp:51: [1] http://autobuild.buildroot.net/results/001/001bc930014fca8c2a8b7a390350b4e1a15fa375/build-end.log Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* package/qt5base: provide "qt.conf" to make "qmake" relocatableWolfgang Grandegger2017-07-202-0/+27
| | | | | | | | | | | | The file "qt.conf" can be used to override the hard-coded paths that are compiled into the Qt library. This is required to make "qmake" relocatable. Actually, we need to specify all variables to overwrite the compiled in values. CC: Julien Corjon <corjon.j@ecagroup.com> CC: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: add sob and upstream url to ↵Peter Seiderer2017-07-201-0/+3
| | | | | | | 5.9.1/0001-Fix-error-attribute-target-crc-is-unknown.patch Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/qt5: bump latest version to 5.9.1Joshua Henderson2017-07-209-280/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.9 is a Long Term Support version [1]. Some license file changes are involved, a new dependency on pcre2, and some filename changes. qt5webkit popped back into the picture for 5.9.1 after being absent for 5.9.0 "officially." QT5_SNAPSHOTS_SITE is removed with this commit as it is not used for qtwebkit anymore. This removes the following patches that have been upstreamed for 5.9.1: - qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch [2] - qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch [3] - qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch [4] - qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch [5] - qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch [6] - qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch [7] The qt5webkit patches no longer apply to both the LTS and latest version, so they are moved to per-version directories. [1] https://www.qt.io/qt5-9/ [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff [3] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44 [4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=5cc0de2e084cb887a75b076b82cf470ecdcd4dd3 [5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e9a7739e77f79baeb5452189b6d17e63de5b341d [6] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=18d49808db46add078d9d4bcffaac5361d5c7269 [7] https://code.qt.io/cgit/qt/qtwebkit.git/commit/?id=548380af096f8277e460383c81a4ecdf2b77523f Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Brent Sink <brents_3@hotmail.com> Cc: Naoki Matsumoto <n-matsumoto@melcoinc.co.jp> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: fix qthash error attribute(target("+crc")) is unknownPeter Seiderer2017-07-161-0/+44
| | | | | | | | | | | | | Add patch 0005-Fix-error-attribute-target-crc-is-unknown.patch. Upstream: https://codereview.qt-project.org/200171 Fixes buildroot Bug 9916 ([1]). [1] https://bugs.busybox.net/show_bug.cgi?id=9916 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Globally replace $(HOST_DIR)/usr with $(HOST_DIR)Arnout Vandecappelle2017-07-051-1/+1
| | | | | | | | | | | Since things are no longer installed in $(HOST_DIR)/usr, the callers should also not refer to it. This is a mechanical change with git grep -l '\$(HOST_DIR)/usr' | xargs sed -i 's%\$(HOST_DIR)/usr%$(HOST_DIR)%g' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Revert "package/qt5base: provide "qt.conf" to make "qmake" relocatable"Thomas Petazzoni2017-07-052-14/+0
| | | | | | | | | | | | This reverts commit a2efb84dec42608e46860a24c31db5a4588edd1e, as it causes files to be installed in an invalid location, causing build failures. Fixes: http://autobuild.buildroot.net/results/a1a9eeb7fec07a2f9f0d05e6c1900ad7cffb6656/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/qt5base: provide "qt.conf" to make "qmake" relocatableWolfgang Grandegger2017-07-042-0/+14
| | | | | | | | | | | | | The file "qt.conf" can be used to override the hard-coded paths that are compiled into the Qt library. We need it to make "qmake" relocatable. CC: Julien Corjon <corjon.j@ecagroup.com> CC: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> [Thomas: - use | instead of \ as sed separator, suggested by Arnout. - fix indentation, suggested by Arnout.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/qt5base: enable static build for BR2_PACKAGE_QT5BASE_TSLIBMartin Kepplinger2017-06-111-4/+0
| | | | | | | | | | | | The dependency on !BR2_STATIC_LIBS was here because of tslib not supporting static builds. But since commit 05fadfea1 ("package/tslib: enable statically linked building") it does and we can remove this dependecy. Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/qt5/qt5base: needs host gcc >= 4.8 for icu supportBernd Kuhls2017-06-101-2/+4
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/qt5base: link with -latomic when neededYann E. MORIN2017-06-081-0/+7
| | | | | | | | | | | | | | | | Qt 5.8 needs atomic operations, which are provided in libatomic when it exists, like on sparc with gcc >= 4.8. Fixes: http://autobuild.buildroot.org/results/49b/49bc9345b9849c9c3c53ace290c534ff7bb98683/ http://autobuild.buildroot.org/results/9f2/9f213406954be51dfcad76ebdce8b73850842180/ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Peter Seiderer <ps.report@gmx.net> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/qt5base: install arch-specific configurationYann E. MORIN2017-06-082-0/+6
| | | | | | | | | | | | | | For some architectures, it is necessary to link with additional libraries, such as -latomic for sparc. Add a bit of support to make that easy; actual use will be introduced in the following patch. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Peter Seiderer <ps.report@gmx.net> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/icu: bump version to 59.1Bernd Kuhls2017-06-051-0/+5
| | | | | | | | | | | | According to the release notes "Compiler support for C++11 is now required for building the ICU libraries. GCC: version 4.8 and later has been tested." Added corresponding dependencies and reverse dependencies. Removed patch 0006 applied upstream. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: fix examples compile with disabled gui modulePeter Seiderer2017-05-071-0/+42
| | | | | | | | | | | Fixes [1]: Project ERROR: Could not find feature opengl. [1] http://autobuild.buildroot.net/results/040/040ab283dbbec623fe5ff4eaece754d9701fafc5 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/q*/Config.in: fix ordering of statementsAdam Duskett2017-05-021-5/+5
| | | | | | | | | | | | | The check-package script when ran gives warnings on ordering issues on all of these Config files. This patch cleans up all warnings related to the ordering in the Config files for packages starting with the letter q in the package directory. The appropriate ordering is: type, default, depends on, select, help See http://nightly.buildroot.org/#_config_files for more information. Signed-off-by: Adam Duskett <Adamduskett@outlook.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/qt5: drop option for license approvedYann E. MORIN2017-04-291-4/+0
| | | | | | | | | | | | | | | | | | | As stated in previous commits, Buildroot only ever uses the free license, and we do not have a click-wrap approval for any such free license for any other package. The option to approve the license now has no prompt and is no longer used anywhere. Legacy handling is not added because it is not useful: when the option was enabled, it meant "accept the open source license", which is now the default and only existing behavior. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Peter Seiderer <ps.report@gmx.net> [Thomas: remove legacy handling as suggested by Arnout.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/qt5base: always use the opensource licenseYann E. MORIN2017-04-291-5/+0
| | | | | | | | | | | | | We never ask the user to confirm their assent about the use of a free license; there is no reason we do so for Qt. The output of legal-info is there to gather all the licenses used in a build; the license for qt5base will be there to be consulted as well. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/qt5base: default to approved licenseYann E. MORIN2017-04-291-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | The only license we can act upon in Buildroot is the publicly available license. Qt can come under non-free licenses, but we have no access to such licenses. The conditions to access the code under those non-free, non-public licenses is unknown. Besides, Qt5 (with Qt) is the only package that has this choice; for other packages in a similar situation, we only use the free, publicly-known licenses. Finally, the name of the tarballs we download clearly hint that they can only be used under the free license. Drop the prompt to the accepted license, and make it mandatory; packages will be adapted in follow-up patches. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package: use SPDX short identifier for GFDL family licensesRahul Bedarkar2017-04-011-2/+2
| | | | | | | | | | | | We want to use SPDX identifier for license string as much as possible. SPDX short identifier for GFDLv1.1/GFDLv1.2/GFDLv1.3 is GFDL-1.1/ GFDL-1.2/GFDL-1.3. This change is done using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/GFDL(v)?([1]\.[1-3])(\+)?/GFDL-\2\3/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* boot, package: use SPDX short identifier for BSD-3cRahul Bedarkar2017-04-011-1/+1
| | | | | | | | | | | We want to use SPDX identifier for license string as much as possible. SPDX short identifier for BSD-3c is BSD-3-Clause. This change is done using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/BSD-3c/BSD-3-Clause/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package: use SPDX short identifier for LGPLv3/LGPLv3+Rahul Bedarkar2017-04-011-2/+2
| | | | | | | | | | | We want to use SPDX identifier for license string as much as possible. SPDX short identifier for LGPLv3/LGPLv3+ is LGPL-3.0/LGPL-3.0+. This change is done using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/LGPLv3(\+)?/LGPL-3.0\1/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* boot, package: use SPDX short identifier for LGPLv2.1/LGPLv2.1+Rahul Bedarkar2017-04-011-1/+1
| | | | | | | | | | | We want to use SPDX identifier for license string as much as possible. SPDX short identifier for LGPLv2.1/LGPLv2.1+ is LGPL-2.1/LGPL-2.1+. This change is done using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/LGPLv2.1(\+)?/LGPL-2.1\1/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* boot, package: use SPDX short identifier for GPLv3/GPLv3+Rahul Bedarkar2017-04-011-2/+2
| | | | | | | | | | | | We want to use SPDX identifier for license string as much as possible. SPDX short identifier for GPLv3/GPLv3+ is GPL-3.0/GPL-3.0+. This change is done using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv3\>/GPL-3.0/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+Rahul Bedarkar2017-04-011-1/+1
| | | | | | | | | | | We want to use SPDX identifier for license strings as much as possible. SPDX short identifier for GPLv2/GPLv2+ is GPL-2.0/GPL-2.0+. This change is done by using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv2\>/GPL-2.0/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: install libQt5EglFsKmsSupportPeter Seiderer2017-03-121-0/+3
| | | | | | | | | | | According to src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro depends on eglfs_gbm which depends according to src/gui/configure.json on features.eglfs and features.gbm and features.kms, so dependency on BR2_PACKAGE_MESA3D_OPENGL_EGL which enables mesa3d gbm support should be sufficient. Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: fix eglfs x11 header related compile failurePeter Seiderer2017-03-121-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add egl config and QT_EGL_NO_X11 define (as all other eglfs project files do) to src/plugins/platforms/eglfs/eglfs-plugin.pro. Fixes ([1]): In file included from .../host/usr/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/EGL/egl.h:39:0, from ../../../../include/QtEglSupport/5.8.0/QtEglSupport/private/../../../../../src/platformsupport/eglconvenience/qt_egl_p.h:63, from ../../../../include/QtEglSupport/5.8.0/QtEglSupport/private/qt_egl_p.h:1, from api/qeglfsglobal_p.h:56, from api/qeglfsintegration_p.h:54, from qeglfsmain.cpp:41: .../host/usr/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/EGL/eglplatform.h:119:22: fatal error: X11/Xlib.h: No such file or directory compilation terminated. Makefile.eglfs-plugin:1024: recipe for target '.obj/qeglfsmain.o' failed make[2]: *** [.obj/qeglfsmain.o] Error 1 make[2]: Leaving directory '.../qt5base-5.8.0/src/plugins/platforms/eglfs' Makefile:71: recipe for target 'sub-eglfs-plugin-pro-make_first-ordered' failed make[1]: *** [sub-eglfs-plugin-pro-make_first-ordered] Error 2 [1] http://lists.busybox.net/pipermail/buildroot/2017-March/186158.html Signed-off-by: Peter Seiderer <ps.report@gmx.net> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: fix compilation error with gcc-4.8Vicente Olivert Riera2017-03-091-0/+65
| | | | | | | | | | | | | Add a patch to fix a compilation error when using gcc-4.8. Bug report: https://bugreports.qt.io/browse/QTBUG-59399 Patch sent upstream: https://codereview.qt-project.org/#/c/187980/ Fixes: http://autobuild.buildroot.net/results/2ac/2ac16335d16cd53cceeabda8f963c9b288a9a1c8/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: fix VNC platform plugin build on big-endian machinesPeter Seiderer2017-02-281-0/+97
| | | | | | | | | | | | | | Fixes [1], [2]: In file included from qvncintegration.cpp:38:0: qvncscreen.h:76:22: error: expected ';' at end of member declaration bool swapBytes() const [1] http://autobuild.buildroot.net/results/718/7180ad7d7e78f1c3ce6a1f83a5a8fcc5e0ac03a2 [2] http://autobuild.buildroot.net/results/14f/14f8c436b184192681fb79c7f0c0d0daa35f867b Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* qt5base: use system/buildroot provided freetypePeter Seiderer2017-02-202-1/+8
| | | | | | | | | | | | | | | | | | | | | Select (and use) builroot provided freetype in case qt5base gui is selected (gui without freetype/font support makes not much sense and gives compile errors). Qt 5.6 needs some support to find the include headers, 5.8 is clever enough inherently. Fixes [1] (by avoiding the build-in freetype library which depends on activated libpng support): Project ERROR: Library 'libpng' is not defined. make[3]: *** [sub-3rdparty-freetype-make_first] Error 3 [1] http://autobuild.buildroot.net/results/219162ba616289f799a5053c4dcc6b8574284283 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: move linuxfb configure option commentPeter Seiderer2017-02-201-2/+2
| | | | | | | Move the two comment lines to where they apply. Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5: Rename version variable to include _PACKAGE_Naumann Andreas2017-02-111-5/+5
| | | | | Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Revert "tslib: needs kernel headers 3.12"Martin Kepplinger2017-02-091-3/+2
| | | | | | | | | | | | | | | This reverts commit 7c60211ce38273580f1f8bf5886771406f9899ca. tslib-1.4 removes this dependency. Add upstream patch that fixes input macros declaration for older kernels. The ts_uinput tool requires 3.6 headers; disable for older kernels. Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com> [baruch: add tslib patch; disable ts_uinput] Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* qt5base: conditionally install bundled fonts to targetJulien Corjon2017-02-071-0/+2
| | | | | | | | | | | | | | qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645 So for Qt Version 5.8.0 this reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384 and part of 186ef9f6f4647ed34b67a3427a5e0e249f0794e7. Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> [Thomas: adjust commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5: add choice between version 5.6.2 and 5.8.0Naumann Andreas2017-02-075-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For 5.8.0 - add hashes - qt5 need C++11 compliant compiler since 5.7 ([1]) - use different licenses: since version 5.7 Qt removed the LGPL v2.1 option in favor of v3 with a different exception - qt5base: renamed library to EglFSDeviceIntegration ([2]) - qt5base: remove ras-pi patch, commit c0cc5052097c723d0331a7619d686af9eb93d33c fix it ([3]) - qt5base: remove 0007-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch (upstream committed [3b]) - qt5base: remove obsolete config-option -large ([4]) - qt5base: gstreamer support fully moved to qt5multimedia, so gstreamer related options are no longer passed ([5]) - add patch for python-pyqt5 to fix the build with Qt 5.8 - add tweak in libv4l to fix the build with Qt 5.8, originally provided by Peter Seiderer - add patch from Peter Seiderer fixing a build issue with freetype For 5.6.2 - moved patches to subdir, and renumber patches [1] http://blog.qt.io/blog/2016/06/16/qt-5-7-released/ [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ec4eb4db61094179bc6a9ec26ec68fb710177053 [3] https://codereview.qt-project.org/#/c/167172/ [3b] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f1b4bd4790860e1ff5afcec111a359bc3a91cfda [4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84d3a21c9efe7efb2cce6d3bd14af1f9580b1108 [5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=7d4da559afb62a779b3d90a65fb679cb5433f203 Signed-off-by: Andreas Naumann <anaumann@ultratronik.de> Signed-off-by: Julien Corjon <corjon.j@ecagroup.com> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> [Thomas: - tweak commit log about GStreamer related changes, suggested by Arnout - move the gcc 4.8 dependency from the main qt5 option to just the qt5.8 selection, so that qt5.6 can still be built if gcc < 4.8 is used. Noticed by Arnout. - rename the options of the version selection to not include the version number itself so that we don't have to keep legacy symbols. Noticed by Arnout. - introduce changes to qt5quickcontrols2.mk needed to handle qt5.6 vs. qt5.8, borrowed from a later patch in the series. - add patch for python-pyqt5 to fix the build with Qt 5.8. - add fix to libv4l.mk from Peter Seiderer to fix the build with Qt 5.8. - renumber patches for 5.6.2, suggested by Arnout.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: add Config.in option to pass custom Qt5 optionsBryce Ferguson2017-02-062-0/+13
| | | | | | | | | | | To reduce the qt5base binary size, we can disable unnecessary features. Instead of trying to map every qt5base option to buildroot, create a single config that we can pass any option too. Then append those to the ones generated by buildroot. Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com> Signed-off-by: Bryce Ferguson <bryce.ferguson@rockwellcollins.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: add examples license informationPeter Seiderer2017-01-281-0/+4
| | | | | Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* tslib: needs kernel headers 3.12Baruch Siach2017-01-191-2/+3
| | | | | | | | | | | | | | | | Kernel headers 3.12+ are required since tslib version 1.3. https://github.com/kergoth/tslib/blob/master/README.markdown Update tslib reverse dependencies. Fixes: http://autobuild.buildroot.net/results/28d/28df38e2a042f1b5940bf35c18334ebf8810a348/ http://autobuild.buildroot.net/results/c38/c383cfee3673aa9fba36a86f1e68de63413c2987/ http://autobuild.buildroot.net/results/6dd/6ddb2cd9f4f41ee03dc10a73422ad37070811732/ Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* qt5base: use libinput if selectedWolfgang Grandegger2017-01-191-0/+7
| | | | | | | | | | Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> [Thomas: - move condition to a different place in the .mk file, with other similar conditions. - add an 'else' clause to pass -no-libinput in order to explicitly disable libinput support when the libinput package is not available.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: fix eglfs compile for odroid-maliPeter Seiderer2016-11-151-0/+53
| | | | | | | | | | | | | | | | | | | | | | | Avoid duplicated struct fbdev_window definition (introduced by [1]) by renaming struct fbdev_window to shadow_fbdev_window. Fixes [2]: qeglfsmaliintegration.cpp:45:8: error: redefinition of 'struct fbdev_window' struct fbdev_window { ^ In file included from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:28:0, from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36, from ../../../eglfs/qeglfsglobal.h:45, from ../../../eglfs/qeglfsdeviceintegration.h:48, from qeglfsmaliintegration.h:37, from qeglfsmaliintegration.cpp:34: [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=58bed4cda98e8e25db8adc61c7db73b6853077dc [2] http://autobuild.buildroot.net/results/48c/48c458c035162169e8ca7c34ae65e9064822f25a Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: improve message if directfb is disabledMatt Kraai2016-10-181-1/+1
| | | | | Signed-off-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* qt5: bump version to 5.6.2Peter Seiderer2016-10-153-36/+2
| | | | | | | | | | | | | | | - qt5base: remove obsolete '-no-nis' configure parameter ([1]) - qt5base: remove upstream committed patch 0007-Remove-libudev-dependency-from-kms.pro.patch ([2]) - qt5imageformats: remove upstream committed patch 0001-tvOS-support.patch ([3]) [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=644d0e75240811212ed9fd0c21e3bd05db3ba5db [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=72492735b7b7770808fcc9fe067e8f03fab827fc [3] https://git.buildroot.net/buildroot/commit/package/qt5?id=9a55b996651fdfbc40e202cb4dd725dce624ca91 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5: Disable passing of -isystem flag in CXXFLAGSAlexey Brodkin2016-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some Qt5 sub-projects as well as 3rd-party apps written on Qt are failing to compile with gcc 6.x like that: ---------------------------->8------------------------- In file included from XXX/output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.2.1/bits/stl_algo.h:59:0, from XXX/output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.2.1/algorithm:62, from XXX/output/host/usr/arc-buildroot-linux-uclibc/sysroot/usr/include/qt5/QtCore/qglobal.h:88, from XXX/output/host/usr/arc-buildroot-linux-uclibc/sysroot/usr/include/qt5/QtCore/qpair.h:37, from qmediametadata.h:37, from qmediametadata.cpp:28: XXX/output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.2.1/cstdlib:75:25: fatal error: stdlib.h: No such file or directory #include_next <stdlib.h> ^ compilation terminated. ---------------------------->8------------------------- That happens because qmake trying to play smart passes some include paths in Makefile with "-isystem" prefix. Which in some cases lead to build failure well described in [1]. A little bit more details below on what really happens: 1. In "configure" script Qt determines default include paths of the toolchain and stores them in DEFAULT_INCDIRS variable, see [2]. 2. On qmake execution when it creates Makefile out of .pro-file it parses headers in INCLUDEPATH variable and if a path matches one in DEFAULT_INCDIRS then in CXXFLAGS that path is written with $QMAKE_CFLAGS_ISYSTEM prefix, otherwise non-matching include path ends up in CXXFLAGS with normal "-I" prefix. 3. By default for gcc "QMAKE_CFLAGS_ISYSTEM = -isystem", see [3]. 4. gcc fails to find stdlib.h, again refer to Jörg's explanation in [1]. What we do here we force set QMAKE_CFLAGS_ISYSTEM to "" and so qmake won't use "-isystem" any longer instead expected "-I" will be used for all headers, see [4]. That fixes building of Qt5Webkit on ARM with gcc 6.x and a number of autobuilder failures for ARC (the an arch that uses gcc 6 by default) like: http://autobuild.buildroot.net/results/56a/56a6700774af692e7f5a99b452b15e4e8592310f http://autobuild.buildroot.net/results/697/697412b29bf031bf8f246cc3af97ebcbf6bf6d1b [1] https://git.buildroot.net/buildroot/commit/?id=e79272fa7ff3d66c18de3514b912cd9d68d121a4 [2] http://code.qt.io/cgit/qt/qtbase.git/tree/configure?h=5.6.1#n3660 [3] http://code.qt.io/cgit/qt/qtbase.git/tree/mkspecs/common/gcc-base.conf?h=5.6.1#n47 [4] http://code.qt.io/cgit/qt/qtbase.git/tree/qmake/generators/unix/unixmake2.cpp?&h=5.6.1#n193 Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Peter Seiderer <ps.report@gmx.net> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt5base: remove libudev dependency from kmsPeter Seiderer2016-08-201-0/+33
| | | | | | | | | | | | | | | | | | | | Use upstream patch [1] Fixes [2]: KMS auto-detection... () Project ERROR: libudev development package not found KMS disabled. KMS support cannot be enabled due to functionality tests! Turn on verbose messaging (-v) to ./configure to see the final report. If you believe this message is in error you may use the continue switch (-continue) to ./configure to continue. [1] https://code.qt.io/cgit/qt/qtbase.git/patch/?id=72492735b7b7770808fcc9fe067e8f03fab827fc [2] http://autobuild.buildroot.net/results/063/063859ad460552dd7c101115500b7845045a134f Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
OpenPOWER on IntegriCloud