diff options
| author |   Michael Lauer <mickey@vanille-media.de> | 2004-09-29 16:03:54 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-09-29 16:03:54 +0000 |
| commit | e7accf1d04937aafeda19cf5575398465a7ccd5c (patch) | |
| tree | 86a71fd37ec01c58e77d1a67e66daa151484a836 /libqpe | |
| parent | 69d94698c98150c9cc32ee8a14bc29b8ea3766c9 (diff) | |
| download | openembedded-e7accf1d04937aafeda19cf5575398465a7ccd5c.tar.gz | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/09/29 18:03:23+02:00 uni-frankfurt.de!mickeyl
konqueror and libqpe-opie: catch up with qt staging changes
2004/09/29 18:02:28+02:00 uni-frankfurt.de!mickeyl
first bits for the qt2/qt3 split. Notes: a) qte2 is default, so no changes should be necessary for packages using the qmake or qmake-derived oeclasses. b) overriding QTDIR is no longer supported, remove that from your .oe files. c) manual changes for non-qmake packages can be necessary. d) inherit qt3x11 to configure qmake for Qt3/X11 (sic)
2004/09/29 17:58:32+02:00 uni-frankfurt.de!mickeyl
fix section for mikmod and modplugplay
2004/09/29 17:12:08+02:00 uni-frankfurt.de!mickeyl
enable losetup in default busybox config
BKrev: 415adcea4UMfz2lvSSK4JcNs17Q9sQ
Diffstat (limited to 'libqpe')
| -rw-r--r-- | libqpe/libqpe-opie_1.1.6.oe | 53 | ||||
| -rw-r--r-- | libqpe/libqpe-opie_cvs.oe | 3 |
2 files changed, 53 insertions, 3 deletions
diff --git a/libqpe/libqpe-opie_1.1.6.oe b/libqpe/libqpe-opie_1.1.6.oe index e69de29bb2..d3c62245d1 100644 --- a/libqpe/libqpe-opie_1.1.6.oe +++ b/libqpe/libqpe-opie_1.1.6.oe @@ -0,0 +1,53 @@ +DESCRIPTION = "Base library for the Qt Palmtop Environment" +SECTION = "opie/libs" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +DEPENDS = "uicmoc-native qte-for-opie" +PROVIDES = "virtual/libqpe" + +TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}" +SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/library" +S = "${WORKDIR}/library" + +inherit qmake + +QMAKE_PROFILES = "library.pro" +EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK" +EXTRA_QMAKEVARS_POST = "DESTDIR=" + +CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions" + +do_compile() { + mkdir -p ${STAGING_INCDIR}/qpe \ + ${STAGING_INCDIR}/qtopia \ + ${STAGING_INCDIR}/opie \ + ${STAGING_INCDIR}/opie2 \ + ${STAGING_INCDIR}/qtopia/private + for i in ${S}/*.h + do + install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i` + install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i` + install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i` + done + for i in ${S}/backend/*.h + do + install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i` + install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i` + install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i` + done + rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia + oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic +} + +do_stage() { + oe_libinstall -so libqpe ${STAGING_LIBDIR} + # include files already done during do_compile +} + +do_install() { + oe_libinstall -so libqpe ${D}/${palmtopdir}/lib +} + +PACKAGES = "libqpe1" +FILES_libqpe1 = "${palmtopdir}/lib" diff --git a/libqpe/libqpe-opie_cvs.oe b/libqpe/libqpe-opie_cvs.oe index 34d62ce304..ba2532b918 100644 --- a/libqpe/libqpe-opie_cvs.oe +++ b/libqpe/libqpe-opie_cvs.oe @@ -14,9 +14,6 @@ S = "${WORKDIR}/library" inherit qmake QMAKE_PROFILES = "library.pro" - -export QTDIR = "${STAGING_LIBDIR}/.." -export OPIEDIR = "${STAGING_LIBDIR}/.." EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK" EXTRA_QMAKEVARS_POST = "DESTDIR=" |