Merge kergoth@zelda.tuxnami.org:code/packages

into linux.local:/home/kergoth/code/packages

2004/02/03 22:20:24-05:00 local!kergoth
Fixing up a number of broken dependencies, mostly in the sdl and python packages.

BKrev: 4020651aR4oStR4MoJkZuDG1TXRmtg

11 files changed, 101 insertions, 10 deletions

diff --git a/billiardz/billiardz_0.1.4.oe b/billiardz/billiardz_0.1.4.oe
index 3addabe2f9..b1de1df58e 100644
--- a/billiardz/billiardz_0.1.4.oe
+++ b/billiardz/billiardz_0.1.4.oe
@@ -4,8 +4,8 @@ SECTION="base"
 PRIORITY="optional"
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 LICENSE="GPL"
-RDEPENDS=libqpe1 libsdl
-DEPENDS="virtual/libc libsdl
+RDEPENDS=libqpe1 virtual/libsdl
+DEPENDS=virtual/libc virtual/libsdl
 
 SRC_URI = http://www.lilo.cx/packages/ipkg/${P}.tar.gz
 
diff --git a/libsdl/libsdl-image_1.2.3.oe b/libsdl/libsdl-image_1.2.3.oe
index 615f5d2088..7baf99179e 100644
--- a/libsdl/libsdl-image_1.2.3.oe
+++ b/libsdl/libsdl-image_1.2.3.oe
@@ -2,7 +2,7 @@ SECTION="NET"
 PRIORITY="optional"
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 RDEPENDS=libc6 libjpeg62 libpng3 zlib1g libsdl
-DEPENDS=virtual/libc base/zlib base/libpng base/jpeg base/libsdl
+DEPENDS=virtual/libc base/zlib base/libpng base/jpeg virtual/libsdl
 
 SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz
 S = ${WORKDIR}/SDL_image-${PV}
diff --git a/libsdl/libsdl-mixer_1.2.5.oe b/libsdl/libsdl-mixer_1.2.5.oe
index c7a8e164f0..47f80f9cf0 100644
--- a/libsdl/libsdl-mixer_1.2.5.oe
+++ b/libsdl/libsdl-mixer_1.2.5.oe
@@ -2,7 +2,7 @@ SECTION="NET"
 PRIORITY="optional"
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 RDEPENDS=libc6 libsdl
-DEPENDS=virtual/libc base/libsdl
+DEPENDS=virtual/libc virtual/libsdl
 
 SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz
 S = ${WORKDIR}/SDL_mixer-${PV}
diff --git a/libsdl/libsdl-net_1.2.5.oe b/libsdl/libsdl-net_1.2.5.oe
index 3a47034041..eda24d4dc1 100644
--- a/libsdl/libsdl-net_1.2.5.oe
+++ b/libsdl/libsdl-net_1.2.5.oe
@@ -2,7 +2,7 @@ SECTION="NET"
 PRIORITY="optional"
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 RDEPENDS=libc6 libsdl
-DEPENDS=virtual/libc base/libsdl
+DEPENDS=virtual/libc virtual/libsdl
 
 SRC_URI=http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz
 S = ${WORKDIR}/SDL_net-${PV}
diff --git a/libsdl/libsdl-qpe_1.2.6.oe b/libsdl/libsdl-qpe_1.2.6.oe
index 90ede1e006..e708d508c8 100644
--- a/libsdl/libsdl-qpe_1.2.6.oe
+++ b/libsdl/libsdl-qpe_1.2.6.oe
@@ -5,6 +5,7 @@ PRIORITY="optional"
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 RDEPENDS="libc6 libqpe1"
 DEPENDS=virtual/libc virtual/libqpe
+PROVIDES=virtual/libsdl
 
 SRC_URI = cvs://guest@libsdl.org/home/sdlweb/libsdl.org/cvs;module=SDL12;date=${SNAPDATE} \
 	  file://${FILESDIR}/agawa-piro-mickey.patch;patch=1
diff --git a/libsdl/libsdl-ttf_2.0.3.oe b/libsdl/libsdl-ttf_2.0.3.oe
index b767f1e686..d272cb7cd0 100644
--- a/libsdl/libsdl-ttf_2.0.3.oe
+++ b/libsdl/libsdl-ttf_2.0.3.oe
@@ -2,7 +2,7 @@ SECTION="NET"
 PRIORITY="optional"
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 RDEPENDS=libc6 libsdl freetype
-DEPENDS=virtual/libc base/libsdl base/freetype
+DEPENDS=virtual/libc virtual/libsdl freetype
 
 SRC_URI = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
           file://${FILESDIR}/new-freetype-includes.patch;patch=1
diff --git a/libsdl/smpeg_cvs.oe b/libsdl/smpeg_cvs.oe
index be6afa344a..dc929459e7 100644
--- a/libsdl/smpeg_cvs.oe
+++ b/libsdl/smpeg_cvs.oe
@@ -2,7 +2,7 @@ SECTION="NET"
 PRIORITY="optional"
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 RDEPENDS=libc6 libsdl
-DEPENDS=virtual/libc base/libsdl
+DEPENDS=virtual/libc virtual/libsdl
 
 SRC_URI=cvs://anonymous:anonymous@cvs.icculus.org/cvs/cvsroot;module=smpeg
 S = ${WORKDIR}/smpeg
diff --git a/python/python-pygame_1.6.oe b/python/python-pygame_1.6.oe
index 4fbb3c6d10..a263fd8de1 100644
--- a/python/python-pygame_1.6.oe
+++ b/python/python-pygame_1.6.oe
@@ -3,7 +3,7 @@ SECTION=base
 PRIORITY=optional
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 RDEPENDS=libc6 python-core python-numeric libsdl libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg
-DEPENDS=virtual/libc libsdl libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric
+DEPENDS=virtual/libc virtual/libsdl libsdl-image libsdl-mixer libsdl-net libsdl-ttf smpeg python-numeric
 SRCNAME=pygame
 
 SRC_URI = http://www.pygame.org/ftp/${SRCNAME}-${PV}.tar.gz
diff --git a/python/python-pyqt_3.10.oe b/python/python-pyqt_3.10.oe
index e69de29bb2..49ee571a6f 100644
--- a/python/python-pyqt_3.10.oe
+++ b/python/python-pyqt_3.10.oe
@@ -0,0 +1,65 @@
+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/libqpe"
+SRCNAME=pyqt
+
+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
+}
diff --git a/python/python-vorbis_1.3.oe b/python/python-vorbis_1.3.oe
index 58a7dd20e5..1132ec8b2a 100644
--- a/python/python-vorbis_1.3.oe
+++ b/python/python-vorbis_1.3.oe
@@ -2,8 +2,8 @@ DESCRIPTION=Python Vorbis Bindings
 SECTION=base
 PRIORITY=optional
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
-RDEPENDS=libc6 python-core libvorbis pyogg
-DEPENDS=virtual/libc libvorbis pyogg
+RDEPENDS=libc6 python-core libvorbis python-ogg
+DEPENDS=virtual/libc libvorbis python-ogg
 SRCNAME=pyvorbis
 
 SRC_URI = http://www.andrewchatham.com/pyogg/download/${SRCNAME}-${PV}.tar.gz \
diff --git a/qwt/qwt_4.2.0rc1.oe b/qwt/qwt_4.2.0rc1.oe
index e69de29bb2..55ef61bc5f 100644
--- a/qwt/qwt_4.2.0rc1.oe
+++ b/qwt/qwt_4.2.0rc1.oe
@@ -0,0 +1,25 @@
+DESCRIPTION="Qt Widget Extension for Technical Applications"
+SECTION="base"
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+LICENSE="GPL"
+RDEPENDS="libqte2"
+DEPENDS="virtual/libc virtual/libqte2"
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/${PN}/${P}.tgz
+
+inherit qmake
+
+EXTRA_QMAKEVARS_POST = "CONFIG-=thread"
+
+do_stage() {
+	oe_soinstall lib/libqwt.so.4.2.0 ${STAGING_LIBDIR}
+	cp -a include/* ${STAGING_INCDIR}
+}
+
+do_install() {
+	install -d ${D}/{${libdir},${includedir}}
+	oe_soinstall lib/libqwt.so.4.2.0 ${D}/${libdir}
+	cp -a include/* ${D}/${includedir}
+}
+