Add libpng and libjpeg, and make qt/e compile.

BKrev: 3f0dbc54uza9m2VcwjytNqQ6-PmJSw

diff --git a/content/libjpeg-6b.oe b/content/libjpeg-6b.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/content/libpng-1.2.5.oe b/content/libpng-1.2.5.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/content/qte-2.3.6-r0/qpe.patch b/content/qte-2.3.6-r0/qpe.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/content/qte-2.3.6.oe b/content/qte-2.3.6.oe
index e69de29..8405e68 100644 (file)
--- a/content/qte-2.3.6.oe
+++ b/content/qte-2.3.6.oe
@@ -0,0 +1,42 @@
+DESCRIPTION="Qt/Embedded version 2.3.6"
+LICENSE="GPL/QPL"
+SRC_URI="ftp://ftp.trolltech.com/pub/qtopia/source/qt-embedded-2.3.6.tar.gz"
+SRC_URI_append=" file://${FILESDIR}/qpe.patch;patch=1"
+DEPENDS=virtual/libc content/zlib content/libpng content/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()[0]}"
+CC:="${@oe.data.getVar('CC', d, 1).strip().split()[0]}"
+BUILD_CXX:="${@oe.data.getVar('BUILD_CXX', d, 1).strip().split()[0]}"
+BUILD_CC:="${@oe.data.getVar('BUILD_CC', d, 1).strip().split()[0]}"
+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++
+
+do_compile() {
+       CFLAGS="${CFLAGS}"
+       LDFLAGS="${LDFLAGS}"
+       CPPFLAGS="${CPPFLAGS}"
+       CXXFLAGS="${CXXFLAGS}"
+       export CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
+       if [ "$BUILD_ARCH" = "i686" ]; then
+               BUILD_ARCH=x86
+       fi
+       oenote ./configure -platform $BUILD_OS-$BUILD_ARCH-g++ $EXTRA_OECONF
+       echo yes | ./configure $EXTRA_OECONF || die "Configuring qt failed"
+       (cd src/moc; EXTRA_OEMAKE="SYSCONF_CXX='${BUILD_CXX}' SYSCONF_CC='${BUILD_CC}'" oe_runmake)
+       oe_runmake SYSCONF_CXX='${CXX}' SYSCONF_CC="${CC}" SYSCONF_LINK="${CC}" SYSCONF_SHLIB="${CC}" SYSCONF_CFLAGS="${CFLAGS}" SYSCONF_CXXFLAGS="${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -O2 -Wall -W -DNO_DEBUG" SYSCONF_LFLAGS="${LDFLAGS}"
+}

diff --git a/content/zlib-1.1.4.oe b/content/zlib-1.1.4.oe
index e0eacbf..017fad5 100644 (file)
--- a/content/zlib-1.1.4.oe
+++ b/content/zlib-1.1.4.oe
@@ -17,8 +17,8 @@ do_compile() {
 
 do_stage() {
        install -d ${STAGING_DIR}/{bin,lib,include}
-       install -m 0644 zlib.h ${STAGING_DIR}/include/zlib.h
-       install -m 0644 zconf.h ${STAGING_DIR}/include/zconf.h
+       install -m 0644 zlib.h ${STAGING_DIR}/target/include/zlib.h
+       install -m 0644 zconf.h ${STAGING_DIR}/target/include/zconf.h
        install -m 0755 libz.so.1.1.4 ${STAGING_LIBDIR}/libz.so.1.1.4
        install -m 0755 libz.a ${STAGING_LIBDIR}/libz.a
        ln -sf ./libz.so.1.1.4 ${STAGING_LIBDIR}/libz.so.1