Commit Graph

214 Commits

Author SHA1 Message Date
Martin Jansa
bb4c8adeeb qtwayland: demote 5.1.0+git version a bit
* 5.0.2+git should stay default for people without qt5-versions.inc
* make sure that % isn't appended twice in qt5-versions.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 17:45:18 +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
43872948d4 qtmultimedia: add gst-plugins-base dependency and openal PACKAGECONFIG
* this will need small patch in qtmultimedia.pro to run
  qtCompileTest(openal) only with OE_OPENAL_ENABLED

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa
a4c346ba8f qtwebkit: add dependency on gstreamer and libxslt
* it's autodetected from sysroot, make it deterministic
* maybe I should allow to change gst-0.10 to 1.0 without
  rewriting DEPENDS

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa
2649027bd0 qtimageformats: add dependency on tiff
* it's autodetected from sysroot

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14: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
3da4d425d0 qt3d, qtjsondb: bump SRCREV and set MODULE_VERSION
* drop INC_PR/PR where possible

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:12 +02:00
Martin Jansa
5eb22ffbfa qtwayland: add second recipe with latest SRCREV, compatible with qt5 5.1.0
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
902f55b957 qt5: add recipes for 5.1.0
* only rebased patches and updated SRC_URI checksum, haven't even build
  tested it yet

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:11 +02:00
Martin Jansa
ca4a0758e1 qmake5_base: add override for HostLibraries
* qtdeclarative was using /usr/lib as HostLibraries causing
  WARNING: QA Issue: qtdeclarative: The compile log indicates that host include and/or library paths were used.
           Please check the log 'qtdeclarative/5.1.0-r0/temp/log.do_compile' for more information.
  DEBUG 1: /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/qt5/mkspecs/features/qt_config.prf:23: QT_MODULE_HOST_LIB_BASE := /usr/lib
* also without this fix qtdeclarative and qtwayland are trying to
  build tools against /usr/lib/libQt5Bootstrap.a (without sysroot
  prefix)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:11 +02:00
Martin Jansa
ebd60ffe7e qtwayland: add native recipe
* qtwayland fails, because we'll need to add qtwayland-native to provide
  qtwaylandscanner in QT_EXTERNAL_HOST_BINS location (otherwise build
  will try to use /usr/bin/qt5/qtwaylandscanner)

* native recipe is needed to build qtwayland-scanner which
  is required after this upstream commit

  commit 05d054ad7207764293525661876ebc689940a15c
  Author: Samuel R<C3><B8>dal <samuel.rodal@digia.com>
  Date:   Tue Apr 9 16:52:59 2013 +0200
    Introduced qtwaylandscanner.

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:11 +02:00
Martin Jansa
71cc38affe qtjsbackend: refresh patches, move to subdirectory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-25 12:14:11 +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
Martin Jansa
b9fec03db8 qtbase-5.0.2: refresh patches to apply cleanly
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-20 14:18:37 +02:00
Eric BENARD
75291e7614 qtbase-native-5.0.2: fix compilation on Fedora 19
the patch 0017-Rename-qAbs-Function-for-timeval.patch is also
needed for native else, on Fedora 19, we get :
| ../../include/QtCore/../../../qtbase-opensource-src-5.0.2/src/corelib/global/qglobal.h:483:27: error: from previous declaration 'constexpr T qAbs(const T&) [with T = timeval]'
|  Q_DECL_CONSTEXPR inline T qAbs(const T &t) { return t >= 0 ? t : -t; }

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-08 18:02:12 +02:00
Martin Jansa
b9b00aaad4 qmake5: Add trailing space in DEPENDS_prepend instead of QT5TOOLSDEPENDS
* this way it looks better in bitbake -e, instead of:
  ${QT5TOOLSDEPENDS}${BASEDEPENDS}

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 19:18:36 +02:00
Martin Jansa
886509518d qtwayland: Add xproto dependency together with libxkbcommon
* xproto provides X11/keysym.h which is used when testing libxkbcommon support:
executing config test xkbcommon
+ cd /OE/work/i586-oe-linux/qtwayland/5.1.0+git/build/config.tests/xkbcommon && /OE/sysroots/x86_64-linux/usr/bin/qt5/qmake "CONFIG -= qt debug_and_release app_bundle lib_bundle" /OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon
+ cd /OE/work/i586-oe-linux/qtwayland/5.1.0+git/build/config.tests/xkbcommon && make      MAKEFLAGS='-j 9'     OE_QMAKE_COMPILER='i586-oe-linux-gcc  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86'     OE_QMAKE_CC='i586-oe-linux-gcc  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86'     OE_QMAKE_CXX='i586-oe-linux-g++  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86'     OE_QMAKE_CFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types'     OE_QMAKE_CXXFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden'     OE_QMAKE_LINK='i586-oe-linux-g++  -m32 -march=i586 --sysroot=/OE/sysroots/qemux86'     OE_QMAKE_LDFLAGS='-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed'     OE_QMAKE_AR='i586-oe-linux-ar'     OE_QMAKE_STRIP='echo'     OE_QMAKE_WAYLAND_SCANNER='/OE/sysroots/x86_64-linux/usr/bin/wayland-scanner'
compiling /OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon/main.cpp
/OE/work/i586-oe-linux/qtwayland/5.1.0+git/git/config.tests/xkbcommon/main.cpp:42:24: fatal error: X11/keysym.h: No such file or directory
compilation terminated.
make: *** [.obj/release-shared/main.o] Error 1
test xkbcommon FAILED

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 16:44:54 +02:00
Martin Jansa
28753fa6aa qtwebkit: Disable debug info by default
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-26 13:18:49 +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
Martin Jansa
e02b1ca3c2 qtdeclarative-git: Add 2 patches from 5.0.2
* 0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch is
  applied in newer SRCREV
* 0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch is still
  pending

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-14 12:24:25 +02:00
Martin Jansa
da60ee1856 qtdeclarative: move 5.0.2 specific patches to own directory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-14 12:13:40 +02:00
Florian Haenel
e1223d648c qtdeclarative-5.0.2: Add 4 patches for runtime issues
* 3 backports from newer qtdeclarative:
  System Hang while moving App Ribbon
  Fix for segfault in some ListView Cases
  Make use of BGRA texture format to improve image upload time
* 1 pending fix:
  Fix for ViewTransitions not working in horizontal ListViews

Signed-off-by: Florian Haenel <florian.haenel@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-14 12:11:50 +02:00
Janne Kiiski
46626d15cd qtwayland: Add temporary hack to build for Qt 5.0.2
* Append MODULE_VERSION to .qmake.conf if missing.
* resolved in newer revision:
  commit 4d124fea48a0d094443ed0e031c8e28ec04611a3
  Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
  Date:   Tue Feb 26 12:56:57 2013 +0100
  Subject: define MODULE_VERSION

Signed-off-by: Janne Kiiski <janne.kiiski@lge.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-06-07 17:28:46 +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
Martin Jansa
6f4e86b621 qtbase-5.0.2: backport fix for build with gcc-4.8
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 18:20:26 +02:00
Martin Jansa
49319a8617 qtjsbackend: refresh hardfloat patch from stable branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 18:20:26 +02:00
Eric BENARD
d8ce75b573 qtjsbackend: hardfloat patch is only needed for 5.0.2
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
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
4a82435fff qtbase: Refresh 0016-configure-add-tslib-support.patch from stable branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 18:20:25 +02:00
Martin Jansa
34bf6934ea qt3d, qtjsondb, qtlocation, qtsensors, qtsystems: bump SRCREV to latest
* WARN: because these modules weren't released yet, we need to make sure to
  use SRCREV compatible with selected PV for other modules, old revisions
  were compatible with 5.0.[01], I need to test these new SRCREVs to test
  git versions
* tested with 5.0.2 and 5.0.2+git%

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 18:19:44 +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
Martin Jansa
f8b065ea11 qt5: drop 5.0.0 and 5.0.1 versions
* maintaining 4 different versions requires a lot more testing of
  changes in .inc files and we have only one version of modules without
  release (only one _git.bb) and it's impossible to find SRCREV which
  would be compatible with all 4 versions.
* 0005-AddSynchoronization-qimagereader.patch was already backported to
  5.0.2 in upstream
* 0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch was
  already applied in 5.0.2

* 5.0.2 is now default version (based on DEFAULT_PREFERENCE and in
  qt5-versions.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 15:25:25 +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
7994fc13da qtdeclarative-5.0.2: fix examples compilation
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:55:07 +02:00
Eric BENARD
712d678c3a qtbase-5.0.2: fix v8 and allow build of examples
- fix v8 segfault (at least on armv7)
- examples are only provided as sources but in our case, binaries
are more interesting for user to test the features on the target.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:42:38 +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
Eric BENARD
7698fc1494 qtbase: add 0004-Disable-mkv8snapshot.patch to 5.0.1
else qml application segfault.

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:42:27 +02:00
Eric BENARD
c4fe1b8f55 qtjsbackend: fix hardfloat detection in v8
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:42:22 +02:00
Eric BENARD
34bed723f3 qt: package examples
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 10:42:15 +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
81b7031859 qtbase: fix qlibrayinfo patch
* returning QSettings even without existing qtconfig was causing,
  e.g. QLibraryInfo::location(QLibraryInfo::PluginsPath) returning
  "`pwd`/plugins" instead of correct "/usr/lib/qt5/plugins"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-21 21:45:11 +02:00
Martin Jansa
26d8de5404 Add COPYING.MIT to be clear about license of this layer
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-10 14:42:07 +02:00
Martin Jansa
459a144d2e README: add meta-ruby dependency needed for qtwebkit 2013-05-10 12:59:47 +02:00
Martin Jansa
4c197c6223 qmake5_base: Define OE_QMAKE_PATH_QT_* variables
* and move it to separate .bbclass which is easier to
  replace in distro layer when you don't care about
  conflicts with qt4

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-09 21:41:32 +02:00
Martin Jansa
727b27e936 qmake5: move default do_configure and do_install to qmake5.bbclass
* it's useful for many recipes outside qt5 and easy to overwrite when needed
2013-05-09 19:16:32 +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