merge of '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'

     and '6ab53da82d157971966f5a17d0c29d54df22cac9'

12 files changed, 109 insertions, 48 deletions

diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc
index 9e1bc18f5c..86c87214cf 100644
--- a/packages/efl1/ecore.inc
+++ b/packages/efl1/ecore.inc
@@ -5,14 +5,13 @@ LICENSE = "MIT"
 DEPENDS = "curl directfb eet evas tslib"
 # optional
 # DEPENDS += "openssl virtual/libiconv"
-PV = "0.9.9+cvs${SRCDATE}"
+PV = "0.9.9.041+cvs${SRCDATE}"
 
 inherit efl_library
 
-SRC_URI += "\
+SRC_URI += "file://configure.patch;patch=1 \
            file://fix-tslib-configure.patch;patch=1 \
-           file://fix-directfb-include.patch;patch=1 \
-"
+           file://fix-directfb-include.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
 
diff --git a/packages/efl1/ecore/configure.patch b/packages/efl1/ecore/configure.patch
index 23d8193b44..9939bd9d34 100644
--- a/packages/efl1/ecore/configure.patch
+++ b/packages/efl1/ecore/configure.patch
@@ -1,5 +1,7 @@
---- ecore-0.9.9.036/configure.in.bak	2006-11-13 14:01:10.000000000 -0800
-+++ ecore-0.9.9.036/configure.in	2006-11-13 14:02:15.000000000 -0800
+Index: ecore/configure.in
+===================================================================
+--- ecore.orig/configure.in	2007-08-20 17:21:13.000000000 +0000
++++ ecore/configure.in	2007-08-20 17:23:31.000000000 +0000
 @@ -16,7 +16,6 @@
  AC_CHECK_SIZEOF(long, 4)
  AM_ENABLE_SHARED
@@ -8,14 +10,14 @@
  							
  if test "x${bindir}" = 'xNONE'; then
    if test "x${prefix}" = "xNONE"; then
-@@ -200,9 +199,7 @@
-       AM_CONDITIONAL(BUILD_ECORE_X, true)
-       AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module])
-       have_ecore_x="yes"
--      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"
-       ecore_x_libs="-lecore_x $x_libs";
-     ],[
-       AM_CONDITIONAL(BUILD_ECORE_X, false)
+@@ -238,9 +237,7 @@
+ AC_CHECK_HEADER(X11/X.h,
+   [
+    have_x="yes"
+-   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="${x_libs} -lX11 -lXext"
+   ]
+ )
+ 
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
index 79336b74b5..0a5521f929 100644
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Edje is a complex graphical design & layout library."
 # can also install vim data files
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT"
-PV = "0.5.0+cvs${SRCDATE}"
+PV = "0.5.0.41+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb
index 2c9c641b6c..cd12daf245 100644
--- a/packages/efl1/eet_cvs.bb
+++ b/packages/efl1/eet_cvs.bb
@@ -4,7 +4,7 @@ each chunk (very much like a zip file) and allow fast \
 random-access reading of the file later on."
 DEPENDS = "zlib jpeg"
 LICENSE = "BSD"
-PV = "0.9.10+cvs${SRCDATE}"
+PV = "0.9.10.041+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb
index dba9a3c9fb..3f903d3484 100644
--- a/packages/efl1/efreet_cvs.bb
+++ b/packages/efl1/efreet_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "An implementation of freedesktop.org specs for the \
 Enlightenment Foundation Libraries"
 DEPENDS = "ecore"
 LICENSE = "BSD"
-PV = "0.0.3+cvs${SRCDATE}"
+PV = "0.0.3.003+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb
index 45b75f503d..dcba8557a8 100644
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -4,7 +4,7 @@ CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \
 Embryo allows scripting capabilities in places that otherwise wouldn't support \
 basic programming structures such as in Edje EDCs."
 LICENSE = "MIT"
-PV = "0.9.1+cvs${SRCDATE}"
+PV = "0.9.1.041+cvs${SRCDATE}"
 PR = "r0"
 
 inherit efl_library
diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb
index 2681b941d2..8426b75a17 100644
--- a/packages/efl1/epdf_cvs.bb
+++ b/packages/efl1/epdf_cvs.bb
@@ -3,6 +3,8 @@ LICENSE = "BSD"
 DEPENDS = "poppler0.6 evas ecore etk ewl"
 PV = "0.1.0+cvs${SRCDATE}"
 
+PR = "r1"
+
 inherit efl_library
 
 SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 6fb6d7f60e..840f2929c5 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -5,13 +5,12 @@ your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
 # can also depend on valgrind (?)
 DEPENDS = "libsdl-x11 directfb eet freetype jpeg virtual/libx11 libxext"
-PV = "0.9.9+cvs${SRCDATE}"
+PV = "0.9.9.041+cvs${SRCDATE}"
 
 inherit efl_library
 
-export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
-
 SRC_URI += "file://fix-configure.patch;patch=1"
+
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
 EXTRA_OECONF = "<override me>"
diff --git a/packages/efl1/evas/fix-configure.patch b/packages/efl1/evas/fix-configure.patch
index abf9b94bdf..1a5bf78e46 100644
--- a/packages/efl1/evas/fix-configure.patch
+++ b/packages/efl1/evas/fix-configure.patch
@@ -1,36 +1,71 @@
-diff -Nur evas-0.9.9.037~/configure.in evas-0.9.9.037/configure.in
---- evas-0.9.9.037~/configure.in	2007-01-14 20:09:57.000000000 -0800
-+++ evas-0.9.9.037/configure.in	2007-01-14 20:11:09.000000000 -0800
-@@ -161,9 +161,7 @@
+Index: evas/configure.in
+===================================================================
+--- evas.orig/configure.in	2007-08-20 16:44:22.000000000 +0000
++++ evas/configure.in	2007-08-20 16:49:08.000000000 +0000
+@@ -260,9 +260,7 @@
    AC_CHECK_HEADER(X11/X.h,
      [
        AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
 -      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"
++      x_libs="${x_libs} -lX11 -lXext"
      ],
      [
        AC_MSG_RESULT(disabling software X11 engine)
-@@ -407,10 +405,10 @@
- 	      AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
- 	      AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true)
- 	      AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
--	      x_dir=${x_dir:-/usr/X11R6};
-+	      x_dir=${x_dir:-};
- 	      x_cflags=${x_cflags:--I$x_dir/include}
- 	      x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
--	      gl_cflags="-I/usr/include"
-+	      gl_cflags=""
- 	      gl_libs="-lGL -lGLU -lpthread"
- 	      gl_dir=""
-             ], [
-@@ -471,7 +469,7 @@
+@@ -303,9 +301,7 @@
+   AC_CHECK_HEADER(X11/X.h,
+     [
+       AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_X11, 1, [Software 16bit X11 Rendering Backend])
+-      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="${x_libs} -lX11 -lXext"
+     ],
+     [
+       AC_MSG_RESULT(disabling software 16bit X11 engine)
+@@ -599,10 +595,7 @@
+       [
+         AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
+         AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
+-        x_dir=${x_dir:-/usr/X11R6};
+-        x_cflags=${x_cflags:--I$x_dir/include}
+-        x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
+-        gl_cflags="-I/usr/include"
++        x_libs="${x_libs} -lX11 -lXext"
+         gl_libs="-lGL -lGLU -lpthread"
+         gl_dir=""
+       ],
+@@ -694,9 +687,7 @@
        AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
        AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
        AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
 -      x_dir="/usr/X11R6";
-+      x_dir="";
-       x_cflags="-I"$x_dir"/include"
-       x_libs="-L"$x_dir"/lib -lX11 -lXext"
+-      x_cflags="-I"$x_dir"/include"
+-      x_libs="-L"$x_dir"/lib -lX11 -lXext"
++      x_libs="${x_libs} -lX11 -lXext"
      ], [
+       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, false)
+       AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, false)
+@@ -738,9 +729,7 @@
+       AC_CHECK_HEADER(X11/extensions/Xrender.h,
+         [
+           AC_DEFINE(BUILD_ENGINE_XRENDER_X11, 1, [XRender X11 Rendering Backend])
+-          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 -lXrender"
++          x_libs="${x_libs} -lX11 -lXext -lXrender"
+ 	],
+ 	[
+           AC_MSG_RESULT(disabling xrender X11 engine)
+@@ -826,9 +815,7 @@
+     [
+       PKG_CHECK_MODULES(GLITZ, glitz glitz-glx,
+ 	[
+-          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="${x_libs} -lX11 -lXext"
+           AC_DEFINE(BUILD_ENGINE_GLITZ_X11, 1, [Glitz X11 Rendering Backend])
+         ],
+         [
diff --git a/packages/efl1/imlib2/.mtn2git_empty b/packages/efl1/imlib2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/efl1/imlib2/.mtn2git_empty
diff --git a/packages/efl1/imlib2/remove-local-includes.patch b/packages/efl1/imlib2/remove-local-includes.patch
new file mode 100644
index 0000000000..bc85b10424
--- /dev/null
+++ b/packages/efl1/imlib2/remove-local-includes.patch
@@ -0,0 +1,15 @@
+Index: imlib2/configure.in
+===================================================================
+--- imlib2.orig/configure.in	2007-09-01 14:34:26.000000000 +0000
++++ imlib2/configure.in	2007-09-01 14:35:07.000000000 +0000
+@@ -188,9 +188,7 @@
+ 
+ if test "x$have_x" = "xyes"; then
+   AC_PATH_XTRA
+-  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"
+   AM_CONDITIONAL(BUILD_X11, true)
+   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
diff --git a/packages/efl1/imlib2_1.4.0.002.bb b/packages/efl1/imlib2_1.4.0.002.bb
index a50eca9623..baee4b62b0 100644
--- a/packages/efl1/imlib2_1.4.0.002.bb
+++ b/packages/efl1/imlib2_1.4.0.002.bb
@@ -1,11 +1,20 @@
 DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation."
 LICENSE = "BSD"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
-DEPENDS = "freetype libpng jpeg"
-PR = "r0"
+DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
+PR = "r2"
 
 inherit efl_library
 
+SRC_URI += "file://remove-local-includes.patch;patch=1"
+
+EXTRA_OECONF = "--with-x"
+
+# TODO: Use more fine granular version
+#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:"
+OE_LT_RPATH_ALLOW = "any"
+OE_LT_RPATH_ALLOW[export]="1"
+
 PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
 FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
 FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/"