Correct libpng and libjpeg deps for qte

BKrev: 3f5e3715--fsVkIFtaM0zsRrQjqEBg

diff --git a/content/glibc-2.3.2.oe b/content/glibc-2.3.2.oe
index d4273bb..383dd51 100644 (file)
--- a/content/glibc-2.3.2.oe
+++ b/content/glibc-2.3.2.oe
@@ -6,7 +6,7 @@ RDEPENDS=""
 PRIORITY=required
 MAINTAINER="Chris Larson <kergoth@handhelds.org>"
 
-SRC_URI="ftp://ftp.gnu.org/gnu/glibc/${P}.tar.gz ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz"
+SRC_URI="ftp://ftp.gnu.org/gnu/glibc/glibc-2.3.2.tar.gz ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.gz"
 SRC_URI_append=' file://${FILESDIR}/noinfo.patch;patch=1'
 SRC_URI_append=' file://${FILESDIR}/10_cvs.patch;patch=1'
 SRC_URI_append=' file://${FILESDIR}/30_glibc232-base.patch;patch=1;pnum=0'

diff --git a/content/qte-2.3.7.oe b/content/qte-2.3.7.oe
index e69de29..9c38a0a 100644 (file)
--- a/content/qte-2.3.7.oe
+++ b/content/qte-2.3.7.oe
@@ -0,0 +1,70 @@
+DESCRIPTION="Qt/Embedded version ${PV}"
+LICENSE="GPL/QPL"
+SRC_URI="ftp://ftp.trolltech.com/pub/qtopia/source/qt-embedded-${PV}.tar.gz"
+SRC_URI_append=" file://${FILESDIR}/qpe.patch;patch=1"
+DEPENDS=virtual/libc base/zlib base/libpng base/libjpeg
+PROVIDES=virtual/qte virtual/libqte2
+S="${WORKDIR}/qt-${PV}"
+
+# strip off leading and trailing whitespace, and made the vars single word
+#CXX:="${@oe.data.getVar('CXX', d, 1).strip().split()[-1]}"
+#CC:="${@oe.data.getVar('CC', d, 1).strip().split()[-1]}"
+#BUILD_CXX:="${@oe.data.getVar('BUILD_CXX', d, 1).strip().split()[-1]}"
+#BUILD_CC:="${@oe.data.getVar('BUILD_CC', d, 1).strip().split()[-1]}"
+#CFLAGS:="${@oe.data.getVar('CFLAGS', d, 1).strip()}"
+#CXXFLAGS:="${@oe.data.getVar('CXXFLAGS', d, 1).strip()}"
+#LDFLAGS:="${@oe.data.getVar('LDFLAGS', d, 1).strip()}"
+
+export QTDIR = ${S}
+
+ARCH_i686=x86
+
+EXTRA_OECONF=-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif ${EXTRA_OECONF_ARCH} ${EXTRA_OECONF_CONFIG}
+
+EXTRA_OECONF_CONFIG=-qconfig qpe
+EXTRA_OECONF_ARCH=-xplatform ${OS}-${ARCH}-g++
+EXTRA_OECONF_ARCH_collie=-xplatform ${OS}-sharp-g++
+EXTRA_OECONF_ARCH_ramses=-xplatform ${OS}-ramses-g++
+
+EXTRA_OEMAKE = -e
+
+export SYSCONF_CC = ${CC}
+export SYSCONF_CXX = ${CXX}
+export SYSCONF_LINK = ${CC}
+export SYSCONF_SHLIB = ${CC}
+export SYSCONF_CFLAGS = ${CFLAGS}
+export SYSCONF_CXXFLAGS = ${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG
+export SYSCONF_LFLAGS = ${LDFLAGS}
+
+do_compile() {
+       unset CC CXX LD LINK CPP CFLAGS CXXFLAGS LDFLAGS
+       set -e
+       if [ "$BUILD_ARCH" = "i686" ]; then
+               BUILD_ARCH=x86
+       fi
+       echo yes | ./configure -platform $BUILD_OS-$BUILD_ARCH-g++ $EXTRA_OECONF || die "Configuring qt failed"
+       (
+               set -e
+               cd src/moc
+               export SYSCONF_CXX="${BUILD_CXX}"
+               export SYSCONF_CC="${BUILD_CC}"
+               export SYSCONF_LINK="${BUILD_CC}"
+               export SYSCONF_SHLIB="${BUILD_CC}"
+               unset SYSCONF_CFLAGS SYSCONF_CXXFLAGS SYSCONF_LFLAGS CROSS
+               oe_runmake
+       )
+       cd ${S}
+       oe_runmake
+}
+
+do_stage () {
+       install -m 0755 lib/libqte.so.* ${STAGING_LIBDIR}/
+       install -m 0755 bin/moc ${STAGING_BINDIR}/
+       rm -f include/qxt.h
+       cp -a -f --dereference include/* ${STAGING_DIR}/target/include/
+}
+
+do_install () {
+       install -d ${D}/usr/lib/qte2/lib
+       install -m 0755 lib/libqte.so.* ${D}/usr/lib/qte2/lib/
+}