Commit Graph

239 Commits

Author SHA1 Message Date
Wenzong Fan c973a6e4c5 qt4-x11-free: Fix broken regexes in qt4-x11-free's recipe.
[YOCTO #1671]

qt4-x11-free's recipe includes a sed script to sanitize it's .prl files,
which are used by qmake to generate a list of libs and includes in the
Makefiles it generates. It however, fails to take into account the possibility
of trailing slashes, and thus leaves them in, and breaks gcc's syntax.
Update these regexes to account for them.

(From OE-Core rev: 8d580ed449c09a64483519d66e14a2e3b071806a)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14 13:18:19 +01:00
Richard Purdie b04b8a4e4d qt4: Drop old version 4.7.3
(From OE-Core rev: 4e95c177c4d0ee593945fd020f8d0c22810d8956)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-12 14:12:10 +01:00
Richard Purdie de75097d98 qt-demo-init/linux-firmware/adt-installer: Convert to Use allarch class file
(From OE-Core rev: 75d5e1abb9b1ef9e21be3ec270a7ed43d157d734)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-10 09:59:09 +01:00
James Limbouris 9a7aee0754 qt4-embedded: move qt4-embedded-conf from RDEPENDS to RRECOMMENDS
qt4-embedded-conf contains an environment setup script for profile.d.
It has been packaged seperately to allow for its exclusion, but this is
only practical if it is added to RRECOMMENDS, rather than RDEPENDS.

(From OE-Core rev: e0c2a62fcadc5095729229e83975f35fe0c3fa8f)

Signed-off-by: James Limbouris <james@digitalmatter.com.au>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 22:29:23 +01:00
Dmitry Eremin-Solenikov bad9759cf7 qt4: packaging fixup
Improve packaging:
* Add phrasebook packages to DYNAMIC_PACKAGES
* Correct phrasebook packages generation
* Include more files into -dbg packages
* Package fontdir and fonts README.

(From OE-Core rev: 4e3c29dd90f583cafe7a7fc863efb3720096d67b)

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 22:29:23 +01:00
Otavio Salvador 13e659facb qt4: Fix translation support
The translation support was disable in build. The
fix-translation.patch was imported from OpenEmbedded to fix a linking
issue in phonon translation support.

[Dmitry Eremin-Solenikov: ported to apply to qt 4.7.4 build, bumped PR]

(From OE-Core rev: 4fc51a28bd171ea93fecee6326c69c6494023f76)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 22:29:23 +01:00
Eric Bénard bcc8425b92 qt4: Update to latest version 4.7.4
- 4.7.4 was release on the 1st of september, the changelog is available
here : http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/changes-4.7.4
and mostly contains bug fix.

- this patch include the fix for QTBUG-20925 which was a regression
against 4.7.3 : https://bugreports.qt.nokia.com/browse/QTBUG-20925
852abfca6f
thanks to Paul Eggleton to point us to this bug.

(From OE-Core rev: 68189d7c372a861767b5db90376d61e165f9771b)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:26 +01:00
Otavio Salvador 2d053989a7 qt4: Fix translation support
The translation support was disable in build. The
fix-translation.patch was imported from OpenEmbedded to fix a linking
issue in phonon translation support.

(From OE-Core rev: 8d5a5d78f9e83c64ebddcecd7c4fd89cc1264163)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:26 +01:00
Denis Carikli 3af27a3686 qt4.inc: package qtdemo's docs in a separate package
The documentation was 285M and doesn't fit on the NAND of many machines,
but in another had part of the documentation is needed for the
QT demos, so we split the documentation: so qt demo only RRECOMMAND
the documentation that it really needs.

Thanks to Eric Bénard for explaining me how to split it.

(From OE-Core rev: 97446651cd5128ca7a549df677c920e2463c46f9)

Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:25 +01:00
Denis Carikli 14f65e46a4 qt4(embedded and x11): Disable neon for armv6-vfp
Without the -no-neon flag, neon is "autodetected"
by looking if the compiler is capable of compiling
a neon test, and succeed, and neon is then enabled
during the compilation.

(From OE-Core rev: 026b59180fe3fbeb43cfd143f053ef33f482ef0c)

Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:25 +01:00
Denis Carikli 4c938669e6 qt4.inc: Remove the optional documentation package from the demo's RRECOMMENDS
The documentation is 285M and doesn't fit on the NAND of many machines.

(From OE-Core rev: 64d6a6ceceb1f1a599b8140f30071f8bc8e60393)

Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:25 +01:00
Eric Bénard 8575c864d4 qt4: fix generated sdk
- qt4-tools-nativesdk : actually the qmake binary which gets installed
comes from the native recipe. This patch fix this problem by launching
configure twice : once to compile qmake using the right toolchain for
nativesdk, and a second time using the native qmake to compile all the
other tools for the nativesdk. Then we install the right qmake.

- mkspec : the link actually created in qt4-tools-nativesdk's
do_install point to nowhere so remove it and generate the link in
meta-toolchain-qte as it's the only place where we have all the variable
to create it.

- toolchain_create_sdk_env_script_append : we need to add OE_QMAKE_CFLAGS,
OE_QMAKE_CXXFLAGS and OE_QMAKE_LDFLAGS else the sdk won't find these
variables that are inserted by qmake in the Makefiles.

- with this patch, oe-core generates a working meta-toolchain-qte which
can compile a small example and is properly recognized by qtcreator (this
brings oe-core's meta-toolchain-qte to oe-dev's functional state).

(From OE-Core rev: 5f6fb92b939147d2d6aa7790a378d4b7cce3ada5)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:25 +01:00
Eric Bénard 0ee37ea71a qt4e-demo-image: Improve image contents
Use ${POKY_BASE_INSTALL} in order to have the base files and
tools in the image.

(From OE-Core rev: c2f4bae0a100f3752153ecb93adb9ede4f55322a)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:24 +01:00
Simon Busch 19a7e6c63b qt4-embedded: move qte.sh profile script into own package
We don't want to pull the whole qt suite in our images when only installing a tiny setup
which needs the profile script for several configuration issues. This moves the qte.sh
profile script into a qt4-embedded-conf package which is automatically installed when an
image depends on qt4-embedded.

(From OE-Core rev: bed68b561056e0f454c0bf527997f82b63122773)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-28 14:58:51 +01:00
Simon Busch a459ac7160 meta: qt4: fix postprocessing of pkg-config files
When building qt4-embedded the generated and cleaned pkg-config files for qt are wrong.
The Cflags variable contains something like ${includedir}/qtopia/QtCore where
${includedir} is already /usr/include/qtopia/QtCore.

This patch reverts the fix up of the Cflags variable implemented in do_install.

(From OE-Core rev: b40b9c024be5e1ec81a31961158b3e6b529acfe0)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-28 14:58:50 +01:00
Eric Bénard b75cf8ea80 qt4: add blacklist-diginotar-certs patch
- this patch comes from Nokia and blacklist all DigiNotar intermediates
and root certificates, more details are available here :
http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/

(From OE-Core rev: abf51c33aba51782246a9136dddb53893216f518)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-15 11:23:56 +01:00
Dmitry Eremin-Solenikov 0126118729 qt-demo-init: fix init script
qt-demo-init initscript lacks some quotes, which makes it bave not fulle
correct. Fix that.

(From OE-Core rev: 84395cd31afd78a84d82a80297fe06f10406d57b)

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-06 16:37:01 +01:00
Xiaofeng Yan b6aa703748 qt4e-demo-image: Ensure a shell is present
"/bin/sh" is needed by qt4e-demo-image, So I add busybox for fixing this problem.

[YOCTO #999]

(From OE-Core rev: 5f06d5012bfa8b2bd83092e41ab29babdfd4605e)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-05 20:25:45 +01:00
Xiaofeng Yan d5edc9c1a0 qt-demo-init: Fix bug 999
[YOCTO #999]
qt4e-demo-image needs qt-demo-init when starting qtdemoE.
qt-demo-init was pulled from Openembeded.

(From OE-Core rev: e21e8b502ab2f982836cf1f7a30e33bff1bd5b7b)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-31 19:59:58 +01:00
Xiaofeng Yan 73b8ac611b qt4e-demo-image: Fix bug 999
[YOCTO #999]
Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on embedded platform.
This image was tested on qemuarm and can run program "qtdemoE".

(From OE-Core rev: 612ab0aaf3e693b90bb18234e2517bfc87ee3f7c)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-29 13:48:03 +01:00
Kang Kai 4d8b2dae00 qt4-tools-nativesdk: remove gcc standard paths
gcc-crosssdk can't find the standard headers before, and it was fixed.
So it is not needed to search the gcc standard paths by
qt4-tools-nativesdk itself.

(From OE-Core rev: be86cbf54f3aeeda1105acd153fe09348a7ac267)

Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-29 13:48:01 +01:00
Anders Darander 5f32d1fcc5 qt4: allow a reduction in build time
When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools
-nomake examples -nomake demos -nomake docs', build failure can occur, due to not building
all tools.

* Make rm not error out when removing one of the, possibly, non-existing tools.
* Only try to rename qtdemo, if qtdemo exists.
* Check if the phrasebook path exists, and only then call do_split_packages()

(From OE-Core rev: 51ef8335df895603e75345a18aaefe2359b2387f)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-19 09:29:18 -07:00
Yu Ke 16bbb3144c qt4.inc: expand the package name for multilib case
in the qt4.inc python annomyous code, there is case where package name
is set to "${QT_BASE_LIB}-tool", and  FILE_${QT_BASE_LIB}-tool is set to xxx.
here QT_BASE_NAME=qt4. multilib.bbclass will try to rename the FILE_qt4_tool to
FILE_lib64_qt4_tool. unfortunately, there is only FILE_${QT_BASE}-tool, no
FILE_qt4-tool, so FILE_lib64_qt4_tool will not be defined.

to fix this issue, this patch expand the QT_BASE_LIB when assigning the package
name.

FIX [YOCTO #1344]

(From OE-Core rev: b5d381133660fe338796b965131cee39cec01b96)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:21 +01:00
Yu Ke c3a66d9919 qt4.inc: revise RRECOMMENDS
using ${QT_BASE_NAME}-dbg as RRECOMMENDS is not correct in qt4-x11-free
case, because ${QT_BASE_NAME}-dbg i.e. qt4-dbg does not exist

this patch fix it by using ${PN}

(From OE-Core rev: d72adf3c4cf3de09d2a0bc6d1b9e7c9fd127bd60)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:21 +01:00
Paul Eggleton 5b4c0b327a qt4: delete unpackaged uic3 to avoid unpackaged file warning
All the other utilities get deleted as they should not be packaged,
delete this one as well.

(From OE-Core rev: 2c036c71cf0d978fac2ddc4abfb702d42af6bcda)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:18 +01:00
Paul Eggleton f9e9d8d45c qt4: package QML plugins and correct their install directory
QML components from Qt were installed to ${prefix} before and never got
packaged. This is now fixed and QML components are now installed into
${libdir}/${QT_DIR_NAME}/imports and packaged into qt4-*-qml-plugins
package.

Additionally qmlviewer and the examples/demos are now dependent upon
these plugins as needed.

Originally based on OE commit 4adf97be8c5b5f71ad92095a19968af534baa9e2
by Simon Busch <morphis@gravedo.de>

(From OE-Core rev: 49c43e2bea64f70a22a2741ea280bd1c13e5110a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:18 +01:00
Paul Eggleton a7500e27a7 qt4-native: restore build of uic3, qdbuscpp2xml and qdbusxml2cpp
These tools are required to build some external utilities (such as those
found in KDE). We avoid building qdbus and qdbusviewer as these are
not required.

(From OE-Core rev: 11f456f4f5c1d4b2aad93856ff6cbb4d7ce3969e)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:18 +01:00
Paul Eggleton 8cb51a508c qt4: replace qt4-tools-native with qt4-native
Installs native versions of the Qt libraries in addition to the tools,
allowing compilation of external native tools that require Qt libs.
PROVIDES qt4-tools-native so it should be a drop-in replacement.

Developed with reference to the corresponding qt4-native changes in OE.

(From OE-Core rev: a6fd9b8104e8d3cbfce0376811aeeef746ad6889)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:18 +01:00
Khem Raj be8f985d2c meta: Rename SITEINFO_ENDIANESS to SITEINFO_ENDIANNESS
There is this discrepency in spelling. Lets fix it in
core. There are lot of layers using SITEINFO_ENDIANNESS
This was shielded since meta-oe had its own copy of
siteinfo class. But that class has now been deleted in
favor of oe-core

(From OE-Core rev: 54a54778fad39931ac7d43daaf37ce7c1946a29b)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-26 15:47:03 +01:00
Saul Wold 4a6109fc36 Patches: Fix Upstream-Status info
(From OE-Core rev: f2a5b2d143fff8337d2f0d024bc593c55f56a3a3)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-13 12:29:20 +01:00
Xiaofeng Yan d988cfbb47 libQtOpenGL:Add libQtOpenGL to an lsb image
I make "opengl" as a DISTO_FEATURE for installing libQtOpenGL to image.
Fix Bug [YOCTO #1020]

(From OE-Core rev: f478f90821f5b6a5e5d5dd53708de008bc607a11)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-07 13:45:29 +01:00
Richard Purdie e8755c782f qt4: Package debug source files
(From OE-Core rev: 0086e2e7f776b71378eb9cb69c0e59db4a5ffea7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-07 10:57:48 +01:00
Paul Eggleton 0da7db18f1 qt4: ensure target packages don't include host binaries
Remove uic, rcc, moc and lrelease from packaged files. This fixes the
following QA warnings:

qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg,
  ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/uic
qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg,
  ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/rcc
qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg,
  ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/moc
qt4-x11-free-4.7.3, wrong architecture, qt4-tools,
  ${WORKDIR}/packages-split/qt4-tools/usr/bin/uic
qt4-x11-free-4.7.3, wrong architecture, qt4-tools,
  ${WORKDIR}/packages-split/qt4-tools/usr/bin/rcc
qt4-x11-free-4.7.3, wrong architecture, qt4-tools,
  ${WORKDIR}/packages-split/qt4-tools/usr/bin/moc
qt4-x11-free-4.7.3, wrong architecture, qt4-linguist,
  ${WORKDIR}/packages-split/qt4-linguist/usr/bin/lrelease

These utilities are all provided by qt4-tools-nativesdk in any case.

(From OE-Core rev: 69eeb3d2276e5b10d084b47d308ecfc8daf8b467)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-05 11:39:11 +01:00
Richard Purdie 8511d1ec1b Drop PRIORITY variable
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.

This patch executes:

find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'

against the tree removing the referenced. Thanks to Phil Blundell for
the command.

(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:29 +01:00
Paul Eggleton 0aad8f3f60 qt4-tools-nativesdk: fix compile failure in src/dbus
[Qt #17962]   -- http://bugreports.qt.nokia.com/browse/QTBUG-17962
[YOCTO #1168] -- http://bugzilla.pokylinux.org/show_bug.cgi?id=1168

Fix "invalid conversion from 'const void*' to 'void*'" error compiling
src/dbus/qdbusintegrator.cpp. It is assumed that the use of "const" here
is incorrect as no other usage of Q_GLOBAL_STATIC_WITH_ARGS uses const
prefix on the first (TYPE) argument.

Patch was imported from the Qt bug tracker (see above reference); the
patch was rejected but for procedural rather than validity reasons.

Fixes [YOCTO #1168]

(From OE-Core rev: 17d5422460bf9074223475b15d128171d12b170a)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-22 22:13:09 +01:00
Paul Eggleton d827764c70 qt4-tools-nativesdk: drop freetype include as we build with -no-freetype
Freetype support is disabled so there's no need to point to the freetype
headers.

Prompted by OE commit 4931b37c8faf1eef7322cc82bf979885c770f4e0 from
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

(From OE-Core rev: bc5647504268ec4ef8a20dd1a6f9bdf7e6849ba7)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-22 22:13:09 +01:00
Paul Eggleton 4d7108f7af qt4-tools-nativesdk: fix unpack failure due to missing g++.conf
FILESPATHPKG was being used to in order to bring in linux.conf and
g++.conf in this recipe, however this probably never worked since
FILESPATHPKG always has the MACHINE appended to it and these are not
machine-specific files. The only reason it built was that these two files
could be found within the "files" subdir until we removed Qt 4.6.3.
Using FILESEXTRAPATHS (as qt4-tools-native does) solves this.

(From OE-Core rev: 49102f3728425cacfaeb384491b9355bfa2a4230)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-22 22:13:09 +01:00
Richard Purdie e112d46c9f task-sdk-host: Add nativesdk to the task name so its clearer what the contents of the task represent
This is particularly important since the file doens't use BBCLASSEXTEND
and PN is therefore misleading

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-13 22:38:06 +01:00
Saul Wold 4be541c7c1 qmmp: update to 0.5.1
(From OE-Core rev: 6aab83579516f6be272f41f0f5740bdbefdb67be)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-01 18:34:34 +01:00
Saul Wold 282b96763f qt4-tools-native: Fix the patch location
(From OE-Core rev: f9e51f78dbc5e600003cc563904a308df0d9bd7b)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-19 23:40:36 +01:00
Paul Eggleton 3ea694cf68 qt4: re-enable two 4.6.x patches in 4.7.3
Two patches that were being applied in 4.6.x are now applied for 4.7.3.
The functions of these two patches are:

* Add support for 2bpp (only affects qt4-embedded)
* Use correct infix on QtUiTools library (only affects qt4-embedded as
  qt4-x11-free does not define an infix)

(From OE-Core rev: 1eb0207a7ae8cbc31ecde313a020ed4f12f70dd8)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-18 14:32:48 +01:00
Paul Eggleton 18b0adee1e qt4: add comments and Upstream-Status to all patches
(From OE-Core rev: 5eed81039f33b846303a2032afcf832709b18210)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-18 14:32:48 +01:00
Paul Eggleton 0f574ccf07 qt4: remove Qt 4.6.3
We should only have one version of Qt4 supported in oe-core.

(From OE-Core rev: 95f348d81353ea105493d0cc360d63b6b7264ce5)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-18 14:32:47 +01:00
Paul Eggleton add4df47eb qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS
This allows meta-oe to override these options easily in order to enable more
SQL driver plugins.

(From OE-Core rev: 7f12a24771bca786095f823aeb2d322c52c266d2)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-16 15:32:19 +01:00
Paul Eggleton 0de1bd8d13 qt4: update from 4.7.2 to 4.7.3
The Comodo certificates patch has been merged upstream so it no longer
needs to be applied. Some PR values were reset and SRC_URI checksums
updated but other than this there are no recipe changes.

(From OE-Core rev: 57b3cbf2b7b8a716481cb3efb68b7e4c08af6703)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-16 15:32:19 +01:00
Ilya Yanok f8382175a1 qt4-tools-nativesdk: -arch is required for nativesdk build
We need to pass correct -arch option to configure to fix building in
case of SDK_ARCH != BUILD_ARCH.

(From OE-Core rev: af22757737f3b5e2d58eba8c5e01176ac26592c5)

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-13 10:29:02 +01:00
Ilya Yanok f5cf43596b toolchain-qte: include cross-compiler and fix env script
This patch fixes the meta-toolchain-qte recipe:
 1. cross-compiler added to the TOOLCHAIN_HOST_TASK.
 2. Corrected paths in the environment script.
 3. TOOLCHAIN_OUTPUTNAME used instead of SDK_SUFFIX.

(From OE-Core rev: 2b4971128a66eb0efdc8663018710383041c0e11)

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-10 09:57:09 +01:00
Paul Eggleton cdf878387a Remove machine-specific metadata for machines no longer in oe-core
(From OE-Core rev: 72567733033347b662d9baa07432985fd2da3efa)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-05 12:26:29 +01:00
Richard Purdie fc2cee5cc6 Rename poky-lsb override to linuxstdbase
(From OE-Core rev: 73a227a738da17229baac142ccd889c7929402ba)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:32 +01:00
Richard Purdie 6e95cb246f Rename poky-image-* -> core-image-* and task-poky-* -> task-core-*
(From OE-Core rev: 560b04181d8f51d189b99f01a72f17210dadf7a3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:30 +01:00
Richard Purdie 4d609d5021 Replace POKYBASE with COREBASE
(From OE-Core rev: 607a7657715f6fcba467a4e55ba64f41f4e13a15)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:29 +01:00
Saul Wold 31bc011cf7 qt4-x11-free: add virtual/libgl for opengl dependency
(From OE-Core rev: e718a775409938af51c1f06d2574435cbf978188)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-12 10:12:21 -07:00
Saul Wold f70c25c2a3 qmmp: update to version 0.5.0
(From OE-Core rev: fd1a77df8e80b52fb7158a08cf66fd3638b81556)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-08 06:14:56 -07:00
Denys Dmytriyenko e5a40cd6f8 qt4: security advisory - blacklist fraudulent comodo certificates
Security advisory: Blacklist fraudulent certificates. More info is in the
patch and at the following links:
http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
http://qt.nokia.com/files/qt-patches/blacklist-fraudulent-comodo-certificates-patch.diff/view

(Imported from OE rev 61eeeec1224c4f974f9185c2b93eeb19d13938af)

(From OE-Core rev: 14419f4a4bc629b171281d46750c6abfa84bf83b)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-06 12:10:52 -07:00
Paul Eggleton ea738ee3d3 qt4: replace 4.7.1 with version 4.7.2
Qt 4.7.2 is a bugfix release for the 4.7 series - more details here:

  http://qt.nokia.com/developer/changes/changes-4.7.2/

This was prompted by the equivalent change in OE, however the change was
redone by hand. There are no changes to the recipes themselves other than
updating SRC_URI checksums and resetting PR.

(From OE-Core rev: e8a3686ec108f6095bafa5b601c9f763bc39c123)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-06 12:10:51 -07:00
Mei Lei 22c7a3a1c4 qemuppc: add libqtopengl4 for ppc
Modify some configs for ppc to enable the libqtopengl4 support.
This fixes [YOCTO #848]

(From OE-Core rev: cc6763b81fafddcb112a6126373c594e3ec4b140)

Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-04 17:28:07 +01:00
Richard Purdie 257a9edb4b Update SRC_URIs to use BPN instead of PN
[YOCTO #860]

(From OE-Core rev: 09ed5de9624be38c0fa5cb3f943691c3b4a50686)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-14 22:36:25 +00:00
Paul Eggleton 4c8f498624 qt4: set RRECOMMENDS correctly for qt4 demos and examples packages
The demos and examples require a few optional plugins to operate correctly
(e.g. SQLite and JPEG support). The demos package requires the documentation
package to show descriptions for each demo/example, and assistant to show
the documentation.

Fixes [BUGID #492] and [BUGID #452].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 17:46:32 +00:00
Richard Purdie 19e1f4f672 meta-toolchain-qte: Append to the toolchain env script and remove code duplication
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-01 17:39:10 +00:00
Paul Eggleton f33d78ffef qt4: Add meta-toolchain-qte and dependent tasks from OpenEmbedded
Differences from OE versions:

task-qte-toolchain-target.bb:
 * Depend on task-poky-standalone-sdk-target instead of task-sdk-bare
 * Add LIC_FILES_CHKSUM
 * Correct libsqlite3-dev dependency for Poky
 * Remove dependency on libts-dev
 * Remove QtDeclarative as it does not build for 4.6.3. (This will need
   to be addressed in a future update.)

task-qte-toolchain-host.bb
 * Fix for Poky directory structure
 * qt4-tools-sdk -> qt4-tools-nativesdk

meta-toolchain-qte:
 * Fix for Poky directory structure
 * Use "tar --owner=root" instead of fakeroot
 * Remove angstrom-specific suffix

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 16:32:43 +00:00
Paul Eggleton 7a0c927c99 qt4: Add qt4-tools-nativesdk based on qt4-tools-sdk from OpenEmbedded
Differences from OpenEmbedded qt4-tools-sdk:

* Convert to nativesdk and make fixes necessary to build
* Use .inc file in 4.6.3 version
* Add LIC_FILES_CHKSUM
* Fix LICENSE to match other Qt4 recipes
* Use http source URL to match other Qt4 recipes
* Whitespace fixes

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 16:25:11 +00:00
Paul Eggleton abb87d455d qt4-tools-native: update from OpenEmbedded
Differences from OE version:
* Add source checksums
* Correct LICENCE and move to .inc file
* Update HOMEPAGE
* Don't specify DEFAULT_PREFERENCE
* Remove S and SRC_URI from 4.7.1 (duplicates of .inc file values)
* Use http source URL to match other Qt4 recipes
* Don't add back tools previously disabled in poky

Differences from current (plus the above):
* Add Qt 4.7.1 recipe
* Specify -embedded to remove dependency on X (as we are only building tools)
* Disable some other options to reduce dependencies
* Specify -no-freetype / -no-fontconfig in .inc file rather than in .bb
* Use INC_PR
* Whitespace fixes
2011-02-01 16:14:01 +00:00
Paul Eggleton 51b5081892 qt4: add 4.7.1 version from meta-openembedded
Differences from meta-openembedded version:
* Change the order of includes so that embedded/x11 overrides take precedence
* Move contents of do_install_append from qt-${PV}.inc to do_install in
  qt4.inc as this is the same for 4.6.3 and 4.7.1 and gets in the way of
  do_install_append in qt-embedded.inc.
* Don't add qte.sh to SRC_URI in qt-4.7.1.inc (this is embedded-specific)
* Don't specify DEFAULT_PREFERENCE
* Use http source URL to match other Qt4 recipes

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 16:10:36 +00:00
Paul Eggleton 7263adda21 qt4: add qt4-embedded 4.6.3 from meta-openembedded
Changes from the meta-openembedded version:
* Change the order of includes so that embedded takes precedence (ensuring
  SRC_URI additions from qt-embedded.inc work)
* Specify -embedded in qt-embedded.inc
* Remove SRC_URI and S which should come from qt-${PV}.inc
* Remove QT_DIR_NAME and QT_LIBINFIX as these come from qt4e.bbclass
* Correct LICENSE
* Set DESCRIPTION instead of SUMMARY as SUMMARY will inherit by default
* Add qthelp-lib-qtclucene.patch (required to build)
* Whitespace fixes

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 16:10:11 +00:00
Paul Eggleton c5998e6def qt4: Bring in improvements from meta-openembedded
Differences from meta-openembedded version:
* SRC_URI and S now come from qt-${PV}.inc since these are version specific
* Source checksums are also now in qt-${PV}.inc
* Remove do_compile as this is handled in qt-${PV}.inc
* Move contents of do_install_append from qt-${PV}.inc to do_install in
  qt4.inc as this is the same for 4.6.3 and 4.7.1 and will get in the way of
  do_install_append in qt-embedded.inc.
* Don't enable PostgreSQL, MySQL or SQLite 2.x plugins as we don't currently
  have recipes for these DBMSs in Poky. These can be re-enabled easily when
  or if we do.
* Use INC_PR in qt4-x11-free_4.6.3.bb
* Don't always specify -embedded config option in qt4.inc
* Don't add qte.sh to SRC_URI in qt-4.6.3.inc (this is embedded-specific)

Differences from what we have currently in Poky (plus the above):
* Set DESCRIPTION based on embedded/X11
* Move out arch-specific settings to qt4-arch.inc
* Add qt4x11.bbclass which can be inherited by application recipes to select
  the X11 version (this makes more sense once the embedded version is added).
* Update HOMEPAGE

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-02-01 15:57:26 +00:00
Jingdong Lu 811a9f7a33 qt4: Enable accessibility and sm option for LSB.
LSB library checks will look for some symbols of qt4 libraries. Enable "accessibility" and "sm" in order to pass the LSB test.

Signed-off-by: Jingdong Lu<jingdong.lu@windriver.com>
2011-01-20 21:37:01 +00:00
Saul Wold 3f07975359 qt: add fotowall back into qt task
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-30 12:06:52 +00:00
Saul Wold 16cd831898 qmmp: Update qmmp to 0.4.1
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-30 12:06:52 +00:00
Koen Kooi 0e8f0f0a03 RDEPENDS, RRECOMMENDS -> RDPEPENDS_${PN}, RRECOMMENDS_${PN}
For these recipes the dependencies listed in RDEPENDS and RRECOMMENDS only apply to ${PN}

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-30 10:03:10 +00:00
Paul Eggleton d21090934d qmmp: fix dependencies and packaging
* Don't drag in all of Qt as runtime dependencies
* Use cmake instead of qmake. This ensures plugins are configured correctly.
* Split out vorbis and mad input plugins into separate packages
* Fix main package to include an output plugin and various other base files.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2010-12-23 16:15:05 +00:00
Paul Eggleton db2389ef78 quicky: fix Qt4 runtime dependencies
Avoid dragging in all of Qt4

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2010-12-23 16:14:31 +00:00
Paul Eggleton ba3e466d8c fotowall: fix runtime Qt4 dependencies
Fix the runtime dependencies of fotowall so it doesn't drag in the whole of
Qt4. As a bonus the appropriate Qt image plugins for loading jpeg, gif & tiff
files are now installed with fotowall making it actually usable.

Fixes [BUGID: #524]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2010-12-23 16:14:17 +00:00
Jingdong Lu 0e4df9592b Enable '-opengl' option for qt4 in order to generate libQtOpenGL.so
qt4-x11-free: Only build opengl for x86 platforms since only these have GL support at present

[sgw@linux.intel.com: merged and fixed Signed-off-bys]

Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-10 21:57:08 -08:00
Richard Purdie f07b1a2756 Drop variables that do nothing
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-10 22:51:19 +00:00
Saul Wold 3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Dongxiao Xu e24849eee1 task-poky-qt: update LIC_FILES_CHKSUM info
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
2010-12-06 22:02:23 +00:00
Mei Lei 00c5be8944 qmmp:Add license checksum to bb file
Add COPYING file checksum to bb file

Signed-off-by: Mei Lei <lei.mei@intel.com>
2010-12-02 05:24:50 -08:00
Yu Ke 5f4801b819 fotowall: add license checksum
Signed-off-by: Yu Ke <ke.yu@intel.com>
2010-12-02 05:24:46 -08:00
Mei Lei 16c22c65b3 quicky:Add license checksum to bb file
Add version.h file checksum to bb file

Signed-off-by: Mei Lei <lei.mei@intel.com>
2010-12-01 20:47:05 -08:00
Saul Wold cb34a1496a task-poky-qt: Re-Enable MIPS Build and disable fotowall
This address a number if issues with fotowall not being ready
and [BUGID #462] Qt missing for Mips build

Signed-off-by: Saul Wold <Saul.Wold@intel.com>
2010-10-14 20:12:03 +01:00
Saul Wold 5f17c07331 gststream commercial: modified recipes and tasks to add commercial identifier
Modified DEPENDS and RDEPENDS in these recipes and tasks to make packages
which have potential license implications opt in through options in
poky/local.conf.

Signed-off-by: Saul Wold <Saul.Wold@intel.com>
2010-10-08 16:47:19 +01:00
Richard Purdie 5eee854f53 qt4-tools-native: Fix compile failures
fontconfig/freetype are not listed in the dependencies, neither are any of the
X components yet this recipe appears to be building the whole UI framework, not
just the tools.

It turns out this is a dependency for uic3 and qdbus. Since at this time we don't
require these, remove them from the build.

Its likely cross versions of those specific tools would need to be added due to
their dependency on the windowing system compilation.

[BUGID #390]

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-10-06 15:17:14 +01:00
Yu Ke aca435f238 qmmp: add qmmp into image (Bug 301)
qmmp is not included any image before, because it depends on one moblin recipe taglib. Since now the taglib is included into meta/recipes-support, it is safely to add qmmp into the task-poky-qt.

This commit also add an build time dependency for qmmp, because qmmp use some head files from taglib. Without this, qmmp build failure is occationally observed.

Fix [BUGID #301]

Signed-off-by: Yu Ke <ke.yu@intel.com>
2010-09-30 10:14:06 -07:00
Yu Ke b49bfb2244 QT4 mips: disable the LDFLAGS "-Bsymbolic-functions"
"-Bsymbolic-functions" flag makes ld to bind the global function symbol of shared library at compiling time, thus reduce the runtime relocation cost.

However, this flag in binutil 2.20 cause QT4 mips building failure, which is "final link failed: Bad value" error in libQtWebKit.so linking stage. If downgrad to binutil 2.19, this error disappears.

so before binutil new release is out, it is better to disable this flag for QT4 mips.

Fix [BUGID #271]

Signed-off-by: Yu Ke <ke.yu@intel.com>
2010-09-07 15:58:10 +01:00
Saul Wold e013185ac1 tasks-poky-basic and tasks-poky-qt: bump PR and remove at
Remove at since it's failing build
Add Zypper to lsb image

Signed-off-by: Saul Wold <Saul.Wold@intel.com>
2010-09-04 17:12:55 -07:00
Saul Wold 18ea4d2a30 task-poky-qt.bb: Exclude mips from building
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
2010-09-03 18:40:23 -07:00
Saul Wold 3e38d633c9 task-poky-qt: create a task and add to poky-image-sdk
Fixes [BUGID #260]

Signed-off-by: Saul Wold <Saul.Wold@intel.com>
2010-09-03 18:31:52 +01:00
Richard Purdie d62ee7eaf2 packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-01 19:09:57 +01:00
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00