summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-x11-free.inc
Commit message (Collapse)AuthorAgeFilesLines
* qt4: move functions from python to shell styleDongxiao Xu2012-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | In qt4's do_configure operation, it will refer to some variables that are derived from 'd', however these variable values may be not correct in multilib case since the extraction of these variables happens before the multilib handler. The fix is to move these python style functions back to shell style. This fixes [YOCTO #2355] [RP: Fix whitepace] (From OE-Core rev: 98cb2efe4e9f3092d531c9fc809406c3ef559725) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [SG: Resolve merge conflicts for 1.2.1] Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add RPROVIDES/RREPLACES for qmake2 recipePaul Eggleton2012-03-191-1/+1
| | | | | | | | | | | | OE-Classic and meta-oe provide a qmake2 recipe; since this has been obsoleted by the recent change to provide qmake within the tools package and (in the latter case) will soon be removed, add an RREPLACES to aid upgrades and RPROVIDES to make it easy to install. (From OE-Core rev: 9ba01c3b7ce3d9f822e1cc08cd032e019a15180f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: package static libraries correctly to fix warningsSaul Wold2012-03-151-1/+1
| | | | | | | | | | WARNING: QA Issue: non -staticdev package contains static .a library: qt4-demos path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a' WARNING: QA Issue: non -staticdev package contains static .a library: qt4-examples path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-examples/usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a' (From OE-Core rev: d4f1ef6b8297826230a68e535098709d07de1f48) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix deps in libQtWebkit.la and QtWebKit.pcAndreas Oberritter2012-03-131-1/+1
| | | | | | | | | | | | | * Both files contain -L../../WebCore/release -L../../JavaScriptCore/release -lwebcore -ljscore * These paths and libs don't get installed. * When building a shared lib with libtool, that links with libQtWebKit, libtool adds these unneeded parameters to the linker command-line, thus linking fails. (From OE-Core rev: 4c41a3204ef72f53813ddc86fe525fa9c6714daa) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4.inc: depend on tiffAndreas Oberritter2012-02-281-1/+1
| | | | | | | | | | | * Fixes the following error with qt4-embedded-4.8.0 and possibly others: | ../../../gui/image/qtiffhandler.cpp:48:20: fatal error: tiffio.h: No such file or directory (From OE-Core rev: d0853052228128ccca2b744dae9c4dceae23067a) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclassOtavio Salvador2012-01-061-2/+1
| | | | | | | (From OE-Core rev: 73fc8f706b08ec74087754eacd2257856fe829d1) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4.inc : Add uic, moc, rcc, and lrelease to tools package.Philip Balister2011-12-131-1/+1
| | | | | | | | | | | | | | | | | | | These binaries are needed in the target tools package so we can build qt apps on the target. You also need to install qmake from meta-oe. Tested by building gnuradio on the USRP e100 with qt support. (This effectively reverses OE-core rev 69eeb3d2276e5b10d084b47d308ecfc8daf8b467, however test builds for qemux86 and qemumips produced no packaging warnings such as those described in that commit, and the architecture of the executables is correct.) (From OE-Core rev: c96db08915a554fb5e4bb2c360b919c8392b32c6) Signed-off-by: Philip Balister <philip@balister.org> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: various tidy-upsPaul Eggleton2011-12-081-2/+2
| | | | | | | | | | | | | | | | | | * -reduce-relocations is already specified in qt4.inc, no need to add it in qt-${PV}.inc * Add QT_GLFLAGS to QT_CONFIG_FLAGS in qt4.inc rather than spreading it through other inc files. * Add "-xmlpatterns -no-rpath -qt3support -silent" to QT_CONFIG_FLAGS in qt4.inc rather than qt-${PV}.inc; these have been supported since at least 4.5.2 and therefore shouldn't be version-specific. * Move "-no-fast -silent -no-rpath" to EXTRA_OECONF in qt4-native.inc rather than the versioned recipes for the same reason * Remove redundant setting of LICENSE in qt4-embedded.inc (From OE-Core rev: c9f714062c1100cedbcb2c16d16656e3f5442133) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix sed to have correct *.pc filesEric Bénard2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | it seems sed doesn't handle \? properly if the string in not between quotes. without this patch, we get something like (for example for QtDBusE.pc : Libs: -L${libdir} -lQtDBusE Libs.private: -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board/ usr/lib -L/usr/lib -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board /usr/lib -lQtXmlE -L/usr/lib -lQtCoreE -lpthread Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir} with the patch we get what is expected : Libs: -L${libdir} -lQtDBusE Libs.private: -lQtXmlE -lQtCoreE -lpthread Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir} (From OE-Core rev: 2e635b4fe6be9d5bfcdd837a523833b7eb0819a0) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-x11-free: bring back pkg-config fixupsSimon Busch2011-11-151-1/+15
| | | | | | | | | | | | | | | | * With b40b9c024be5e1ec81a31961158b3e6b529acfe0 some pkg-config fixups where removed from qt4.inc which breaks the pkg-config files for qt4-embedded. Without that the pkg-config files for qt4-x11-free are broken. So this patch puts the fixes into the qt4-x11-free.inc file to be used by qt4-x11-free and not qt4-embedded. * Resending because nobody replied on http://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg10609.html (From OE-Core rev: 9086c7e2e106fb5188963a5dac4e1f1ff9d759d4) Signed-off-by: Simon Busch <morphis@gravedo.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: packaging fixupDmitry Eremin-Solenikov2011-10-041-1/+1
| | | | | | | | | | | | | 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>
* qt4: Fix translation supportOtavio Salvador2011-10-041-1/+1
| | | | | | | | | | | 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>
* qt4.inc: package qtdemo's docs in a separate packageDenis Carikli2011-10-041-1/+1
| | | | | | | | | | | | | | 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>
* meta: qt4: fix postprocessing of pkg-config filesSimon Busch2011-09-281-1/+1
| | | | | | | | | | | | | 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>
* qt4: add blacklist-diginotar-certs patchEric Bénard2011-09-151-1/+1
| | | | | | | | | | | - 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>
* qt4: package QML plugins and correct their install directoryPaul Eggleton2011-08-151-1/+1
| | | | | | | | | | | | | | | | | | 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>
* meta: Rename SITEINFO_ENDIANESS to SITEINFO_ENDIANNESSKhem Raj2011-07-261-1/+1
| | | | | | | | | | | | | 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>
* libQtOpenGL:Add libQtOpenGL to an lsb imageXiaofeng Yan2011-07-071-1/+1
| | | | | | | | | | 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>
* qt4: ensure target packages don't include host binariesPaul Eggleton2011-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Drop PRIORITY variableRichard Purdie2011-07-011-1/+0
| | | | | | | | | | | | | | | | 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>
* Remove machine-specific metadata for machines no longer in oe-corePaul Eggleton2011-05-051-3/+1
| | | | | | | (From OE-Core rev: 72567733033347b662d9baa07432985fd2da3efa) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-x11-free: add virtual/libgl for opengl dependencySaul Wold2011-04-121-2/+2
| | | | | | | (From OE-Core rev: e718a775409938af51c1f06d2574435cbf978188) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemuppc: add libqtopengl4 for ppcMei Lei2011-04-041-0/+1
| | | | | | | | | | 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>
* qt4: Bring in improvements from meta-openembeddedPaul Eggleton2011-02-011-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Enable '-opengl' option for qt4 in order to generate libQtOpenGL.soJingdong Lu2010-12-101-0/+3
| | | | | | | | | | 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>
* Major layout change to the packages directoryRichard Purdie2010-08-271-0/+14
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>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 08:12:18 +0000