4 files changed, 54 insertions, 16 deletions
diff --git a/content/jpeg-6b.oe b/content/jpeg-6b.oe
index e69de29bb2..755f9a278a 100644
--- a/content/jpeg-6b.oe
+++ b/content/jpeg-6b.oe
@@ -0,0 +1,37 @@
+DESCRIPTION="Zlib Compression Library"
+SECTION="libs"
+PRIORITY="required"
+MAINTAINER="Chris Larson <kergoth@handhelds.org>"
+RDEPENDS="libc6"
+
+SRC_URI = http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
+	  file://${FILESDIR}/debian.patch;patch=1
+DEPENDS=virtual/libc
+S=${WORKDIR}/jpeg-${PV}
+
+EXTRA_OECONF="--enable-static --enable-shared"
+
+# this libtool cant handle the multiword gcc
+CC:=${@oe.data.getVar("CC", d, 1).split()[-1].strip()}
+CFLAGS_append = " -D_REENTRANT"
+#export AR:=${AR} rv
+
+do_stage() {
+	install -d ${STAGING_DIR}/{bin,lib,include}
+	install -m 644 -D jconfig.h ${STAGING_DIR}/target/include/jconfig.h
+	install -m 644 -D jpeglib.h ${STAGING_DIR}/target/include/jpeglib.h
+	install -m 644 -D jmorecfg.h ${STAGING_DIR}/target/include/jmorecfg.h
+	install -m 644 -D jerror.h ${STAGING_DIR}/target/include/jerror.h
+	install -m 644 -D jpegint.h ${STAGING_DIR}/target/include/jpegint.h
+	install -m 755 -D .libs/libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so.62.0.0
+	ln -sf libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so.62
+	ln -sf libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so
+}
+
+do_install() {
+	set -e
+	install -d ${D}/${bindir} ${D}/${includedir} \
+		   ${D}/${mandir}/man1 ${D}/${libdir}
+	oe_runmake 'prefix=${D}/${prefix}' 'exec_prefix=${D}/${exec_prefix}' \
+		   install
+}
diff --git a/content/libpng-1.2.5.oe b/content/libpng-1.2.5.oe
index e61004a3aa..52787b63d5 100644
--- a/content/libpng-1.2.5.oe
+++ b/content/libpng-1.2.5.oe
@@ -6,15 +6,18 @@ DEPENDS=virtual/libc base/zlib
 RDEPENDS="libc6 zlib1g"
 RDEPENDS_append_libpng3=' libpng12'
 
-SRC_URI=http://www.libpng.org/pub/png/src/${P}.tar.bz2
-S=${WORKDIR}/${P}
+SRC_URI = ${SOURCEFORGE_MIRROR}/png-mng/${P}.tar.bz2
+S = ${WORKDIR}/${P}
 
 EXTRA_OEMAKE_append=' ZLIBINC=${STAGING_DIR}/target/include ZLIBLIB=${STAGING_LIBDIR}'
 
 do_compile() {
 	set -e
 	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
-	oe_runmake libpng12.so
+	unset LDFLAGS
+	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
+		   'ZLIBINC=${STAGING_DIR}/target/include' \
+		   'ZLIBLIB=${STAGING_LIBDIR}'
 }
 
 do_stage() {
@@ -28,15 +31,13 @@ do_stage() {
 	ln -sf ./libpng12.so ${STAGING_LIBDIR}/libpng.so
 }
 
-do_install() {
-	install -d ${D}/usr/lib
-	install -m 755 -D libpng12.so.0.${PV} ${D}/usr/lib/libpng12.so.0.${PV}
-	ln -sf ./libpng12.so.0.${PV} ${D}/usr/lib/libpng12.so.0
-	ln -sf ./libpng12.so.0.${PV} ${D}/usr/lib/libpng12.so
-	ln -sf libpng12.so ${D}/usr/lib/libpng.so.3
+do_install () {
+	set -e
+	install -d ${D}/${bindir} ${D}/${mandir} \
+		   ${D}/${libdir} ${D}/${includedir}
+	unset LDFLAGS
+	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
+		   'DB=${D}/${bindir}' 'DI=${D}/${includedir}' \
+		   'DL=${D}/${libdir}' 'DM=${D}/${mandir}' \
+		   install
 }
-
-PACKAGES="libpng3 libpng12"
-FILES=""
-FILES_libpng3="/usr/lib/libpng.so.3"
-FILES_libpng12="/usr/lib/libpng12.so.*"
diff --git a/content/qte-2.3.6.oe b/content/qte-2.3.6.oe
index 50ea11c3b7..b77b5ae982 100644
--- a/content/qte-2.3.6.oe
+++ b/content/qte-2.3.6.oe
@@ -1,6 +1,6 @@
 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="ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-2.3.6.tar.gz"
 SRC_URI_append=" file://${FILESDIR}/qpe.patch;patch=1"
 DEPENDS=virtual/libc zlib libpng jpeg
 PROVIDES=virtual/qte virtual/libqte2
diff --git a/content/qte-2.3.7.oe b/content/qte-2.3.7.oe
index 392d23a9c5..76b88a71d9 100644
--- a/content/qte-2.3.7.oe
+++ b/content/qte-2.3.7.oe
@@ -1,6 +1,6 @@
 DESCRIPTION="Qt/Embedded version ${PV}"
 LICENSE="GPL/QPL"
-SRC_URI="ftp://ftp.trolltech.com/pub/qtopia/source/qt-embedded-${PV}.tar.gz"
+SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz"
 SRC_URI_append=" file://${FILESDIR}/qpe.patch;patch=1"
 DEPENDS=virtual/libc base/zlib base/libpng base/jpeg
 PROVIDES=virtual/qte virtual/libqte2