more EFL fixes + add the enlightenment library from the E window manager as dedicated library

6 files changed, 88 insertions, 5 deletions

diff --git a/packages/efl/e/.mtn2git_empty b/packages/efl/e/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/efl/e/.mtn2git_empty
diff --git a/packages/efl/e/fix-configure.patch b/packages/efl/e/fix-configure.patch
new file mode 100644
index 0000000000..9b328de16c
--- /dev/null
+++ b/packages/efl/e/fix-configure.patch
@@ -0,0 +1,48 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- e/configure.in~fix-configure.patch
++++ e/configure.in
+@@ -114,9 +114,7 @@
+ AC_PATH_XTRA
+ AC_CHECK_HEADER(X11/X.h,
+   [
+-    x_dir=${x_dir:-/usr/X11R6}
+-    x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-    x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++    x_libs="-lX11 -lXext";
+   ],[
+     AC_MSG_ERROR([Cannot find X headers and libraries.])
+   ]
+--- e/src/bin/Makefile.am~fix-configure.patch
++++ e/src/bin/Makefile.am
+@@ -1,6 +1,5 @@
+ MAINTAINERCLEANFILES = Makefile.in
+-INCLUDES = -I$(includedir) \
+-	   -I$(top_srcdir) \
++INCLUDES = -I$(top_srcdir) \
+ 	   -I$(top_srcdir)/src/bin \
+ 	   -I$(top_srcdir)/src/lib \
+ 	   @e_cflags@ \
+--- e/src/lib/Makefile.am~fix-configure.patch
++++ e/src/lib/Makefile.am
+@@ -1,6 +1,5 @@
+ MAINTAINERCLEANFILES	= Makefile.in
+-INCLUDES		= -I$(includedir) \
+-			  -I$(top_srcdir)/src/bin \
++INCLUDES		= -I$(top_srcdir)/src/bin \
+ 			  @ecore_cflags@ \
+ 			  @evas_cflags@
+ 
+--- e/src/preload/Makefile.am~fix-configure.patch
++++ e/src/preload/Makefile.am
+@@ -2,7 +2,6 @@
+ 
+ INCLUDES               = -I. \
+                          -I$(top_srcdir) \
+-			 -I$(includedir) \
+                          -I$(top_srcdir)src/preload \
+                          @x_cflags@
+ pkgdir                 = $(libdir)/enlightenment/preload
diff --git a/packages/efl/e_20050810.bb b/packages/efl/e_20050810.bb
new file mode 100644
index 0000000000..cb118c30a0
--- /dev/null
+++ b/packages/efl/e_20050810.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Enlightenment Window Mananger Library"
+DEPENDS = "freetype eet evas-x11 ecore-x11 embryo imlib2-x11 edje-native"
+LICENSE = "MIT"
+CVSDATE = "${PV}"
+PR = "r0"
+
+inherit efl
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \
+           file://fix-configure.patch;patch=1"
+S = "${WORKDIR}/e"
+
+PROFILE = "LORES_PDA"
+PROFILE_c7x0 = "HIRES_PDA"
+PROFILE_tosa = "HIRES_PDA"
+PROFILE_spitz = "HIRES_PDA"
+PROFILE_akita = "HIRES_PDA"
+
+EXTRA_OECONF = "--with-profile=${PROFILE} \
+                --with-edje-cc=${STAGING_BINDIR}/edje_cc \
+                --x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR}"
+
+do_compile() {
+	oe_runmake -C src/lib
+}
+
+headers = "E_Lib.h"
+
+do_install() {
+	oe_runmake -C src/lib install DESTDIR=${D}
+}
diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index 8b3ae5e5b7..38c64e4615 100644
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -21,7 +21,7 @@ parts = "<override me>"
 do_stage_append() {
 	for p in ${parts}; do
 		dir=`echo $p|tr A-Z a-z`
-		install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/
+		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}/
diff --git a/packages/efl/esmart_0.9.0.004.bb b/packages/efl/esmart_0.9.0.004.bb
index 9fe0ac9e35..90b8aca6f9 100644
--- a/packages/efl/esmart_0.9.0.004.bb
+++ b/packages/efl/esmart_0.9.0.004.bb
@@ -28,7 +28,7 @@ mylibraries = "esmart_container \
 
 do_stage_append() {
 	install -d ${STAGING_INCDIR}/Esmart/
-	for i in ${headers}; do
+	for i in ${myheaders}; do
 		install -m 0644 ${S}/src/lib/$i ${STAGING_INCDIR}/Esmart/
 	done
 	oe_libinstall -C src/lib libsmart ${STAGING_LIBDIR}/
diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb
index e9b1516a8c..36d8c5c860 100644
--- a/packages/efl/ewl_0.0.4.004.bb
+++ b/packages/efl/ewl_0.0.4.004.bb
@@ -8,7 +8,10 @@ inherit efl
 
 SRC_URI += "file://ewl-configure.patch;patch=1"
 
-do_configure() {
-	gnu-configize
-	oe_runconf
+do_stage_append() {
+	for i in src/lib/ewl_*.h
+	do
+		install -m 0644 $i ${STAGING_INCDIR}
+	done
 }
+