Commit Graph

46 Commits

Author SHA1 Message Date
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