Commit Graph

75 Commits

Author SHA1 Message Date
Martin Jansa 4b7182a3be qt5: Upgrade from 5.2.0 to 5.2.1
* qtwayland: Use default LICENSE and LIC_FILES_CHKSUM
  * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a
* qtdeclarative, qtserialport: Update QT_MODULE_BRANCH
  * SHA-1 of v5.2.1 tag is only in release branch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
Andreas Müller 0b4bdeb6c1 qtbase: remove gstreamer packageconfig
Nothing in qtbase uses gstreamer so the configure option was removed on the way
to 5.2 [1]. Fixes:

| -no-gstreamer: invalid command-line switch

[1] e25a4faf4a

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2014-01-12 15:03:21 +01:00
Martin Jansa c908fe4ebd qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch
  resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5
* drop 0020-Use-BGRA-extension-in-bindTexture.patch
  resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c
* drop 0008-wayland-scanner-disable-silent-rules.patch
  resolved upstream in:
  commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c
  Author: Jan Arne Petersen <jan.petersen@kdab.com>
  Date:   Fri Jul 19 14:35:19 2013 +0200
  Fix wayland-scanner to work with CONFIG+=silent

* squash to match more with structure of
  https://github.com/meta-qt5/qtbase/tree/stable

* qtmodules: bump SRCREVs for 5.2.0 tags
  now all modules using qt5-git should be newer than any 5.1.* version
* qtbase: fix paths in packageconfig *.pc files
  include- and lib-paths contained build-sysroot paths
* qtwebkit: Explicitly add ICU libraries to LIBS
  fails to build without this
* qtjsbackend: remove for git versions
  Found in [1]:
  Qt Qml is now using its own built-in Javascript engine and does not depend on
  V8 anymore. As such the QtJSBackend shared library has disappeared.
  [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/
* qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes
  qtjsbackend is now completely gone
  it allows to share more .patch files and configuration in .inc again

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-12 15:01:37 +01:00
Jonathan Liu c36be1724a qtbase: add upstream QTBUG-34218/QTBUG-34234 misaligned selection patch
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-29 11:48:47 +01:00
Martin Jansa e1d2257f60 qtbase: Use bundled freetype by default
* system freetype works only together with fontconfig
* building qbasicfontdatabase fails with system freetype and without
  fontconfig or with freetype completely disabled
  | /home/jenkins/webos-ports/workspace/webos-ports/tmp-eglibc/sysroots/a500/usr/include/ft2build.h:56:38:
    fatal error: freetype/config/ftheader.h: No such file or directory
  |  #include <freetype/config/ftheader.h>
  |                                       ^
  | compilation terminated.
  | make[2]: *** [.obj/release-shared/qbasicfontdatabase.o] Error 1
  | make[2]: *** Waiting for unfinished jobs....

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-12 19:03:49 +02:00
Martin Jansa 4c177a661f qtbase: Disable freetype by default
* building qbasicfontdatabase fails without fontconfig enabled
  | /home/jenkins/webos-ports/workspace/webos-ports/tmp-eglibc/sysroots/a500/usr/include/ft2build.h:56:38:
    fatal error: freetype/config/ftheader.h: No such file or directory
  |  #include <freetype/config/ftheader.h>
  |                                       ^
  | compilation terminated.
  | make[2]: *** [.obj/release-shared/qbasicfontdatabase.o] Error 1
  | make[2]: *** Waiting for unfinished jobs....

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-11 22:12:19 +02:00
Martin Jansa af6014e3bc qtbase: Disable fontconfig by default
* it was explicitly disabled in
  commit 1b14686657
  Author: Philip Craig <phil@blackmoth.com.au>
  Date:   Wed Jun 26 02:13:02 2013 +0000
  Subject: qtbase: disable fontconfig support by default
* and then accidentaly enabled with PACKAGECONFIG changes
  commit ebdd83f6b7
  Author: Martin Jansa <Martin.Jansa@gmail.com>
  Date:   Sat Jul 20 00:02:57 2013 +0200
  Subject: qtbase: explicitly enable or disable all deps
* Thanks to Nicolas Dechesne for reporting it

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-10 12:39:36 +02:00
Jonathan Liu 096a380851 qtbase: add upstream QTBUG-31579 patch for QPainter regression
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-10 12:35:18 +02:00
Denys Dmytriyenko 67be006397 qtbase.inc: PACKAGECONFIG[linuxfb] shouldn't depend on nonexistent linuxfb package
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:10 +02:00
Eric Bénard 105ad2a18e qtbase: update to 5.1.1
- patch 10 was update
- patch 19 & 25 are merged so no more needed

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-08 15:50:09 +02:00
Tasslehoff Kjappfot f11b1722e2 qtquickcontrols: Add module for 5.1.0 and git versions
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-09-17 14:49:33 +02:00
Martin Jansa c3632023e1 qtbase: be more specific in opengl switch with gl in PACKAGECONFIG
* full GL is called desktop in qtbase configure
* without this it will try to autodetect and doesn't fail when
  e.g. mesa wasn't built before qtbase

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-15 12:27:27 +02:00
Jonathan Liu 886e8ee5bd qtbase: add upstream QTBUG-32534 patch for QHttpMultiPart corruption
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-13 09:42:51 +02:00
Simon Busch 243e05f1de qtbase: fix cmake files to use our host binaries
* only for qt 5.1.0; didn't had the time to port this to 5.0.2
* client recipes need to export OE_QMAKE_PATH_EXTERNAL_HOST_BINS in EXTRA_OECMAKE

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 22:33:53 +02:00
Christian Gagneraud 07301a1636 qtbase.inc: Fix qtbase-tools runtime depencency on perl
* While building a custom rootfs using poky, meta-oe, meta-ti
  and meta-qt5 (all on Dylan branch), I got the following error:
  [...]
  Computing transaction...error: Can't install
    qtbase-tools-5.0.2-r2.0@armv7a_vfp_neon: no package provides /usr/bin/perl
  [...]
* syncqt is perl script with /usr/bin/perl shebang, that's why rpm
  was complaining (other package managers in OE doesn't check that)

Signed-off-by: Christian Gagneraud <chgans@gna.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:21:12 +02:00
Martin Jansa 567a4d462f qt5: drop INC_PR and update PR only in 5.0.2 recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa 507c7466ea qt5: bump SRCREVs in git recipes to 5.1.0+
* patches will now be closer to 5.1.0 release

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa ebdd83f6b7 qtbase: explicitly enable or disable all deps
* some options are tri-state and PACKAGECONFIG doesn't support that
  if you need the 3rd option, you need to overwrite PACKAGECONFIG[opt]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:08 +02:00
Philip Craig 1b14686657 qtbase: disable fontconfig support by default
Currently fontconfig support is autodetected. It is better to be
deterministic. Since qtbase-fonts is not installed where fontconfig
will find it, it seems that current users are not using fontconfig.

Signed-off-by: Philip Craig <phil@blackmoth.com.au>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-26 09:04:28 +02:00
Nicolas Dechesne 11ebf35b16 qtbase: typo about virtual/egl depends
The proper 'virtual' name for EGL is virtual/egl, not virtual/libegl,
as per meta/recipes-graphics/mesa/mesa-common.inc.

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-20 12:39:38 +02:00
Alexander Irhin ac8a20d754 qtbase: patches for WebKit hardware accelerated rendering support
0018 - Offset support for QOpenGLPaintDevice is required for
       speedup WebKit hardware rendering.
0019 - Fix FBO restoring in QOpenGLTextureGlyphCache
       Jira task
0020 - Uses right texture format to exclude extra convertion.

Signed-off-by: Alexander Irhin <alexander.irhin@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-07 11:43:33 +02:00
Eric BENARD 1fdab229df qtbase: install and split package fonts
- fonts were not installed (at least in qt 5.0.2) so install
them manually.
- split the font package in smaller package as done in qt4 to
save space on the target.
- use OE_QMAKE_PATH_LIBS which corresponds with:
  mkspecs/features/qpa/genericunixfontdatabase.prf:    fonts.path = $$[QT_INSTALL_LIBS]/fonts

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 18:20:25 +02:00
Martin Jansa 1496c6ba34 qtbase: refresh patches
* all patches applied in recipes should be also applied in
  https://github.com/meta-qt5/qtbase branches to make it
  easier to upgrade to new version without loosing any
  patches
* apply:
  0013-Disable-mkv8snapshot.patch
  0014-enables-tslib-device-to-be-read-from-env-variable.patch
  0015-qtbase-allow-build-of-examples.patch
  also for git version, only
  0016-configure-add-tslib-support.patch
  is now 5.0.2 specific (similar patch already applied in stable branch)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 15:25:53 +02:00
Eric BENARD f52b59a5cc qtbase: add option to enable tslib support
- the tslib support is not enabled by default and configure doesn't have any option
to active it, so add the option to the build system,
- patch tslib support to get the device from the environment variable
(patch taken from https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
- provide variable to enable tslib support in a bbappend (disabled by default)
- tested on an i.MX5x target with qt 5.0.2

TODO : test with 5.0, 5.0.1 and _git

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:55:11 +02:00
Eric BENARD 440e7829dc qtbase: remove non existing parts
make/nomake demos doesn't exist in qt5.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:42:32 +02:00
Oleg Shparber a991d0c2ac Allow to control (disable) widgets build 2013-05-28 10:40:19 +02:00
Martin Jansa 14f6ec2ca2 qtbase: Don't use immediate expansion for OE_QMAKE_QMAKE_ORIG
* full path is part of sstate checksum with immediate expansion

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-24 19:50:00 +02:00
Martin Jansa 35ccafd9c5 qtbase: refresh patches, drop 2 unused
* drop Change-Ids, add Upstream-Status
* 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was
  rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't
  used in recipes

* 0004-Disable-mkv8snapshot.patch and
  0005-AddSynchoronization-qimagereader.patch are special, because they
  are applied only to 5.0.0

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-21 22:22:05 +02:00
Martin Jansa 34a4b6bc24 qtbase: drop setting arch and endian
* endian option was removed from configure
* arch/host-arch option is now deprecated and configure shows
  warning when it's used
* both are now autodetected

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 19:15:34 +02:00
Martin Jansa 48138bfb27 qtbase: use EXTRA_OEMAKE also in config.tests executed in do_configure
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 16:54:03 +02:00
Simon Busch 94b2064593 qtbase: move virtual/libgl dependency to extra variable
* makes it easier to change desktop gl to gles2 in .bbappend

* we cannot explicitly disable opengl with -no-opengl, because then it
  fails to build (probably only when mesa headers are found in sysroot)
  /qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:62:72: error: 'QPlatformOpenGLContext' has not been declared
  /qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp: In constructor 'QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat&, int*, EGLDisplay, EGLenum)':
  /qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:69:70: error: invalid static_cast from type 'int*' to type 'QEGLPlatformContext*'
  The same with 5.0.2

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:56:49 +02:00
Martin Jansa 7caede7850 qmake5: Fix cleaning separate build directory and use it by default
* "${B}/*" in quotes doesn't match anything, better to remove whole directory
  (incluing .files) and recreate it
* not sure why I've added quotes after testing first version, we don't
  expect B with spaces.. but I'm a bit scared with rm -rf ${SOME_VAR}
  after one glibc upgrade cleaned my whole disk and attached NFS array
  when OLD_LOCALE_PATH wasn't detected correctly...
* qmake works well with separate B, use it by default

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:56:49 +02:00
Martin Jansa 56d2c7f18d qmake5_base: export OE_QMAKE variables only in qtbase recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:56:49 +02:00
Martin Jansa 1c29e5de8d qt5: drop 'unset LD', qmake should now handle QMAKE_LINK correctly
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:56:49 +02:00
Martin Jansa c46260790e qtbase: add patch to fix build with LD exported in env
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:56:49 +02:00
Martin Jansa 1965248b7b qmake5: use QT_CONF_PATH variable in do_generate_qt_config_file
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 13:55:04 +02:00
Martin Jansa ed6e2f317f qt5: move variables used only in qtbase to qtbase.inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 15:37:00 +02:00
Martin Jansa f76e45b5a8 qt5: drop EXTRA_ENV
* all variables should be now correctly set by qmake
* setting PARALLEL_MAKE in MAKEFLAGS can cause
  PARALLEL_MAKE * PARALLEL_MAKE processes, because first
  -j is applied on top level directory and then again in
  each subdir, but it's faster then make -j PARALLEL_MAKE
  only in top directory
* setting QMAKE breaks build in src/tools/bootstrap, because it
  forces relative path bin/qmake which isn't correct

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-07 12:18:41 +02:00
Mikko Levonmaa bbaf26aec2 qtbase: Find wayland-scanner correctly
* Remove silent rules for wayland-scanner

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
2013-05-05 12:56:34 +02:00
Martin Jansa 66c091481c qmake5_base: define variables for paths used by qmake in one place
* makes it easier to change them, should be reused also in FILES_*
  variables
* table of path variables and their different names available at
  https://github.com/meta-qt5/meta-qt5/wiki/Building-with-OE
* all variables have OE_QMAKE_PATH_ prefix and then name from qmake
  varaible

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-05 12:56:34 +02:00
Martin Jansa 18d2e711d8 qmake5_base: add qmake5_base_do_configure which allows to declare QMAKE_VARSUBST_*
* don't export it, let recipe decide where to call it or even if it
  should be called (native recipes are not using it)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-05 12:56:32 +02:00
Martin Jansa 7d3f0711ee qt5: move do_install modifications to shared qt5.inc and reuse do_configure 2013-04-28 15:55:10 +02:00
Martin Jansa 54a6379be4 qtbase: remove some dead code 2013-04-28 15:55:09 +02:00
Martin Jansa eed206da36 qt5: move SSTATE_SCAN_FILES to qmake5_base.bbclass
* penalty for more replacements is better then to forget to add this
  in some component which will also install .prl files
2013-04-28 15:55:09 +02:00
Martin Jansa 40cf086347 qtbase: Remove QT_DIR_NAME, QT_BASE_NAME
* QT_DIR_NAME is set in qmake5_base
* QT_BASE_NAME isn't used
2013-04-28 15:55:09 +02:00
Martin Jansa 783c979664 qtbase: Fix INCDIR/LIBDIR paths in .prl files 2013-04-28 15:55:09 +02:00
Martin Jansa a5783e1a09 qtbase: Override all paths and export sysroot
* otherwise sysroot from native build can leak to target build
* missing paths like Qml2Imports were defaulting to devault /usr/qml
* synchronize values between qt.conf and configure params
2013-04-28 15:55:05 +02:00
Martin Jansa b3abb65f6a qtbase: add patches to fix wrong libdir/include dirs in pkgconfig and libtool files
* qt_module.prf replacements were creating -L/usr/lib in .pc files which is bad for cross-compilation
* also use '=' for sysroot in libtool files

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa d2d5b7804e qt5: package files with and without QT_DIR_NAME prefix
* makes it easier to modify paths without QA warnings about unpackaged files

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00
Martin Jansa 09516373c0 qmake: allow to disable debug output
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-04-28 13:39:57 +02:00