libsip/pyqt staging area fixes

BKrev: 40191dfeVZKNRN4-m64i-SOmqK9-jA

diff --git a/brickout/brickout_2002.06.09.oe b/brickout/brickout_2002.06.09.oe
index e69de29..66a0a14 100644 (file)
--- a/brickout/brickout_2002.06.09.oe
+++ b/brickout/brickout_2002.06.09.oe
@@ -0,0 +1,35 @@
+DESCRIPTION="Clone of the classic arcade game Asteroids for Qtopia/Opie - based on SDL"
+SECTION="base"
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+LICENSE="GPL"
+RDEPENDS="libqpe1 libsdl"
+DEPENDS="virtual/libc virtual/libqpe virtual/libsdl"
+
+SRC_URI = ftp://ftp.sonic.net/pub/users/nbs/unix/agenda/brickout/src/brickout-2002.06.09.tar.gz \
+          file://${FILESDIR}/directories.patch;patch=1
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST=' INCLUDEPATH+=${STAGING_INCDIR}/SDL LIBS+=-lSDL LIBS+=-lSDL_mixer LIBS+=-lSDL_image LIBS+=-lpthread CONFIG+=qte TARGET=brickout DEFINES+=USE_SDL '
+
+do_configure_prepend() {
+        qmake -project -o brickout.pro
+}
+
+do_install() {
+        install -d ${D}/opt/QtPalmtop/{bin,apps/Games,pics,share/brickout/{sounds,music,images}}
+        install -D -m 0755 brickout ${D}/opt/QtPalmtop/bin/brickout
+       install -D -m 0644 brickout.png ${D}/opt/QtPalmtop/pics/brickout.png
+
+        cp -a sounds/* ${D}/opt/QtPalmtop/share/brickout/sounds/
+        cp -a music/* ${D}/opt/QtPalmtop/share/brickout/music/
+        cp -a images-sdl/* ${D}/opt/QtPalmtop/share/brickout/images/
+
+       echo "[Desktop Entry]" >${D}/opt/QtPalmtop/apps/Games/brickout.desktop
+       echo "Comment=Arkanoid game" >>${D}/opt/QtPalmtop/apps/Games/brickout.desktop
+       echo "Exec=brickout" >>${D}/opt/QtPalmtop/apps/Games/brickout.desktop
+       echo "Icon=brickout" >>${D}/opt/QtPalmtop/apps/Games/brickout.desktop
+       echo "Type=Application" >>${D}/opt/QtPalmtop/apps/Games/brickout.desktop
+       echo "Name=Brickout" >>${D}/opt/QtPalmtop/apps/Games/brickout.desktop
+}

diff --git a/libsip/libsip_3.10.oe b/libsip/libsip_3.10.oe
index e69de29..af58206 100644 (file)
--- a/libsip/libsip_3.10.oe
+++ b/libsip/libsip_3.10.oe
@@ -0,0 +1,42 @@
+DESCRIPTION="Runtime helper for sip-generated python wrapper libraries"
+SECTION="base"
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+LICENSE="GPL"
+DEPENDS="virtual/libc virtual/libqte2 python"
+
+SRC_URI := "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
+S       := "${WORKDIR}/sip-${PV}/siplib"
+
+inherit qmake
+
+QMAKE_PROFILES = "siplib.pro.in"
+
+export QTDIR=${STAGING_DIR}/target
+
+#
+# Warning: passing ' "FOO=BAR" results in double ""FOO=BAR"" which is then ignored by qmake
+#
+
+EXTRA_QMAKEVARS_POST = ' CONFIG=qte \
+                         DESTDIR=${STAGING_LIBDIR}/python2.3/site-packages \
+                         TARGET=sip \
+                         DEFINES=SIP_MAKE_DLL \
+                         DEFINES+=SIP_QT_SUPPORT \
+                         INCLUDEPATH=. \
+                         INCLUDEPATH+=${STAGING_DIR}/build/include/python2.3 \
+                         INCLUDEPATH+=${STAGING_DIR}/target/include '
+
+
+#
+# It would be nice if I could use spaces, e.g. CONFIG=qt warn_off release dll
+#
+
+do_compile() {
+    oe_runmake LINK="${CC}" LIBS=""
+}
+
+do_stage() {
+    install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
+    install -m 0644 sipQt.h ${STAGING_INCDIR}/sipQt.h
+}

diff --git a/python/pyqt_3.10.oe b/python/pyqt_3.10.oe
index e69de29..4bfd766 100644 (file)
--- a/python/pyqt_3.10.oe
+++ b/python/pyqt_3.10.oe
@@ -0,0 +1,64 @@
+DESCRIPTION="Python Qt/Embedded + Qt/Palmtop Bindings"
+SECTION="base"
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+LICENSE="GPL"
+DEPENDS="virtual/libc virtual/libqte2 virtual/libqpe1"
+
+SRC_URI = http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \
+          file://${FILESDIR}/libqpe-opie.patch;patch=1 \
+          file://${FILESDIR}/add-missing-feature-test.patch;patch=1
+
+S = ${WORKDIR}/PyQt-x11-gpl-${PV}
+
+inherit qmake
+
+export QTDIR=${STAGING_DIR}/target
+
+EXTRA_QMAKEVARS_POST = ' QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \
+                         CONFIG=qte CONFIG+=warn_on CONFIG+=release \
+                         DESTDIR=${STAGING_LIBDIR}/python2.3/site-packages \
+                         DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT \
+                         INCLUDEPATH=. \
+                         INCLUDEPATH+=${STAGING_DIR}/build/include/python2.3 \
+                         INCLUDEPATH+=${STAGING_DIR}/target/include \
+                         LIBS=-L${STAGING_LIBDIR}/python2.3/site-packages \
+                         LIBS+=-L${STAGING_LIBDIR} LIBS+=-lqte LIBS+=-lqpe LIBS+=-lsip '
+
+PYTHON=${STAGING_BINDIR}/python
+SIP=${STAGING_BINDIR}/sip
+QMAKE=${STAGING_BINDIR}/qmake
+QMAKESPEC=${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++
+
+MODULES=qt qtcanvas qtnetwork qttable qtpe
+
+do_configure() {
+    for module in ${MODULES}
+    do
+        mkdir -p ${module}
+        ${SIP} -Isip -tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1 -z${FILESDIR}/features -c ${module} -m ${module}.pro.in sip/${module}/${module}mod.sip
+        mv -f ${module}.pro.in ${module}/${module}.pro
+    done
+
+    for module in ${MODULES}
+    do
+        cd ${S}/${module}
+        ${QMAKE} -spec ${QMAKESPEC} -after TARGET=${module}cmodule ${EXTRA_QMAKEVARS_POST}
+    done
+}
+
+do_compile() {
+    for module in ${MODULES}
+    do
+        cd ${S}/${module}
+        oe_runmake
+    done
+}
+
+do_stage() {
+    install -d ${STAGING_SIPDIR}
+    for module in ${MODULES}
+    do
+        cp -a ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/
+    done
+}