Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/10/12 22:19:59+02:00 uni-frankfurt.de!mickeyl
build and package opie-eye-slave

2004/10/12 22:12:01+02:00 uni-frankfurt.de!mickeyl
package opie-advancedfm-pics seperatly and make opie-eye depend on it

BKrev: 416c3c7aXSVtH-3bdTCZFYhZQx9f8g

diff --git a/opie-advancedfm/opie-advancedfm_1.1.6.oe b/opie-advancedfm/opie-advancedfm_1.1.6.oe
index e69de29..1e1e300 100644 (file)
--- a/opie-advancedfm/opie-advancedfm_1.1.6.oe
+++ b/opie-advancedfm/opie-advancedfm_1.1.6.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Opie Advanced Filemanager"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+APPNAME = "advancedfm"
+RDEPENDS = "opie-advancedfm-pics"
+PR = "r1"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_install() {
+    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+}
+
+PACKAGES_prepend = "opie-advancedfm-pics "
+FILES_opie-advancedfm-pics = "${palmtopdir}/pics/${APPNAME}/*.png"
+

diff --git a/opie-advancedfm/opie-advancedfm_cvs.oe b/opie-advancedfm/opie-advancedfm_cvs.oe
index a01d826..5fbeb34 100644 (file)
--- a/opie-advancedfm/opie-advancedfm_cvs.oe
+++ b/opie-advancedfm/opie-advancedfm_cvs.oe
@@ -5,6 +5,8 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "advancedfm"
+RDEPENDS = "opie-advancedfm-pics"
+PR = "r1"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/${APPNAME} \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
@@ -17,3 +19,7 @@ do_install() {
     install -d ${D}/${palmtopdir}/pics/${APPNAME}/
     install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
 }
+
+PACKAGES_prepend = "opie-advancedfm-pics "
+FILES_opie-advancedfm-pics = "${palmtopdir}/pics/${APPNAME}/*.png"
+

diff --git a/opie-eye/opie-eye_1.1.6.oe b/opie-eye/opie-eye_1.1.6.oe
index e69de29..b248187 100644 (file)
--- a/opie-eye/opie-eye_1.1.6.oe
+++ b/opie-eye/opie-eye_1.1.6.oe
@@ -0,0 +1,31 @@
+DESCRIPTION = "A image viewer"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libopiecore2 libopieui2 libopiemm2"
+RDEPENDS = "opie-advancedfm-pics"
+APPNAME = "opie-eye"
+PR = "r2"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/graphics/opie-eye \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps"
+S = "${WORKDIR}/${APPNAME}"
+
+inherit opie
+
+do_configure_append() {
+        cd slave && qmake -makefile -spec ${QMAKESPEC} slave.pro -after ${EXTRA_QMAKEVARS_POST}
+}
+
+do_compile_append() {
+        cd slave && oe_runmake
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+

diff --git a/opie-eye/opie-eye_cvs.oe b/opie-eye/opie-eye_cvs.oe
index 301da3d..59a2431 100644 (file)
--- a/opie-eye/opie-eye_cvs.oe
+++ b/opie-eye/opie-eye_cvs.oe
@@ -4,19 +4,28 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libopiecore2 libopieui2 libopiemm2"
+RDEPENDS = "opie-advancedfm-pics"
 PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "opie-eye"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/graphics/opie-eye \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/apps"
-
 S = "${WORKDIR}/${APPNAME}"
 
 inherit opie
 
-# FILES plugins/application/libopie-eye.so* bin/opie-eye bin/opie-eye_slave apps/Applications/opie-eye.desktop pics/opie-eye/*.png
+do_configure_append() {
+       cd slave && qmake -makefile -spec ${QMAKESPEC} slave.pro -after ${EXTRA_QMAKEVARS_POST}
+}
+
+do_compile_append() {
+       cd slave && oe_runmake
+}
+
 do_install() {
+       install -m 0755 opie-eye_slave ${D}/${palmtopdir}/bin/
         install -d ${D}${palmtopdir}/pics/${APPNAME}/
         install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }