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

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

2005/05/11 21:43:37+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/11 18:50:47+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/11 18:50:19+02:00 uni-frankfurt.de!mickeyl
unbreak ewl and move to using releases

2005/05/11 18:44:46+02:00 uni-frankfurt.de!mickeyl
move etox to using releases

2005/05/11 18:41:01+02:00 uni-frankfurt.de!mickeyl
unbreak edje and move over to using releases

2005/05/11 18:39:11+02:00 uni-frankfurt.de!mickeyl
enable ecore-dbus and ecore-file libraries

2005/05/11 17:57:28+02:00 uni-frankfurt.de!mickeyl
unbreak imlib2 and switch to using releases

2005/05/11 17:42:25+02:00 uni-frankfurt.de!mickeyl
move embryo to using the release version

2005/05/11 17:39:15+02:00 uni-frankfurt.de!mickeyl
move ecore and evas to releases and unbreak it

2005/05/11 17:09:40+02:00 uni-frankfurt.de!mickeyl
unbreak edb and eet, move to releases, and remove maintainers that don't maintain

BKrev: 42826d99O_aJh416yx1aCKD6PTS1Yw

36 files changed, 199 insertions, 338 deletions

diff --git a/packages/embryo/embryo-native_cvs.bb b/packages/ecore/ecore-native_0.9.9.007.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/embryo/embryo-native_cvs.bb
+++ b/packages/ecore/ecore-native_0.9.9.007.bb
diff --git a/packages/ecore/ecore-native_cvs.bb b/packages/ecore/ecore-native_cvs.bb
deleted file mode 100644
index 6e5e1d1413..0000000000
--- a/packages/ecore/ecore-native_cvs.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-include ecore_${PV}.bb
-LICENSE = "MIT"
-inherit native
-DEPENDS = "edb-native eet-native evas-native freetype-native"
-
-do_stage () {
-	for p in ${parts}; do
-		dir=`echo $p|tr A-Z a-z`
-		install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
-		oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
-	done
-	install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/packages/embryo/embryo_cvs.bb b/packages/ecore/ecore_0.9.9.007.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/embryo/embryo_cvs.bb
+++ b/packages/ecore/ecore_0.9.9.007.bb
diff --git a/packages/ecore/ecore_cvs.bb b/packages/ecore/ecore_cvs.bb
deleted file mode 100644
index abb0899fb0..0000000000
--- a/packages/ecore/ecore_cvs.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \
-foundation libraries. It makes makes doing selections, drag and drop, event loops, \
-timeouts and idle handlers fast, optimized, and convenient."
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-PRIORITY = "optional"
-LEAD_SONAME = "libecore.so"
-LICENSE = "MIT"
-PV = "${CVSDATE}"
-DEPENDS = "edb eet evas freetype edb-native"
-PR = "r6"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ecore"
-S = "${WORKDIR}/ecore"
-
-inherit autotools binconfig
-
-EXTRA_OECONF = "--enable-ecore-fb \
-		--enable-ecore-job \
-		--enable-ecore-evas-fb \
-		--disable-ecore-evas-x \
-		--disable-ecore-evas-gl \
-		--enable-ecore-con \
-		--enable-ecore-ipc \
-		--enable-ecore-txt \
-		--disable-ecore-x \
-		--enable-ecore-config \
-		--disable-openssl"
-
-parts = "Ecore Ecore_Job \
-	 Ecore_Txt Ecore_Fb Ecore_Con \
-	 Ecore_Ipc Ecore_Evas Ecore_Config"
-
-do_stage () {
-	for p in ${parts}; do
-		dir=`echo $p|tr A-Z a-z`
-		install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
-		oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/
-	done
-	install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/
-	install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-PACKAGES += "ecore-examples"
-
-FILES_${PN} = "${libdir}/libecore*.so* ${libdir}/ecore_config_ipc_ecore.so"
-FILES_${PN}-dev += "${bindir}/ecore-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/ecore_test ${bindir}/ecore_evas_test ${datadir}"
diff --git a/packages/ewl/ewl_cvs.bb b/packages/ecore/files/fix-configure.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/ewl/ewl_cvs.bb
+++ b/packages/ecore/files/fix-configure.patch
diff --git a/packages/edb/edb-native_1.0.5.003.bb b/packages/edb/edb-native_1.0.5.003.bb
index e69de29bb2..b570683020 100644
--- a/packages/edb/edb-native_1.0.5.003.bb
+++ b/packages/edb/edb-native_1.0.5.003.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "EDB is a database convenience library wrapped around the \
+Berkeley DB 2.7.7 by Sleepycat Software."
+LICENSE = "BSD"
+HOMEPAGE = "http://www.enlightenment.org"
+MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
+SECTION = "e/libs"
+PRIORITY = "optional"
+include edb_${PV}.bb
+inherit native
+DEPENDS = "zlib-native"
+
+do_stage () {
+  install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR}
+  oe_libinstall -C src libedb ${STAGING_LIBDIR}/
+  install -m 0644 ${S}/src/Edb.h ${STAGING_INCDIR}/
+}
diff --git a/packages/edb/edb_1.0.5.003.bb b/packages/edb/edb_1.0.5.003.bb
index e69de29bb2..d6204b289f 100644
--- a/packages/edb/edb_1.0.5.003.bb
+++ b/packages/edb/edb_1.0.5.003.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "EDB is a database convenience library wrapped around the \
+Berkeley DB 2.7.7 by Sleepycat Software."
+HOMEPAGE = "http://www.enlightenment.org"
+SECTION = "e/libs"
+PRIORITY = "optional"
+DEPENDS = "zlib"
+LICENSE = "BSD"
+PR = "r0"
+
+do_prepsources () {
+  make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+  
+SRC_URI = "http://enlightenment.freedesktop.org/files/edb-${PV}.tar.gz"
+S = "${WORKDIR}/edb-${PV}"
+  
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--disable-gtk \
+		--disable-ncurses"
+
+do_stage () {
+  oe_libinstall -C src libedb ${STAGING_LIBDIR}/
+  install -m 0644 ${S}/src/Edb.h ${STAGING_INCDIR}/
+}
+
+FILES_${PN} = "${libdir}/libedb*.so*"
+FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
+
diff --git a/packages/imlib2/imlib2-1.2.0/binconfig.patch b/packages/edje/edje-native_0.5.0.007.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/imlib2/imlib2-1.2.0/binconfig.patch
+++ b/packages/edje/edje-native_0.5.0.007.bb
diff --git a/packages/edje/edje-native_cvs.bb b/packages/edje/edje-native_cvs.bb
deleted file mode 100644
index 848c8dbe21..0000000000
--- a/packages/edje/edje-native_cvs.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-include edje_${PV}.bb
-inherit native
-DEPENDS = "freetype-native evas-native ecore-native embryo-native eet-native edb-native imlib2-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje"
-
-EXTRA_OECONF = "--enable-fb-only"
-
-do_stage() {
-	for i in edje edje_ls edje_cc
-	do
-		install -m 0755 src/bin/$i ${STAGING_BINDIR}
-	done
-}
diff --git a/packages/imlib2/imlib2-1.2.0/x.patch b/packages/edje/edje_0.5.0.007.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/imlib2/imlib2-1.2.0/x.patch
+++ b/packages/edje/edje_0.5.0.007.bb
diff --git a/packages/edje/edje_cvs.bb b/packages/edje/edje_cvs.bb
deleted file mode 100644
index a426df9a79..0000000000
--- a/packages/edje/edje_cvs.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "edje is a complex graphical design & layout library."
-DEPENDS = "freetype evas ecore embryo eet edb edje-native"
-LICENSE = "MIT"
-SECTION = "e/libs"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-PV = "${CVSDATE}"
-PR = "r4"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/edje"
-S = "${WORKDIR}/edje"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--disable-edje-cc \
-		--enable-fb-only"
-
-LEAD_SONAME = "libedje.so"
-
-do_stage () {
-	oe_libinstall -C src/lib libedje ${STAGING_LIBDIR}/
-	oe_libinstall -C src/lib libedje_edit ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Edje.h ${STAGING_INCDIR}/
-}
-
-PACKAGES += "edje-examples"
-
-FILES_${PN} = "${libdir}/libedje*.so*"
-FILES_${PN}-dev += "${bindir}/edje-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/edje ${bindir}/edje_ls ${datadir}"
-
diff --git a/packages/eet/eet-native_0.9.10.007.bb b/packages/eet/eet-native_0.9.10.007.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/eet/eet-native_0.9.10.007.bb
diff --git a/packages/eet/eet-native_0.9.9.bb b/packages/eet/eet-native_0.9.9.bb
deleted file mode 100644
index a44287eb55..0000000000
--- a/packages/eet/eet-native_0.9.9.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "EET is a tiny library designed to write an \
-arbitary set of chunks of data to a file and optionally compress \
-each chunk (very much like a zip file) and allow fast \
-random-access reading of the file later on."
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/libs"
-PRIORITY = "optional"
-include eet_0.9.9.bb
-inherit native
-DEPENDS = "zlib-native jpeg-native"
-LICENSE = "BSD"
-
-do_stage () {
-  install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR}
-  oe_libinstall -C src/lib libeet ${STAGING_LIBDIR}/
-  install -m 0644 ${S}/src/lib/Eet.h ${STAGING_INCDIR}/
-}
diff --git a/packages/eet/eet_0.9.10.007.bb b/packages/eet/eet_0.9.10.007.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/eet/eet_0.9.10.007.bb
diff --git a/packages/eet/eet_0.9.9.bb b/packages/eet/eet_0.9.9.bb
deleted file mode 100644
index 908235879d..0000000000
--- a/packages/eet/eet_0.9.9.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "EET is a tiny library designed to write an \
-arbitary set of chunks of data to a file and optionally compress \
-each chunk (very much like a zip file) and allow fast \
-random-access reading of the file later on."
-HOMEPAGE = "http://www.enlightenment.org"
-MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "zlib jpeg"
-PV = "0.9.9"
-PR = "1"
-LICENSE = "BSD"
-
-do_prepsources () {
-  make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-
-#SRC_URI = "file://./"
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/eet"
-S = "${WORKDIR}/eet"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-  oe_libinstall -C src/lib libeet ${STAGING_LIBDIR}/
-  install -m 0644 ${S}/src/lib/Eet.h ${STAGING_INCDIR}/
-}
-
-FILES_${PN} = "${libdir}/libeet*.so*"
-FILES_${PN}-dev += "${bindir} ${libdir}/pkgconfig"
diff --git a/packages/embryo/embryo-native_0.9.1.007.bb b/packages/embryo/embryo-native_0.9.1.007.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/embryo/embryo-native_0.9.1.007.bb
diff --git a/packages/embryo/embryo_0.9.1.007.bb b/packages/embryo/embryo_0.9.1.007.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/embryo/embryo_0.9.1.007.bb
diff --git a/packages/etox/etox_0.9.0.003.bb b/packages/etox/etox_0.9.0.003.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/etox/etox_0.9.0.003.bb
diff --git a/packages/etox/etox_cvs.bb b/packages/etox/etox_cvs.bb
deleted file mode 100644
index 409ae91728..0000000000
--- a/packages/etox/etox_cvs.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \
-Etox helps you when it comes to displaying, moving, resizing, layering, \
-clipping, aligning and coloring fonts in different styles, and more."
-SECTION = "e/libs"
-DEPENDS = "edb evas ecore"
-PV = "${CVSDATE}"
-PR = "r3"
-LICENSE = "MIT"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/etox"
-S = "${WORKDIR}/etox"
-
-inherit autotools pkgconfig binconfig
-
-do_stage () {
-	oe_libinstall -C src libetox ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/Etox.h ${STAGING_INCDIR}/
-}
-
-PACKAGES += "etox-examples"
-
-FILES_${PN} = "${libdir}/libetox*.so*"
-FILES_${PN}-dev += "${bindir}/etox-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/etox* ${datadir}"
diff --git a/packages/evas/evas-native_0.9.9.007.bb b/packages/evas/evas-native_0.9.9.007.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/evas/evas-native_0.9.9.007.bb
diff --git a/packages/evas/evas-native_cvs.bb b/packages/evas/evas-native_cvs.bb
deleted file mode 100644
index 8ccc3bf2ab..0000000000
--- a/packages/evas/evas-native_cvs.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "The Enlightenment Canvas Library"
-include evas_${PV}.bb
-inherit native
-DEPENDS = "freetype-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
-
-do_stage () {
-        for i in ${headers}; do
-                install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-        done
-        oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
-}
-
-#FIXME: Conflicts with zlib-devel on the build machine. Remove it and it builds.
diff --git a/packages/evas/evas_0.9.9.007.bb b/packages/evas/evas_0.9.9.007.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/evas/evas_0.9.9.007.bb
diff --git a/packages/evas/evas_cvs.bb b/packages/evas/evas_cvs.bb
deleted file mode 100644
index 401969b61c..0000000000
--- a/packages/evas/evas_cvs.bb
+++ /dev/null
@@ -1,86 +0,0 @@
-DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
-anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
-down to using normal X11 primitives such as pixmaps, lines and rectangles if \
-your CPU or graphics hardware are too slow."
-LICENSE = "MIT"
-HOMEPAGE = "http://www.enlightenment.org"
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "libpng jpeg edb eet freetype"
-PV = "${CVSDATE}"
-PR = "r4"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/evas \
-           file://pkg.m4"
-S = "${WORKDIR}/evas"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--enable-fb			\
-		--disable-directfb		\
-		--disable-buffer		\
-		--disable-software-qtopia	\
-		--disable-software-x11		\
-		--disable-gl-x11		\
-		--enable-image-loader-eet	\
-		--enable-image-loader-edb	\
-		--enable-image-loader-png	\
-		--enable-image-loader-jpeg	\
-		--enable-small-dither-mask	\
-		--enable-cpu-c			\
-		--enable-font-loader-eet	\
-		--enable-scale-sample		\
-		--enable-scale-smooth		\
-		--enable-convert-yuv		\
-		--disable-convert-8-rgb-332	\
-		--disable-convert-8-rgb-666	\
-		--disable-convert-8-rgb-232	\
-		--disable-convert-8-rgb-222	\
-		--disable-convert-8-rgb-221	\
-		--disable-convert-8-rgb-121	\
-		--disable-convert-8-rgb-111	\
-		--enable-convert-16-rgb-565	\
-		--disable-convert-16-rgb-555	\
-		--disable-convert-16-rgb-444	\
-		--disable-convert-16-rgb-ipq	\
-		--enable-convert-16-rgb-rot-0	\
-		--disable-convert-16-rgb-rot-90	\
-		--enable-convert-16-rgb-rot-270	\
-		--disable-convert-24-rgb-888	\
-		--disable-convert-24-bgr-888	\
-		--disable-convert-32-rgb-8888	\
-		--disable-convert-32-rgbx-8888	\
-		--disable-convert-32-bgr-8888	\
-		--disable-convert-32-bgrx-8888	\
-		--disable-convert-32-rgb-rot-0	\
-		--disable-convert-32-rgb-rot-90	\
-		--disable-convert-32-rgb-rot-270"
-
-do_configure () {
-	install -m 0644 ${WORKDIR}/pkg.m4 acinclude.m4
-	autotools_do_configure
-}
-
-headers = "Evas_Engine_Buffer.h \
-           Evas_Engine_FB.h \
-           Evas.h"
-
-# Don't install these headers or subsequent libraries will include support for it:
-# Evas_Engine_DirectFB.h \
-# Evas_Engine_GL_X11.h \
-# Evas_Engine_Software_Win32_GDI.h \
-# Evas_Engine_Software_X11.h
-# Evas_Engine_Software_Qtopia.h \
-
-do_stage () {
-	for i in ${headers}; do
-		install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/
-	done
-	oe_libinstall -C src/lib libevas ${STAGING_LIBDIR}/
-}
-
-PACKAGES += "evas-examples"
-
-FILES_${PN} = "${libdir}/libevas*.so*"
-FILES_${PN}-dev += "${bindir}/evas-config ${libdir}/pkgconfig"
-FILES_${PN}-examples = "${bindir}/evas_fb_test ${datadir}"
diff --git a/packages/ewl/ewl_0.0.4.003.bb b/packages/ewl/ewl_0.0.4.003.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ewl/ewl_0.0.4.003.bb
diff --git a/packages/imlib2/files/binconfig.patch b/packages/imlib2/files/binconfig.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imlib2/files/binconfig.patch
diff --git a/packages/imlib2/files/x.patch b/packages/imlib2/files/x.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imlib2/files/x.patch
diff --git a/packages/imlib2/imlib2-1.1.0/autofoo.patch b/packages/imlib2/imlib2-1.1.0/autofoo.patch
index e69de29bb2..1980d7b2c9 100644
--- a/packages/imlib2/imlib2-1.1.0/autofoo.patch
+++ b/packages/imlib2/imlib2-1.1.0/autofoo.patch
@@ -0,0 +1,15 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- imlib2-1.1.0/libltdl/configure.in~autofoo
++++ imlib2-1.1.0/libltdl/configure.in
+@@ -1,6 +1,7 @@
+ dnl Process this file with autoconf to create configure.
+ 
+ AC_INIT(ltdl.c)
++AC_CONFIG_AUX_DIR([..])
+ 
+ dnl We shouldn't be using these internal macros of autoconf,
+ dnl but CONFIG_AUX_DIR($with_auxdir) breaks automake.
diff --git a/packages/imlib2/imlib2-1.1.0/cross.patch b/packages/imlib2/imlib2-1.1.0/cross.patch
index e69de29bb2..bb4ed1784d 100644
--- a/packages/imlib2/imlib2-1.1.0/cross.patch
+++ b/packages/imlib2/imlib2-1.1.0/cross.patch
@@ -0,0 +1,74 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- imlib2-1.1.0/demo/Makefile.am~cross
++++ imlib2-1.1.0/demo/Makefile.am
+@@ -8,8 +8,7 @@
+ LDFLAGS              = -L/usr/X11R6/lib
+ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+-                       -I/usr/X11R6/include $(X_CFLAGS) \
+-                       -I$(prefix)/include -I$(includedir)
++                       $(X_CFLAGS)
+ 
+ bin_PROGRAMS         = imlib2_view imconvert
+ imconvert_SOURCES    = imconvert.c
+--- imlib2-1.1.0/filters/Makefile.am~cross
++++ imlib2-1.1.0/filters/Makefile.am
+@@ -8,8 +8,7 @@
+ LDFLAGS		     = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib
+ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+-                       -I/usr/X11R6/include $(X_CFLAGS) \
+-                       -I$(prefix)/include -I$(includedir)
++                       $(X_CFLAGS)
+ 
+ pkgdir		     = $(libdir)/loaders/filter
+ pkg_LTLIBRARIES	     = testfilter.la bump_map.la colormod.la
+--- imlib2-1.1.0/loaders/Makefile.am~cross
++++ imlib2-1.1.0/loaders/Makefile.am
+@@ -8,8 +8,7 @@
+ LDFLAGS		     = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib 
+ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+-                       -I/usr/X11R6/include $(X_CFLAGS) \
+-                       -I$(prefix)/include -I$(includedir)
++                       $(X_CFLAGS)
+ 
+ pkgdir		     = $(libdir)/loaders/image
+ 
+--- imlib2-1.1.0/src/Makefile.am~cross
++++ imlib2-1.1.0/src/Makefile.am
+@@ -8,8 +8,7 @@
+ LDFLAGS		     = -L/usr/X11R6/lib
+ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+-                       $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) \
+-                       -I$(prefix)/include -I$(includedir)
++                       $(freetype_cflags) $(X_CFLAGS)
+ MMX_SRCS             = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S \
+ 		       asm_blend_cmod.S
+ MMX_OBJS             = $(MMX_SRCS:.S=.lo)
+@@ -42,7 +41,7 @@
+ libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS)
+ endif
+ 
+-SYS_LOADERS_PATH = @pkglibdir@
++SYS_LOADERS_PATH = @loadersdir@
+ image.lo: loaderpath.h
+ loaderpath.h: Makefile
+ 	@echo "#define SYS_LOADERS_PATH \"${SYS_LOADERS_PATH}\"" > $@
+--- imlib2-1.1.0/test/Makefile.am~cross
++++ imlib2-1.1.0/test/Makefile.am
+@@ -8,8 +8,7 @@
+ LDFLAGS              = -L/usr/X11R6/lib
+ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+ 		       -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+-                       -I/usr/X11R6/include $(X_CFLAGS) \
+-		       -I$(prefix)/include -I$(includedir)
++                       $(X_CFLAGS)
+ 
+ bin_PROGRAMS         = imlib2 bumpmaptest imlib2_test polytest color_spaces
+ imlib2_SOURCES       = main.c
diff --git a/packages/imlib2/imlib2-1.1.0/gcc34.patch b/packages/imlib2/imlib2-1.1.0/gcc34.patch
index e69de29bb2..e96bcae759 100644
--- a/packages/imlib2/imlib2-1.1.0/gcc34.patch
+++ b/packages/imlib2/imlib2-1.1.0/gcc34.patch
@@ -0,0 +1,24 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- imlib2-1.1.0/src/rgbadraw.c~gcc34
++++ imlib2-1.1.0/src/rgbadraw.c
+@@ -2357,14 +2357,14 @@
+                        /* last span on line and still not < ss->x */
+                        if (ps)
+                           ps->next = s;
+-                     nospans:
++                     nospans:;
+                     }
+                }
+              if (i == y2)
+                 goto nolines;
+              i += step;
+           }
+-      nolines:
++      nolines:;
+      }
+    for (i = 0; i < h; i++)
+      {
diff --git a/packages/imlib2/imlib2-1.1.0/pkglibdir.patch b/packages/imlib2/imlib2-1.1.0/pkglibdir.patch
index e69de29bb2..e19b75f9d9 100644
--- a/packages/imlib2/imlib2-1.1.0/pkglibdir.patch
+++ b/packages/imlib2/imlib2-1.1.0/pkglibdir.patch
@@ -0,0 +1,40 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- imlib2-1.1.0/configure.ac~pkglibdir.patch
++++ imlib2-1.1.0/configure.ac
+@@ -59,8 +59,8 @@
+ fi
+ AM_CONDITIONAL(HAVE_MMX, test x$mmx = xyes)
+ 
+-pkglibdir='${libdir}'/loaders
+-AC_SUBST(pkglibdir)
++loadersdir='${pkglibdir}'/loaders
++AC_SUBST(loadersdir)
+ 
+ AC_C_BIGENDIAN	      
+ 
+--- imlib2-1.1.0/loaders/Makefile.am~pkglibdir.patch
++++ imlib2-1.1.0/loaders/Makefile.am
+@@ -10,7 +10,7 @@
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+                        $(X_CFLAGS)
+ 
+-pkgdir		     = $(libdir)/loaders/image
++pkgdir		     = $(loadersdir)/image
+ 
+ if JPEG_LOADER
+ JPEG_L              = jpeg.la
+--- imlib2-1.1.0/filters/Makefile.am~pkglibdir.patch
++++ imlib2-1.1.0/filters/Makefile.am
+@@ -10,7 +10,7 @@
+                        -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \
+                        $(X_CFLAGS)
+ 
+-pkgdir		     = $(libdir)/loaders/filter
++pkgdir		     = $(loadersdir)/filter
+ pkg_LTLIBRARIES	     = testfilter.la bump_map.la colormod.la
+ 
+ testfilter_la_SOURCES  = filter_test.c
diff --git a/packages/imlib2/imlib2-fbonly_1.1.0.bb b/packages/imlib2/imlib2-fbonly_1.1.0.bb
deleted file mode 100644
index 3e0d53fa66..0000000000
--- a/packages/imlib2/imlib2-fbonly_1.1.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTION = "libs"
-LICENSE = "BSD"
-include imlib2_${PV}.bb
-inherit native
-DEPENDS = "freetype"
-
-EXTRA_OECONF = "--without-x \
-		--disable-mmx"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/imlib2-${PV}"
diff --git a/packages/imlib2/imlib2-fbonly_1.2.0.007.bb b/packages/imlib2/imlib2-fbonly_1.2.0.007.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imlib2/imlib2-fbonly_1.2.0.007.bb
diff --git a/packages/imlib2/imlib2-native_1.1.0.bb b/packages/imlib2/imlib2-native_1.1.0.bb
deleted file mode 100644
index 4de6b1a389..0000000000
--- a/packages/imlib2/imlib2-native_1.1.0.bb
+++ /dev/null
@@ -1,15 +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>"
-LICENSE = "BSD"
-SECTION = "e/libs"
-PRIORITY = "optional"
-include imlib2.bb
-inherit native
-DEPENDS = "freetype-native libpng-native jpeg-native"
-
-do_stage () {
-  oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
-  install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
-}
diff --git a/packages/imlib2/imlib2-native_1.2.0.007.bb b/packages/imlib2/imlib2-native_1.2.0.007.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imlib2/imlib2-native_1.2.0.007.bb
diff --git a/packages/imlib2/imlib2.inc b/packages/imlib2/imlib2.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/imlib2/imlib2.inc
diff --git a/packages/imlib2/imlib2_1.2.0.bb b/packages/imlib2/imlib2_1.2.0.bb
deleted file mode 100644
index eaa7477a19..0000000000
--- a/packages/imlib2/imlib2_1.2.0.bb
+++ /dev/null
@@ -1,35 +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>"
-LICENSE = BSD
-SECTION = "e/libs"
-PRIORITY = "optional"
-DEPENDS = "freetype libpng jpeg x11 xext"
-PR = "r4"
-
-do_prepsources () {
-	make clean distclean || true
-}
-addtask prepsources after do_fetch before do_unpack
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/enlightenment/imlib2-1.2.0.tar.gz \
-	   file://binconfig.patch;patch=1 \
-	   file://x.patch;patch=1"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--disable-mmx \
-		--with-x \
-		--x-includes=${STAGING_INCDIR} \
-		--x-libraries=${STAGING_LIBDIR}"
-
-do_stage () {
-	oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
-}
-
-PACKAGES += "${PN}-bin"
-FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2"
-FILES_${PN}-dev += "${bindir}/imlib2-config"
-FILES_${PN}-bin = "${bindir}"