Switch libjpeg to upstream sources + local version of debian's patch.

BKrev: 3f6234daHdY1C8GFpV7sW5jswoIWJg

5 files changed, 2 insertions, 40 deletions

diff --git a/content/jpeg-6b.oe b/content/jpeg-6b.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/jpeg-6b.oe
diff --git a/content/jpeg-6b/debian.patch b/content/jpeg-6b/debian.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/content/jpeg-6b/debian.patch
diff --git a/content/libjpeg-6b.oe b/content/libjpeg-6b.oe
deleted file mode 100644
index 2183fd5f1f..0000000000
--- a/content/libjpeg-6b.oe
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION="Zlib Compression Library"
-SECTION="libs"
-PRIORITY="required"
-MAINTAINER="Chris Larson <kergoth@handhelds.org>"
-RDEPENDS="libc6"
-
-SRC_URI=${DEBIAN_MIRROR}/main/libj/libjpeg6b/libjpeg6b_${PV}.orig.tar.gz ${DEBIAN_MIRROR}/main/libj/libjpeg6b/libjpeg6b_${PV}-5.diff.gz;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() {
-	install -d ${D}/usr/lib
-	install -m 755 -D .libs/libjpeg.so.62.0.0 ${D}/usr/lib/libjpeg.so.62.0.0
-	ln -sf libjpeg.so.62.0.0 ${D}/usr/lib/libjpeg.so.62
-}
-
-PACKAGES="libjpeg62"
-FILES=""
-FILES_libjpeg62="/usr/lib/libjpeg.so.62.0.0 /usr/lib/libjpeg.so.62"
diff --git a/content/qte-2.3.6.oe b/content/qte-2.3.6.oe
index b672af351b..50ea11c3b7 100644
--- a/content/qte-2.3.6.oe
+++ b/content/qte-2.3.6.oe
@@ -2,7 +2,7 @@ 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 zlib libpng libjpeg
+DEPENDS=virtual/libc zlib libpng jpeg
 PROVIDES=virtual/qte virtual/libqte2
 S="${WORKDIR}/qt-${PV}"
 
diff --git a/content/qte-2.3.7.oe b/content/qte-2.3.7.oe
index 9c38a0a344..392d23a9c5 100644
--- a/content/qte-2.3.7.oe
+++ b/content/qte-2.3.7.oe
@@ -2,7 +2,7 @@ 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
+DEPENDS=virtual/libc base/zlib base/libpng base/jpeg
 PROVIDES=virtual/qte virtual/libqte2
 S="${WORKDIR}/qt-${PV}"