Commit Graph

344 Commits

Author SHA1 Message Date
Martin Jansa a93ebb736b qtdeclarative_git: drop 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
* drop 0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
  because it's already applied in upstream commit:
  commit d765ad8e3dabe44f276db9084b1d16164c4535e7
  Author: Florian Hänel <florian.haenel@basyskom.com>
  Date:   Wed Jun 5 19:23:32 2013 +0200
  Subject: Fix wrong calculation of viewPort for transitions

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:31:03 +01:00
Martin Jansa fbf9216fb9 qt5-git: bump SRCREVs to latest in 'release' branch
* in some components there was just
  Bump MODULE_VERSION to 5.2.2
  commit but bump them all for consistencty

* we're testing newer revisions in order to narrow some QML issues
  we're seeing in runtime

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:31:03 +01:00
Martin Jansa a036792a62 qtbase: Replace 0012-qtbase-allow-build-of-examples.patch with -compile-examples option
* -compile-examples option was added in upstream commit:
  commit 8ea19caacf281240411541b5af37c2f9a103a7d1
  Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
  Date:   Tue May 7 17:10:22 2013 +0200
  Subject: add -compile-examples configure option

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:31:03 +01:00
Andreas Müller fc06fb8ceb qtbase.inc: set virtual/mesa and virtual/egl as dependency in PACKAGECONFIG[kms]
* there is no kms around
* mesa is the default implementation for (lib)gbm (see config.tests/qpa/kms)
* in configure we find:
  | if [ "$CFG_KMS" = "yes" ]; then
  |     if [ "$CFG_EGL" = "no" ]; then
  |         echo "The KMS plugin requires EGL support and cannot be built"
  |         exit 101
  |     fi
  | fi

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:28:46 +01:00
Jonathan Liu 201b3b2c89 qtbase: prevent artifacts on raster windows using eglfs plugin
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:25:36 +01:00
Jonathan Liu 8c3c6fda69 qtbase: fix mmsize argument parsing for linuxfb plugin
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:25:24 +01:00
Jonathan Liu ea5d8e0c1b cmake: rename .bbappend to match new version from OE-core
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:03:42 +01:00
Jonathan Liu c63c48b3ca qttools: add missing DEPENDS
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:03:42 +01:00
Andreas Oberritter 2bf30ae1d5 qtwebkit: add packageconfig for gstreamer, qtlocation and qtsensors
Use gstreamer for 1.x, gstreamer010 for 0.10.x.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:03:42 +01:00
Andreas Oberritter c9e332597b qtdeclarative: drop qtsvg dependency, add packageconfig for qtxmlpatterns
The dependency on qtsvg seems to be a leftover from an old version.
Version 5.2.1 of qtdeclarative doesn't include any reference to it.

Depend on qtbase in case qtxmlpatterns gets disabled.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:03:42 +01:00
Andreas Oberritter 69d2f31df6 qtbase/qtwebkit: drop ICU variable
Pango doesn't seem to be a drop-in replacement for ICU, so
using it as a dependency for the -icu option won't work.

QtWebKit has a hard dependency on icu.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-05 19:03:42 +01:00
Otavio Salvador deb2473ee9 populate_sdk_qt5.bbclass: Add support for qtcreator-debug
This adds a new image feature for easier remote debugging with
QtCreator.

The qtcreator-debug needs to be added as a valid item for image
features and having it inside the populate_sdk_qt5 is too late. User
will see a parser error as OE-Core images does not inherit the classs.
The possible workaround for it is to include it inside layer.conf file
until a kind of "bbclassappend" support is in place.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Giulian Vivan <giulian@ossystems.com.br>
2014-02-28 10:47:04 -03:00
Otavio Salvador 53242713da packagegroup-qt5-qtcreator-debug: Add package group
This allow for easy installation of needed packages for remote
debugging using QtCreator. The qtdeclarative-plugins package provides
the needed infrastructure to remotely debug QML application.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Giulian Vivan <giulian@ossystems.com.br>
2014-02-28 10:47:04 -03:00
Jacob Kroon cee2a75ad6 nativesdk-qtbase-tools: disable Debian-style package renaming
Since commit 8da5017712, libQt5*.so files
are included in the nativesdk-qtbase-tools package. However, this together
with the fact that the binaries are placed in a subdir "qt5" of bin will
confuse the Debian-style package renaming logic in debian.bbclass, causing the
resulting ipk package to be created as "nativesdk-libqt5core5".

Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-28 10:46:58 -03:00
Otavio Salvador e55d3ef36a populate_sdk_qt5.bbclass: Fix symlink location for QtCreator use
The QtCreator is quite broken regarding finding the mkspecs files; so
to workaround it we must to add a symlink to it. The workaround was in
place but in the wrong sysroot, it must to be in the /native/ one.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Jonathan Liu <net147@gmail.com>
2014-02-25 08:36:57 -03:00
Giulian Gonçalves Vivan 0d20b53eb8 qsiv: add the qsiv 1.1 example app
This provides a simple image viewer for demonstration purposes.

Signed-off-by: Giulian Gonçalves Vivan <giulian@ossystems.com.br>
2014-02-24 09:21:21 -03:00
Otavio Salvador 9b4dc4d2cf mallit-plugins-qt5: Don't set OE_QMAKE_PATH_HEADERS
The qmake class now respects the QT_DIR_NAME setting when setting the
headers path, so this change is not needed anymore.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-24 09:21:21 -03:00
Otavio Salvador 8222990922 mallit-framework-qt5: Don't set OE_QMAKE_PATH_HEADERS
The qmake class now respects the QT_DIR_NAME setting when setting the
headers path, so this change is not needed anymore.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-24 09:21:21 -03:00
Otavio Salvador 2bd5fba34d qmake5_paths.bbclass: Use Qt version path for headers
When looking for Qt5 headers we ought to use the Qt5 specific path. In
case the distribution wants to have a flat tree it can set QT_DIR_NAME
and it will still works as expected.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-24 09:21:21 -03:00
Martin Jansa d8b22f3d4a qtwayland: Fix xcomposite-glx and examples build
* egl was building fine, but glx was failing to find
  qwaylandintegration.h
* one example cannot be built without gles2, so make it
  conditional

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-22 18:33:32 +01:00
Martin Jansa 1279a21d9d qtdeclarative: Fix build with tests enabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-22 18:33:28 +01:00
Martin Jansa 6ec8824564 qtbase: Fix PACKAGECONFIG[tests]
* at least in 5.2.1 tests aren't enabled by default:
  QT_ALL_BUILD_PARTS=" libs tools examples tests "
  QT_DEFAULT_BUILD_PARTS="libs tools examples"
  so without -make option they weren't enabled even with tests in
  PACKAGECONFIG

* add options for other build parts just for completeness

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-22 14:18:08 +01:00
Martin Jansa 04013e13b1 qtbase: Move remaining few by default enabled options to PACKAGECONFIG_DEFAULT
* more and more people don't want to redefine whole PACKAGECONFIG variable

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-22 09:14:35 +01:00
Andre McCurdy e6f2641311 qtwebkit-examples: add RDEPENDS for ca-certificates
If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-22 09:12:13 +01:00
Andre McCurdy b7b624386c qtbase: configure with -openssl-linked instead of -openssl
Configure qtbase with -openssl-linked (instead of -openssl) to ensure
that run-time dependencies on libcryto and libssl are detected.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-22 09:10:08 +01:00
Mikko Levonmaa 5d4479d19d qtbase: Make it easier to change [release|debug] PACKAGECONFIG
Also add -developer-build to PACKAGECONFIG

Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-22 09:08:23 +01:00
Denys Dmytriyenko 5599656cda nativesdk-qtbase: do qmake replacement in ${D} instead of ${B}
* This way we don't mangle ${B} and can repeat do_install if necessary. And
  previously it would require running do_compile again to restore the proper
  state of ${B}.
* Need to bump PR, since do_compile isn't changing, but needs to re-run to
  re-populate qmake-real binary.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-20 14:22:57 -03:00
Martin Jansa 4375b28f7c qtbase-native: explicitly disable icu
* Jonathan Liu reported that qtbase-native was failing to build for him
  and it looks like qtbase-native was trying to link against icu from his
  host (instead of icu-native because it isn't in DEPENDS)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:33 +01:00
Martin Jansa d0a83ac45e qtbase: add PACKAGECONFIG for mtdev
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:33 +01:00
Andre McCurdy 0d9f550f68 qtbase.inc: don't force ARM_INSTRUCTION_SET to arm
Forcing ARM_INSTRUCTION_SET to arm when building qtbase no longer
seems to be required.

Confirmed by forcing ARM_INSTRUCTION_SET to thumb and building
qtbase 5.1.1 and 5.2.1 tuned for both armv4t and cortexa9thf-neon.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:33 +01:00
Jacob Kroon dc0073bb45 libQt5*.la references OE build directories
I'm trying to get the .la-files for Qt5 dev-packages correct.

What I've come up with so far is attached in the patch (to be applied in
top of "jansa-qt5-5.2.0", b8a236df79)

With the patch applied I can still build both an image and an SDK, and
also the resulting SDK can be used to build my QT5 autotools projects. But
I get these warnings when building for instance "qtxmlpatterns":

WARNING: QA Issue: qtxmlpatterns: The compile log indicates that host
include and/or library paths were used.

Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:33 +01:00
Andreas Müller 52e39c35ee qtbase: eglfs: fix egl error for platforms only supporting one window/surface
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
Andreas Müller 47ec6dbcba qtwayland.inc: fix QA warnings
WARNING: QA Issue: qtwayland: Files/directories were installed but not shipped
  /usr/lib/qt5/plugins/wayland-graphics-integration
  /usr/lib/qt5/plugins/wayland-graphics-integration/client
  /usr/lib/qt5/plugins/wayland-graphics-integration/server
  /usr/lib/qt5/plugins/wayland-graphics-integration/client/libwayland-egl.so
  /usr/lib/qt5/plugins/wayland-graphics-integration/client/.debug
  /usr/lib/qt5/plugins/wayland-graphics-integration/client/.debug/libwayland-egl.so
  /usr/lib/qt5/plugins/wayland-graphics-integration/server/libwayland-egl.so
  /usr/lib/qt5/plugins/wayland-graphics-integration/server/.debug
  /usr/lib/qt5/plugins/wayland-graphics-integration/server/.debug/libwayland-egl.so

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
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
Gabe Johnson 79944bda32 nativesdk-qtbase, nativesdk-qttools: Fix file search paths
* this is useful for using newer meta-qt5 with older oe-core
  release

Signed-off-by: Gabe Johnson <gjohnson@agleader.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-02-19 11:56:32 +01:00
Otavio Salvador 6e71d92786 nativesdk-qtbase: Remove the datadir as it is not installed
Fixes:

ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed but not shipped
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-18 10:44:19 -03:00
Otavio Salvador 32cee0b6d1 nativesdk-qttools.inc: Fix installation and packaging
We must to fix the installation paths as did in nativesdk-qtbase.inc
and remove the files unused from the packages. This fixes the
packaging errors and allows for a successful build for SDK.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Denys Dmytriyenko <denys@ti.com>
2014-02-17 17:48:04 -03:00
Otavio Salvador 578657f7b6 qmake5_base.bbclass: Fix mkspec path when building nativesdk binaries
When building nativesdk binaries we ought to rely in the native
mkspecs.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Denys Dmytriyenko <denys@ti.com>
2014-02-17 17:47:27 -03:00
Otavio Salvador 8da5017712 nativesdk-qtbase.inc: Fix build failure removal of include and mkspecs
The 7d8f8d6 change (nativesdk-qtbase.inc: Remove unused contents)
introduced a build failure that was not catch in my test. This patch
fixes it avoiding removing the headers and mkspecs files which are
need for the nativesdk-qttools recipe.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-17 13:57:06 -03:00
Otavio Salvador 7d8f8d6b5a nativesdk-qtbase.inc: Remove unused contents
Fixes:

ERROR: QA Issue: nativesdk-qtbase: Files/directories were installed but not shipped
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/include
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/share
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Test.so
  /opt/oel/13.0+snapshot/sysroots/i686-oelsdk-linux/usr/lib/libQt5Network.so
  ...

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-14 19:00:40 -02:00
Otavio Salvador 7c5306107c nativesdk-qtbase: Fix install error in case install task is rerun
In case changes are done in do_install and the sstate checksums
change, the task would fail as the qmake binary has already been
replaced. Avoid this error checking for the original filename.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-14 18:58:40 -02:00
Denys Dmytriyenko db9d6b401c meta-toolchain-qt5: add Qt5 SDK standalone meta recipe
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
2014-02-11 15:34:46 -02:00
Otavio Salvador f803570841 populate_sdk_qt5.bbclass: Allow generation of toolchain
This allow the toolchain generation using '-c populate_sdk' as it
includes the need host libraries into the SDK.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-11 15:34:46 -02:00
Otavio Salvador 3cc5613d22 packagegroup-qt5-toolchain-target: Add packagegroup
Allow easy inclusion of target packages for the Qt5 SDK or external
toolchain.

The list of the target package is based on the Arago Project, which
has been contribute by Denys Dmytriyenko <denys@ti.com>.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-11 15:34:46 -02:00
Otavio Salvador d768d97528 nativesdk-packagegroup-qt5-toolchain-host: Add packagegroup
Allow easy inclusion of host packages for the Qt5 standalone SDK or
external toolchain.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-07 11:39:50 -02:00
Otavio Salvador 91ac66d5e4 README: Reword the section about github forking
This splits the lines in 80 cols and rework the text a little bit to
easy reading.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2014-02-07 11:39:50 -02:00
Andreas Oberritter a317282d25 qtwebkit: drop obsolete patch 0001-jsc-Add-licuuc-licui18n-LIBS.patch
This patch caused a linker error:

| linking ../../bin/jsc
| [...]ld: cannot find -licuuc -licui18n

The linker command-line contains:

| [...] -licuuc\ -licui18n [...] -licui18n -licuuc -licudata [...]

So the problem gets caused by the backslash, making the actual library
name "libicuuc -licui18n.so". This may have been caused be the double
quotes used in the patch. However, since both libs are already part
of the command-line, the patch can just get dropped. The patch indicates,
that it was created for a beta version, so I assume that this was
fixed before the 5.2 release.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-29 21:55:25 +01:00
Martin Jansa 7cca3003fa qtmultimedia.inc: Fix duplicating '{'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-29 16:23:30 +01:00
Andreas Oberritter 0b8e8124ed cmake-native: disable test for Qt5Core
Fixes the same build error as 671313d, but for the -native recipe.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-27 13:30:49 +01:00
Martin Jansa faad8d1df1 qtmultimedia: Use PACKAGECONFIG for gstremer-0.10 and change it to disabled by default
* it doesn't support gst-1.x like qtwebkit yet, disable it by default to
  build images without gst-0.10 where possible.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-01-19 12:09:17 +01:00