Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/28 20:04:40-08:00 (none)!emte
edb-native_1.0.5.bb  edb_1.0.5.bb update

2004/12/28 19:32:01-08:00 (none)!emte
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into t.(none):/home/OE/speedracer/packages

2004/12/28 19:31:27-08:00 (none)!emte
imlib2_1.2.0.bb update

BKrev: 41d2352cjyqnMbMNsMQh5O4NZ3SlEw

diff --git a/packages/edb/edb-native_cvs.bb b/packages/edb/edb-native_1.0.5.bb
similarity index 100%
rename from packages/edb/edb-native_cvs.bb
rename to packages/edb/edb-native_1.0.5.bb

diff --git a/packages/edb/edb_cvs.bb b/packages/edb/edb_1.0.5.bb
similarity index 100%
rename from packages/edb/edb_cvs.bb
rename to packages/edb/edb_1.0.5.bb

diff --git a/packages/imlib2/imlib2_1.1.0.bb b/packages/imlib2/imlib2_1.1.0.bb
deleted file mode 100644 (file)
index f3764ec..0000000
--- a/packages/imlib2/imlib2_1.1.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "A graphic library for file loading, saving, rendering, and \
-manipulation."
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "freetype libpng jpeg"
-PV = "1.2.0"
-PR = "1"
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-
-#SRC_URI = "file://./"
-SRC_URI = "${SOURCEFORGE_MIRROR}/enlightenment/imlib2-${PV}.tar.gz"
-S = "${WORKDIR}/imlib2"
-
-inherit autotools pkgconfig binconfig
-
-export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config"
-export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
-
-EXTRA_OECONF = "--disable-mmx \
-                --disable-x11"
-
-do_stage () {
-  oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
-  install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
-}
-
-FILES_${PN} = "${libdir}/libImlib2*.so*"
-FILES_${PN} = "${libdir}/imlib2"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
- 

diff --git a/packages/imlib2/imlib2_1.2.0.bb b/packages/imlib2/imlib2_1.2.0.bb
new file mode 100644 (file)
index 0000000..e69de29