Commit Graph

207 Commits

Author SHA1 Message Date
Martin Jansa
1d14002dd8 qtbase-5.0.2: Fix build without -fpermissive
* commit in newer qt is using GLint and casting to GLuint
  later so it doesn't have this issue:
  commit 1d8ec5fae2fa4bf694b93bb6bf14a7c42c84a9b6
  Author: Valery Volgutov <valery.volgutov@lge.com>
  Date:   Tue May 21 14:18:17 2013 -0700

    Fix FBO restoring in QOpenGLTextureGlyphCache

* but backport to 5.0.2 is using GLuint:
  and causes build failure without -fpermissive:
  | qtbase/5.0.2-r3/qtbase-opensource-src-5.0.2/src/gui/opengl/qopengltextureglyphcache.cpp:151:51: error: invalid conversion from 'GLuint* {aka unsigned int*}' to 'GLint* {aka int*}' [-fpermissive]
  |      glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo);
  |                                                    ^
  | /usr/include/GLES2/gl2.h:536:37: error:   initializing argument 2 of 'void glGetIntegerv(GLenum, GLint*)' [-fpermissive]
  |  GL_APICALL void         GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params);
  |                                      ^

* resync with version from 5.1.1 to fix this

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-15 14:49:00 +01:00
Trevor Woerner
5e9a9d935a devshell: include PATH for qt5 native applications
If you perform a "bitbake -c devshell <some qt5 recipe>" and then try "which
qmake" in the devshell, you'll find your host's qmake is found (which is most
likely to be based on qt4) rather than the one that is built as part of
meta-qt5. The reason for this is that the qt5 items are installed to
${STAGING_DIR_NATIVE}/usr/bin/qt5 and not ${STAGING_DIR_NATIVE}/usr/bin. The
reason for the extra "qt5" directory at the end is so that qt4-based items
that are built in OE can live side-by-side with things from meta-qt5 without
interfering with each other.

This patch prepends ${STAGING_DIR_NATIVE}/usr/bin/qt5 to the devshell's PATH
so that the qt5-based native tools which are built as part of meta-qt5 will be
found before the host's.

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-05 14:44:24 +02:00
Martin Jansa
fad74f159d qtwebkit: Export RUBYLIB to fix wrong paths hardcoded in native ruby
* when ruby-native is reused from sstate it can contain paths pointing
  to wrong sysroot

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-05 14:44:15 +02:00
Trevor Woerner
3a84535bcb qtwebkit: fix QA issue (bad RPATH)
Building qtwebkit causes a QA issue such that QtWebPluginProcess and
QtWebProcess contain bad RPATHs which point into the build location. This fix
adds a patch to not include the rpath.prf which causes this problem.

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-10-03 18:02:47 +02:00
Marek Belisko
047908c2c5 Fix download url for qt5-5.0.2.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-08-15 22:03:47 +02:00
Otavio Salvador
198b132f94 Merge pull request #22 from abhijitpotnis/dylan
Update SRC_URI to point to archived 5.0.2
2013-08-13 09:13:20 -07:00
Abhijit Potnis
c10f12acb2 Update SRC_URI to point to archived 5.0.2
5.0.2 sources have now been moved to archive directory
on http://releases.qt-project.org/archive/qt/5.0/5.0.2/.
2013-08-13 21:37:46 +05:30
Christian Gagneraud
b8325b39eb 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:19:30 +02:00
Martin Jansa
806fedcc15 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:21:29 +02:00
Martin Jansa
2c5a5cf471 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 19:21:29 +02:00
Martin Jansa
0504f05e70 qtwebkit: Disable debug info by default
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 19:21:29 +02:00
Philip Craig
9dcf866408 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-07-03 19:21:29 +02:00
Nicolas Dechesne
20ef7a1fec 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-07-03 19:21:29 +02:00
Martin Jansa
ea75eeaa3b 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-07-03 19:21:29 +02:00
Martin Jansa
50ea4a0e59 qtdeclarative: move 5.0.2 specific patches to own directory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 19:21:29 +02:00
Florian Haenel
c1ba5228d7 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-07-03 19:21:29 +02:00
Janne Kiiski
3463bd2df5 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-07-03 19:21:29 +02:00
Alexander Irhin
c3697f1dca 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-07-03 19:21:29 +02:00
Martin Jansa
7177917ee2 qtbase-5.0.2: backport fix for build with gcc-4.8
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 19:21:29 +02:00
Martin Jansa
2d11359083 qtjsbackend: refresh hardfloat patch from stable branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 19:21:29 +02:00
Eric BENARD
4a358a2f71 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-07-03 19:21:29 +02:00
Eric BENARD
05629ecc96 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-07-03 19:21:29 +02:00
Martin Jansa
91adcd52ab qtbase: Refresh 0016-configure-add-tslib-support.patch from stable branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 19:21:29 +02:00
Martin Jansa
38f2ff216b 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-07-03 19:21:29 +02:00
Martin Jansa
9250f5213a 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-07-03 19:21:29 +02:00
Martin Jansa
45398c5b78 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-07-03 19:21:29 +02:00
Eric BENARD
8c30e2f88e 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-07-03 19:21:29 +02:00
Eric BENARD
b1c7aed442 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-07-03 19:21:29 +02:00
Eric BENARD
888f01e297 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-07-03 19:21:29 +02:00
Eric BENARD
7d42d44aab 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-07-03 19:21:29 +02:00
Eric BENARD
95c69b2ec4 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-07-03 19:21:29 +02:00
Eric BENARD
721b7c84bb 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-07-03 19:21:29 +02:00
Eric BENARD
2ffc1875d8 qt: package examples
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 19:21:29 +02:00
Oleg Shparber
3649e1ad2e Allow to control (disable) widgets build
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-07-03 19:21:29 +02:00
Martin Jansa
45e464acac README: update for dylan branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2013-05-28 12:01:29 +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
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
d8314098bf qmake5: drop QT_DIR_NAME subdirectory from many OE_QMAKE_PATH_* variables and add it back in qt5.inc
* we're using QT_DIR_NAME subdirectory mostly to prevent conflicts with existing files from qt4
  but setting it in all OE_QMAKE_PATH_* variables causes all apps which are just using qmake to
  build to install e.g. in /qt5 which for stuff like qterminal or something doesn't
  sound right (as long as there isn't qterminal4 and qterminal5 recipe)

* some variables are kept with default QT_DIR_NAME, e.g. qml, imports, plugins we can assume that
  every application which installs some QML files will install them in location shared by all

* add qt5-native.inc which also adds this QT_DIR_NAME and common
  inherits (later will be used also by qtwayland-native.inc)

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