3c6958423f
The tarball filename has changed since 5.10. The module suffix
*opensource-src* has changed to *everywhere-src*. I introduced the
*QT5_SOURCE_TARBALL_PREFIX* variable to set the right filename according
to the Qt version.
qtwebengine:
Select libnss. It is a requirement[1] because OpenSSL
certificate validation[2] and NSS bundle[3] was dropped.
Add host-libnss and host-libpng to satisfy new requirement to
build an internal host-tool.
Set ninja host pkg-config tool using environment variable
$GN_PKG_CONFIG_HOST[4]. The build system uses pkg-config to get
package data for both host and target architectures. Using the
same call to pkg-config for both target and host leads to build
mismatches: it tries to link a host-tool using target libraries.
qt5base:
sqlite plugin now uses sqlite3_column_table_name16() so select
BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA to make sure it is
available.
qt5multimedia:
libqgsttools was renamed to libQtMultimediaGstTools. The latter
name matches the libQt5Multimedia*.so.* pattern so no additional
copy command is needed for it anymore.
qt5xmlpatterns:
Names of the license files have changed: LICENSE.(L)GPLv3 ->
LICENSE.(L)GPL3. The new files in fact already existed in 5.9.4
but the old ones were not removed yet. The new files are
slightly different: there used to be a Qt header in front of it
which is now removed. Also LICENSE.LGPL3 is rewrapped.
qt5location, qt5quickcontrols, qt5serialport:
Same license files issue, and for LICENSE.GPLv2 as well.
LICENSE.GPL2 has the "How to Apply These Terms to Your New
Programs" text appended to it.
qt5script:
Similar license file issues, but the new license files were not
present yet. LICENSE.GPLv21 was removed so there is no longer a
license file for the LGPL-2.1-covered Qt code.
[1]: 9b449045fb
[2]: https://codereview.chromium.org/2862543003
[3]: https://codereview.chromium.org/1882433002
[4]: https://github.com/qt/qtwebengine/blob/v5.10.1/src/core/config/linux.pri#L111-L125
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
[Peter:
- fix sqlite plugin support in qt5base;
- fix target installation of qt5multimedia
]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Arnout:
- create a local host-pkg-config tool instead of extending pkgconf;
- pass the same options to host-pkg-config as we do for other packages;
- carry the EGL mesa3d X11 headers patch;
- update license file names and hashes
]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From c11299086b7718332e2b4fbc37ce6f6ff427c5ba Mon Sep 17 00:00:00 2001
|
|
From: Yuqing Zhu <carol.zhu@nxp.com>
|
|
Date: Mon, 27 Mar 2017 15:33:35 +0800
|
|
Subject: [PATCH] qtbase: Fix build error when using EGL
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=utf-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
A build error was occurring due to missing EGL configuration.
|
|
|
|
Fixed by adding the necessary ties to the EGL pkg-config.
|
|
|
|
Task-number: QTBUG-61712
|
|
Change-Id: I87190ea39392b4604c563cf9d89edb85068d85fc
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
|
|
---
|
|
mkspecs/features/egl.prf | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf
|
|
index 9fa0c9e219..85d5852ba6 100644
|
|
--- a/mkspecs/features/egl.prf
|
|
+++ b/mkspecs/features/egl.prf
|
|
@@ -1,3 +1,9 @@
|
|
+# egl headers need a definition
|
|
+PKG_CONFIG = $$pkgConfigExecutable()
|
|
+PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl)
|
|
+PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*)
|
|
+QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS
|
|
+
|
|
INCLUDEPATH += $$QMAKE_INCDIR_EGL
|
|
LIBS_PRIVATE += $$QMAKE_LIBS_EGL
|
|
QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
|
|
--
|
|
2.16.1
|
|
|