summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-03-26 18:41:29 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-03-26 18:41:29 +0000
commit2229d1d8cb09e3ee50f63c2bfe190e0492330aae (patch)
tree60a21f46608ba1192286b704f153b55dcfaa8402
parent53b74754ecb6791f86a63abbfc695805282479f9 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/26 19:18:47+01:00 vanille.de!mickeyl opie-keytabs: reintroduce tag 2005/03/26 19:10:18+01:00 vanille.de!mickeyl readd TAG in opie-pics and opie-sounds 2005/03/26 18:52:30+01:00 vanille.de!mickeyl libqpe-opie: revert last change and fix it properly this time 2005/03/26 18:47:11+01:00 vanille.de!mickeyl libqpe-opie: inherit opie BKrev: 4245acd9mHDwfXp9YuRs4eGXWowakQ
-rw-r--r--packages/libqpe/libqpe-opie.inc58
-rw-r--r--packages/libqpe/libqpe-opie_1.2.0.bb7
-rw-r--r--packages/opie-keytabs/opie-keytabs_1.2.0.bb6
-rw-r--r--packages/opie-keytabs/opie-keytabs_cvs.bb2
-rw-r--r--packages/opie-pics/opie-pics_1.2.0.bb7
-rw-r--r--packages/opie-sounds/opie-sounds_1.2.0.bb6
6 files changed, 85 insertions, 1 deletions
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index e69de29bb2..59057b5896 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -0,0 +1,58 @@
+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"
+PROVIDES = "virtual/libqpe"
+
+S = "${WORKDIR}/library"
+
+inherit qmake
+
+QMAKE_PROFILES = "library.pro"
+EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
+EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
+# EXTRA_QMAKEVARS_POST = "DESTDIR="
+
+CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions"
+CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
+CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
+
+do_compile_prepend_ramses () {
+ ln -s custom-ramses.h custom.h
+}
+
+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/packages/libqpe/libqpe-opie_1.2.0.bb b/packages/libqpe/libqpe-opie_1.2.0.bb
index e69de29bb2..f16bdff7a8 100644
--- a/packages/libqpe/libqpe-opie_1.2.0.bb
+++ b/packages/libqpe/libqpe-opie_1.2.0.bb
@@ -0,0 +1,7 @@
+include ${PN}.inc
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library"
+
diff --git a/packages/opie-keytabs/opie-keytabs_1.2.0.bb b/packages/opie-keytabs/opie-keytabs_1.2.0.bb
index e69de29bb2..63dfec7ccd 100644
--- a/packages/opie-keytabs/opie-keytabs_1.2.0.bb
+++ b/packages/opie-keytabs/opie-keytabs_1.2.0.bb
@@ -0,0 +1,6 @@
+include ${PN}.inc
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/etc"
diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb
index d3739c8c37..1fc28422f6 100644
--- a/packages/opie-keytabs/opie-keytabs_cvs.bb
+++ b/packages/opie-keytabs/opie-keytabs_cvs.bb
@@ -3,4 +3,4 @@ include ${PN}.inc
PV = "1.2.0+cvs-${CVSDATE}"
PR = "r0"
-SRC_URI = "${HANDHELDS_CVS};module=opie/etc "
+SRC_URI = "${HANDHELDS_CVS};module=opie/etc"
diff --git a/packages/opie-pics/opie-pics_1.2.0.bb b/packages/opie-pics/opie-pics_1.2.0.bb
index e69de29bb2..58bee58e12 100644
--- a/packages/opie-pics/opie-pics_1.2.0.bb
+++ b/packages/opie-pics/opie-pics_1.2.0.bb
@@ -0,0 +1,7 @@
+include ${PN}.inc
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics-hires"
diff --git a/packages/opie-sounds/opie-sounds_1.2.0.bb b/packages/opie-sounds/opie-sounds_1.2.0.bb
index e69de29bb2..fb00b06c45 100644
--- a/packages/opie-sounds/opie-sounds_1.2.0.bb
+++ b/packages/opie-sounds/opie-sounds_1.2.0.bb
@@ -0,0 +1,6 @@
+include ${PN}.inc
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/sounds"