efl : update efl and related packages to the current 1.12.2

Signed-off-by: Xavier Roche <xavrock.os@gmail.com>

12 files changed, 273 insertions, 75 deletions

diff --git a/meta-tizen-common-base/recipes-image/images/tizen-core-image-minimal.bb b/meta-tizen-common-base/recipes-image/images/tizen-core-image-minimal.bb
index 86f191ec..5ae75288 100644
--- a/meta-tizen-common-base/recipes-image/images/tizen-core-image-minimal.bb
+++ b/meta-tizen-common-base/recipes-image/images/tizen-core-image-minimal.bb
@@ -37,6 +37,7 @@ CORE_IMAGE_BASE_INSTALL += "libgles2-mesa"
 CORE_IMAGE_BASE_INSTALL += "gum-utils"
 CORE_IMAGE_BASE_INSTALL += "meta-common"
 CORE_IMAGE_BASE_INSTALL += "pam"
+CORE_IMAGE_BASE_INSTALL += "user-session-units"
 CORE_IMAGE_BASE_INSTALL += "default-ac-domains"
 CORE_IMAGE_BASE_INSTALL += "rpm-security-plugin"
 CORE_IMAGE_BASE_INSTALL += "config-image"
diff --git a/meta-tizen-common-demo/recipes-image/packagegroups/packagegroups-tizen-crosswalk.bb b/meta-tizen-common-demo/recipes-image/packagegroups/packagegroups-tizen-crosswalk.bb
index cbfe78da..45ea8a39 100644
--- a/meta-tizen-common-demo/recipes-image/packagegroups/packagegroups-tizen-crosswalk.bb
+++ b/meta-tizen-common-demo/recipes-image/packagegroups/packagegroups-tizen-crosswalk.bb
@@ -10,5 +10,4 @@ RDEPENDS_packagegroup-tizen-crosswalk = "\
                                         crosswalk \
                                         tizen-extensions-crosswalk \
                                         wrt-widgets \
-                                        user-session-units \
                                         "
diff --git a/meta-tizen-common-share/recipes-efl/edbus/edbus.inc b/meta-tizen-common-share/recipes-efl/edbus/edbus.inc
index 8a7282b3..cf7eb7ee 100644
--- a/meta-tizen-common-share/recipes-efl/edbus/edbus.inc
+++ b/meta-tizen-common-share/recipes-efl/edbus/edbus.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "EFL Wrapper for DBus"
 HOMEPAGE = "http://www.enlightenment.org/"
 SECTION = "Graphics & UI Framework/EFL"
 LICENSE = "BSD-2-Clause"
-PV = "1.7.8"
+PV = "1.7.9"
 
 SRC_URI = ""
 
@@ -36,7 +36,7 @@ DEPENDS += "eina"
 do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
- #setup -q -n e_dbus-1.7.8
+ #setup -q -n e_dbus-1.7.9
  cp ${S}/packaging/edbus.manifest .
  
  
diff --git a/meta-tizen-common-share/recipes-efl/edbus/edbus_git.bb b/meta-tizen-common-share/recipes-efl/edbus/edbus_git.bb
index f122a602..31943e21 100644
--- a/meta-tizen-common-share/recipes-efl/edbus/edbus_git.bb
+++ b/meta-tizen-common-share/recipes-efl/edbus/edbus_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/upstream/edbus;tag=26ff9807ff9364ed035c38fc909d3e7a3c85320b;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/edbus;tag=f988bbb48d8894e47d9166ebb966e51fd2f32942;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
diff --git a/meta-tizen-common-share/recipes-efl/efl/efl-extraconf.inc b/meta-tizen-common-share/recipes-efl/efl/efl-extraconf.inc
index 298e2f98..515b1290 100644
--- a/meta-tizen-common-share/recipes-efl/efl/efl-extraconf.inc
+++ b/meta-tizen-common-share/recipes-efl/efl/efl-extraconf.inc
@@ -38,7 +38,6 @@ EXTRA_OECONF_class-native = " \
     --disable-audio \
     --with-x11=none \
     --disable-image-loader-bmp \
-    --disable-image-loader-eet \
     --disable-image-loader-generic \
     --disable-image-loader-gif \
     --disable-image-loader-ico \
@@ -53,7 +52,7 @@ EXTRA_OECONF_class-native = " \
     --disable-gstreamer \
     --disable-gstreamer1 \
     --disable-physics \
-    --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa \
+    --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba \
     --enable-lua-old \
 "
 
@@ -73,6 +72,7 @@ do_install_prepend () {
     done
 }
 
+
 do_install_class-native() {
     echo export RPM_BUILD_ROOT=${D}
     cd ${S}
@@ -136,24 +136,38 @@ pkg_postinst_ecore() {
 
 }
 
-FILES_${PN}-dbg += "${prefix}/lib/eeze/modules/sensor/tizen/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/eeze/modules/sensor/udev/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/eeze/modules/sensor/fake/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/eeze/modules/sensor/fake/v-1.9/.debug/module.so"
-FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/engines/extn/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/engines/wayland/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/ethumb/modules/emotion/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/ethumb_client/utils/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/edje/modules/emotion/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/edje/utils/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/emotion/modules/gstreamer1/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/efreet/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/evas/modules/savers/tiff/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/evas/modules/loaders/tiff/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/evas/modules/loaders/gif/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/evas/modules/engines/wayland_shm/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/evas/modules/engines/wayland_egl/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/ecore_imf/modules/wayland/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/ecore/system/systemd/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/ecore/system/tizen/v-1.9/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/evas/cserve2/bin/v-1.9/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/eeze/modules/sensor/tizen/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/eeze/modules/sensor/udev/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/eeze/modules/sensor/fake/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/eeze/modules/sensor/fake/v-1.12/.debug/module.so"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/engines/extn/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/engines/wayland/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/modules/engines/drm/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/modules/engines/drm/v-1.12/.debug/module.so"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/modules/engines/fb/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/modules/engines/fb/v-1.12/.debug/module.so"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/engines/drm/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/engines/drm/v-1.12/.debug/module.so"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/engines/fb/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_evas/engines/fb/v-1.12/.debug/module.so"
+FILES_${PN}-dbg += "${prefix}/lib/ethumb/modules/emotion/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/ethumb_client/utils/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/edje/modules/emotion/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/edje/utils/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/emotion/modules/gstreamer1/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/efreet/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/savers/tiff/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/loaders/tiff/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/loaders/gif/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/engines/wayland_shm/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/engines/wayland_egl/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/engines/drm/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/engines/drm/v-1.12/.debug/module.so"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/engines/fb/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/engines/fb/v-1.12/.debug/module.so"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/engines/gl_generic/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/evas/modules/engines/gl_generic/v-1.12/.debug/module.so"
+FILES_${PN}-dbg += "${prefix}/lib/ecore_imf/modules/wayland/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/ecore/system/systemd/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/ecore/system/tizen/v-1.12/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/evas/cserve2/bin/v-1.12/.debug"
diff --git a/meta-tizen-common-share/recipes-efl/efl/efl.inc b/meta-tizen-common-share/recipes-efl/efl/efl.inc
index b4fda5be..a6e58af9 100644
--- a/meta-tizen-common-share/recipes-efl/efl/efl.inc
+++ b/meta-tizen-common-share/recipes-efl/efl/efl.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Enlightenment Foundation Libraries - set of libraries used (not o
 HOMEPAGE = "http://enlightenment.org/"
 SECTION = "Graphics & UI Framework/API"
 LICENSE = "LGPL-2.1"
-PV = "1.9.3"
+PV = "1.12.2"
 
 SRC_URI = ""
 
@@ -192,6 +192,11 @@ PROVIDES += "edje-examples"
 #PROVIDES by eio
 PROVIDES += "eio"
 
+#PROVIDES by eolian
+PROVIDES += "eolian"
+PROVIDES += "eolian-dev"
+PROVIDES += "eolian-examples"
+
 
 RDEPENDS = ""
 #RDEPENDS of edje (edje)
@@ -314,6 +319,9 @@ RDEPENDS_edje-examples += "edje"
 #RDEPENDS of eio (eio)
 RDEPENDS_eio += "efl-data"
 
+#RDEPENDS of eolian-dev (eolian-dev)
+RDEPENDS_eolian-dev += "eolian"
+
 
 DEPENDS = ""
 #DEPENDS of efl
@@ -381,7 +389,7 @@ do_compile() {
   
   CFLAGS="${CFLAGS} -DMESA_EGL_NO_X11_HEADERS "
   
-  
+  touch ./ABOUT-NLS
   autotools_do_configure
   
   oe_runmake ${PARALLEL_MAKE}
@@ -389,7 +397,26 @@ do_compile() {
   
   
 }
-EXTRA_OECONF += " --enable-g-main-loop --disable-xim --disable-scim --disable-gesture --with-tests=regular --enable-wayland --enable-egl --with-opengl=es --enable-tile-rotate --disable-rpath --with-x11=none --enable-tile-rotate --disable-rpath --enable-always-build-examples --enable-systemd --enable-lua-old --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa"
+EXTRA_OECONF += " --enable-g-main-loop \
+					--disable-xim \
+					--disable-scim \
+					--disable-gesture \
+					--with-tests=regular \
+					--enable-fb \
+					--disable-tslib \
+					--enable-wayland \
+					--enable-drm \
+					--enable-egl \
+					--with-opengl=es \
+					--enable-tile-rotate \
+					--disable-rpath \
+					--with-x11=none \
+					--enable-tile-rotate \
+					--disable-rpath \
+					--enable-always-build-examples \
+					--enable-systemd \
+					--enable-lua-old \
+					--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
@@ -419,6 +446,12 @@ do_install() {
  
 }
 
+pkg_postinst_eolian() {
+    #!/bin/sh -e
+
+    [ "x$D" == "x" ] && ldconfig
+}
+
 pkg_postinst_eo() {
     #!/bin/sh -e
 
@@ -595,10 +628,13 @@ pkg_postrm_edje() {
     [ "x$D" == "x" ] && ldconfig
 }
 
-PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
+PACKAGES = "${PN} ${PN}-dev ${PN}-dbg ${PN}-doc ${PN}-locale"
 PACKAGES += " emotion "
 PACKAGES += " ephysics-examples "
 PACKAGES += " eo "
+PACKAGES += " eolian "
+PACKAGES += " eolian-dev "
+PACKAGES += " eolian-examples "
 PACKAGES += " ephysics-dev "
 PACKAGES += " edje "
 PACKAGES += " emotion-dev "
@@ -654,6 +690,23 @@ eo_files = ""
 eo_files += "${prefix}/lib/libeo.so.*"
 MANIFESTFILES_eo = "efl.manifest"
 
+eolian_files = ""
+eolian_files += "${prefix}/bin/eolian*"
+eolian_files += "${prefix}/lib/libeolian.so.*"
+MANIFESTFILES_eolian = "efl.manifest"
+
+eolian-dev_files = ""
+eolian-dev_files += "${prefix}/include/eolian-*1/*.h*"
+eolian-dev_files += "${prefix}/include/eolian-*1/*/*.h*"
+eolian-dev_files += "${prefix}/share/eolian/include/*/*.eo"
+eolian-dev_files += "${prefix}/lib/libeolian.so*"
+eolian-dev_files += "${prefix}/lib/cmake/Eolian*/*.cmake"
+MANIFESTFILES_eolian-dev = "efl.manifest"
+
+eolian-examples_files = ""
+eolian-examples_files += "${prefix}/share/eolian_*/examples/*"
+MANIFESTFILES_eolian-examples = "efl.manifest"
+
 ephysics-dev_files = ""
 ephysics-dev_files += "${prefix}/lib/libephysics.so"
 ephysics-dev_files += "${prefix}/lib/pkgconfig/ephysics.pc"
@@ -689,10 +742,11 @@ eo-examples_files += "${prefix}/lib/eo/examples/*"
 MANIFESTFILES_eo-examples = "efl.manifest"
 
 eet-dev_files = ""
-eet-dev_files += "${prefix}/include/eet-1/*.h"
+eet-dev_files += "${prefix}/include/eet-*1/*.h*"
+eet-dev_files += "${prefix}/include/eet-*1/*/*.h*"
 eet-dev_files += "${prefix}/lib/libeet.so"
 eet-dev_files += "${prefix}/lib/pkgconfig/eet*.pc"
-eet-dev_files += "${prefix}/lib/cmake/Eet/*.cmake"
+eet-dev_files += "${prefix}/lib/cmake/Eet*/*.cmake"
 MANIFESTFILES_eet-dev = "efl.manifest"
 
 ephysics_files = ""
@@ -716,7 +770,10 @@ MANIFESTFILES_efreet-dev = "efl.manifest"
 
 ecore-dev_files = ""
 ecore-dev_files += "${prefix}/include/ecore*/*.h"
+ecore-dev_files += "${prefix}/include/ecore*cxx*/*.hh"
 ecore-dev_files += "${prefix}/lib/libecore.so"
+ecore-dev_files += "${prefix}/lib/libecore_fb.so"
+ecore-dev_files += "${prefix}/lib/libecore_drm.so"
 ecore-dev_files += "${prefix}/lib/libecore_audio.so"
 ecore-dev_files += "${prefix}/lib/libecore_avahi.so"
 ecore-dev_files += "${prefix}/lib/libecore_con.so"
@@ -729,21 +786,22 @@ ecore-dev_files += "${prefix}/lib/libecore_input_evas.so"
 ecore-dev_files += "${prefix}/lib/libecore_ipc.so"
 ecore-dev_files += "${prefix}/lib/libecore_wayland.so"
 ecore-dev_files += "${prefix}/lib/pkgconfig/ecore*.pc"
-ecore-dev_files += "${prefix}/lib/cmake/Ecore/*.cmake"
+ecore-dev_files += "${prefix}/lib/cmake/Ecore*/*.cmake"
 MANIFESTFILES_ecore-dev = "efl.manifest"
 
 eina-dev_files = ""
-eina-dev_files += "${prefix}/include/eina-1/*.h"
-eina-dev_files += "${prefix}/include/eina-1/eina/*"
+eina-dev_files += "${prefix}/include/eina-*1/*.h*"
+eina-dev_files += "${prefix}/include/eina-*1/eina*/*"
 eina-dev_files += "${prefix}/lib/libeina.so"
 eina-dev_files += "${prefix}/lib/pkgconfig/eina*.pc"
-eina-dev_files += "${prefix}/lib/cmake/Eina/*.cmake"
+eina-dev_files += "${prefix}/lib/cmake/Eina*/*.cmake"
 MANIFESTFILES_eina-dev = "efl.manifest"
 
 ethumb_files = ""
 ethumb_files += "${prefix}/lib/libethumb.so.*"
 ethumb_files += "${prefix}/lib/libethumb_client.so.*"
 ethumb_files += "${prefix}/share/dbus-1/services/org.enlightenment.Ethumb.service"
+ethumb_files += "${prefix}/lib/systemd/user/ethumb.service"
 ethumb_files += "${prefix}/share/ethumb/*"
 ethumb_files += "${prefix}/share/ethumb_client/*"
 ethumb_files += "${prefix}/lib/ethumb/modules/*/*/module.so"
@@ -755,17 +813,33 @@ ethumb_files += "${prefix}/bin/ethumbd_client"
 MANIFESTFILES_ethumb = "efl.manifest"
 
 evas-dev_files = ""
-evas-dev_files += "${prefix}/include/evas-1/*.h"
+evas-dev_files += "${prefix}/include/evas-*1/*.h*"
+evas-dev_files += "${prefix}/include/evas-*1/*/*.h*"
 evas-dev_files += "${prefix}/lib/libevas.so"
 evas-dev_files += "${prefix}/lib/pkgconfig/evas*.pc"
-evas-dev_files += "${prefix}/lib/cmake/Evas/*.cmake"
+evas-dev_files += "${prefix}/lib/cmake/Evas*/*.cmake"
 MANIFESTFILES_evas-dev = "efl.manifest"
 
+efl_files = ""
+efl_files += "${prefix}/lib/libefl.so.*"
+efl_files += "${prefix}/share/locale/*/*/*.mo"
+MANIFESTFILES_${PN} = "efl.manifest"
+
+efl-dev_files = ""
+efl-dev_files += "${prefix}/include/efl-1/Efl*.h"
+efl-dev_files += "${prefix}/include/efl-1/interfaces/efl*.h"
+efl-dev_files += "${prefix}/include/efl-cxx-1/*.hh"
+efl-dev_files += "${prefix}/lib/cmake/Efl*/*.cmake"
+efl-dev_files += "${prefix}/lib/libefl.so"
+efl-dev_files += "${prefix}/lib/pkgconfig/efl*.pc"
+MANIFESTFILES_${PN}-dev = "efl.manifest"
+
 efl-data_files = ""
 efl-data_files += "${prefix}/include/efl-1/Efl_Config.h"
 MANIFESTFILES_${PN}-data = "efl.manifest"
 
 evas_files = ""
+evas_files += "${prefix}/bin/ecore_evas_*"
 evas_files += "${prefix}/bin/evas_cserve2_client"
 evas_files += "${prefix}/bin/evas_cserve2_debug"
 evas_files += "${prefix}/bin/evas_cserve2_shm_debug"
@@ -798,6 +872,7 @@ MANIFESTFILES_ethumb-dev = "efl.manifest"
 
 efreet_files = ""
 efreet_files += "${prefix}/share/dbus-1/services/org.enlightenment.Efreet.service"
+efreet_files += "${prefix}/lib/systemd/user/efreet.service"
 efreet_files += "${prefix}/bin/efreetd"
 efreet_files += "${prefix}/lib/efreet/*/efreet_desktop_cache_create"
 efreet_files += "${prefix}/lib/efreet/*/efreet_icon_cache_create"
@@ -844,6 +919,8 @@ MANIFESTFILES_ecore-examples = "efl.manifest"
 ecore_files = ""
 ecore_files += "${prefix}/lib/libecore.so.*"
 ecore_files += "${prefix}/lib/libecore_avahi.so.*"
+ecore_files += "${prefix}/lib/libecore_fb.so.*"
+ecore_files += "${prefix}/lib/libecore_drm.so.*"
 ecore_files += "${prefix}/lib/libecore_audio.so.*"
 ecore_files += "${prefix}/lib/libecore_avahi.so.*"
 ecore_files += "${prefix}/lib/libecore_con.so.*"
@@ -861,6 +938,7 @@ ecore_files += "${prefix}/lib/ecore_imf/modules/*/*/module.so"
 ecore_files += "${prefix}/lib/ecore/system/systemd/v-*/module.so"
 ecore_files += "${prefix}/share/ecore/checkme"
 ecore_files += "${prefix}/share/ecore_imf/checkme"
+ecore_files += "${prefix}/share/ecore_x/checkme"
 MANIFESTFILES_ecore = "efl.manifest"
 
 eldbus-examples_files = ""
@@ -869,12 +947,13 @@ eldbus-examples_files += "${prefix}/lib/eldbus/examples/*"
 MANIFESTFILES_eldbus-examples = "efl.manifest"
 
 eo-dev_files = ""
-eo-dev_files += "${prefix}/include/eo-1/*.h"
+eo-dev_files += "${prefix}/include/eo-*1/*.h*"
 eo-dev_files += "${prefix}/lib/libeo.so"
 eo-dev_files += "${prefix}/lib/pkgconfig/eo*.pc"
 eo-dev_files += "${prefix}/share/eo/gdb/eo_gdb.py"
 eo-dev_files += "${prefix}/share/gdb/auto-load/usr/lib*/*"
 eo-dev_files += "${prefix}/lib/cmake/Eo/*.cmake"
+eo-dev_files += "${prefix}/lib/cmake/EoCxx/*.cmake"
 MANIFESTFILES_eo-dev = "efl.manifest"
 
 embryo_files = ""
@@ -890,10 +969,11 @@ MANIFESTFILES_eio-examples = "efl.manifest"
 
 eet-tools_files = ""
 eet-tools_files += "${prefix}/bin/eet"
+eet-tools_files += "${prefix}/bin/vieet"
 MANIFESTFILES_eet-tools = "efl.manifest"
 
 edje-dev_files = ""
-edje-dev_files += "${prefix}/include/edje-1/*.h"
+edje-dev_files += "${prefix}/include/edje*-1/*.h*"
 edje-dev_files += "${prefix}/lib/libedje.so"
 edje-dev_files += "${prefix}/lib/pkgconfig/edje*.pc"
 edje-dev_files += "${prefix}/lib/cmake/Edje/*.cmake"
@@ -935,6 +1015,9 @@ MANIFESTFILES_eio = "efl.manifest"
 FILES_emotion = "${emotion_files}"
 FILES_ephysics-examples = "${ephysics-examples_files}"
 FILES_eo = "${eo_files}"
+FILES_eolian = "${eolian_files}"
+FILES_eolian-dev = "${eolian-dev_files}"
+FILES_eolian-examples = "${eolian-examples_files}"
 FILES_ephysics-dev = "${ephysics-dev_files}"
 FILES_edje = "${edje_files}"
 FILES_emotion-dev = "${emotion-dev_files}"
@@ -950,6 +1033,8 @@ FILES_eina-dev = "${eina-dev_files}"
 FILES_ethumb = "${ethumb_files}"
 FILES_evas-dev = "${evas-dev_files}"
 FILES_${PN}-data = "${efl-data_files}"
+FILES_${PN}-dev = "${efl-dev_files}"
+FILES_${PN} = "${efl_files}"
 FILES_evas = "${evas_files}"
 FILES_eeze = "${eeze_files}"
 FILES_ethumb-dev = "${ethumb-dev_files}"
@@ -978,6 +1063,9 @@ FILES_eio = "${eio_files}"
 PKG_emotion= "emotion"
 PKG_ephysics-examples= "ephysics-examples"
 PKG_eo= "eo"
+PKG_eolian= "eolian"
+PKG_eolian-dev= "eolian-dev"
+PKG_eolian-examples= "eolian-examples"
 PKG_ephysics-dev= "ephysics-dev"
 PKG_edje= "edje"
 PKG_emotion-dev= "emotion-dev"
@@ -993,6 +1081,8 @@ PKG_eina-dev= "eina-dev"
 PKG_ethumb= "ethumb"
 PKG_evas-dev= "evas-dev"
 PKG_efl-data= "efl-data"
+PKG_efl= "efl"
+PKG_efl-dev= "efl-dev"
 PKG_evas= "evas"
 PKG_eeze= "eeze"
 PKG_ethumb-dev= "ethumb-dev"
diff --git a/meta-tizen-common-share/recipes-efl/efl/efl_git.bb b/meta-tizen-common-share/recipes-efl/efl/efl_git.bb
index 177d9296..d9ad42aa 100644
--- a/meta-tizen-common-share/recipes-efl/efl/efl_git.bb
+++ b/meta-tizen-common-share/recipes-efl/efl/efl_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/upstream/efl;tag=f7a97238b515310da98621328aadb9275bc92012;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/efl;tag=fd139f7971d5c4b282ada9ab94c51563d771cf4b;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
diff --git a/meta-tizen-common-share/recipes-efl/elementary/elementary-extraconf.inc b/meta-tizen-common-share/recipes-efl/elementary/elementary-extraconf.inc
index 4b84debd..abd119ef 100644
--- a/meta-tizen-common-share/recipes-efl/elementary/elementary-extraconf.inc
+++ b/meta-tizen-common-share/recipes-efl/elementary/elementary-extraconf.inc
@@ -1,11 +1,6 @@
-SRC_URI += "file://Fix_build.patch"
+SRC_URI += "file://0001-Fix-pathinEOLIAN_FLAGSforyoctobuild.patch \
+			file://0001-add-wayland-clientlibinlinkstep.patch"
 
-do_configure_prepend() {
-    # Fix configure error: "error: required file './ABOUT-NLS' not found"
-    sed -i 's/AM_INIT_AUTOMAKE(\[1.6 dist-bzip2\])/AM_INIT_AUTOMAKE(\[1.6 dist-bzip2 foreign\])/' configure.ac
-    # prefix returned eolian paths with STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
-    sed -i "s^DEPS_EOLIAN_FLAGS=\`pkg-config --variable=eolian_flags eo evas edje ecore\`$^DEPS_EOLIAN_FLAGS=\`\$PKG_CONFIG --variable=eolian_flags eo evas edje ecore | sed 's#-I${prefix}#-I${STAGING_DIR_HOST}${prefix}#g'\`^g" ${S}/configure.ac
-}
 
 do_install_prepend () {
     for i in `find ${B}/ -name "*.pc" -type f` ; do \
@@ -18,21 +13,34 @@ do_install_append () {
 
 }
 
-EXTRA_OECONF_append_class-target = "\
-    --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
-    --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
-    --with-elementary-codegen=${STAGING_BINDIR_NATIVE}/elementary_codegen \
-    --with-elm-prefs-cc=${STAGING_BINDIR_NATIVE}/elm_prefs_cc \
-    --with-eolian-gen=${STAGING_BINDIR_NATIVE}/eolian_gen \
-    --with-binary-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
-"
+do_compile_class-native() {
+ cd ${S}
+  LANG=C
+  export LANG
+  unset DISPLAY
+  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+  touch ./ABOUT-NLS
+  autotools_do_configure
+  
+  make ${PARALLEL_MAKE}
+  
+}
+
+
 DEPENDS_class-native = "efl-native"
 DEPENDS_append_class-target = " elementary-native "
-EXTRA_OECONF_class-native = " --disable-static --disable-ecore-wayland --disable-ecore-x --disable-build-examples"
-
-FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/prefs/v-1.9.3/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/datetime_input_ctxpopup/v-1.9.3/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/test_entry/v-1.9.3/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/access_output/v-1.9.3/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/test_map/v-1.9.3/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/edje/modules/elm/v-1.9/.debug"
+EXTRA_OECONF_class-native = " --disable-static --disable-ecore-wayland --disable-ecore-x --disable-build-examples \
+							--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+					--with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
+					--with-elementary-codegen=${STAGING_BINDIR_NATIVE}/elementary_codegen \
+					--with-eolian-gen=${STAGING_BINDIR_NATIVE}/eolian_gen \
+					--with-eolian-cxx=${STAGING_BINDIR_NATIVE}/eolian_cxx \
+					--with-sysroot-native=${STAGING_DIR_NATIVE} \
+					"
+
+FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/prefs/v-1.12.2/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/datetime_input_ctxpopup/v-1.12.2/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/test_entry/v-1.12.2/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/access_output/v-1.12.2/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/test_map/v-1.12.2/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/edje/modules/elm/v-1.12/.debug"
diff --git a/meta-tizen-common-share/recipes-efl/elementary/elementary.inc b/meta-tizen-common-share/recipes-efl/elementary/elementary.inc
index 41d576a4..36a87133 100644
--- a/meta-tizen-common-share/recipes-efl/elementary/elementary.inc
+++ b/meta-tizen-common-share/recipes-efl/elementary/elementary.inc
@@ -49,40 +49,57 @@ DEPENDS += "efl"
 DEPENDS += "evas"
 DEPENDS += "ecore"
 DEPENDS += "emotion"
+DEPENDS += "eolian-dev"
+DEPENDS += "eet-tools"
 
 do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
  cp ${S}/packaging/elementary.manifest .
- 
+ touch ./ABOUT-NLS
  
 }
 do_patch_append() {
     bb.build.exec_func('do_prep', d)
 }
 
+
 do_configure() {
+  cd ${S}
+  LANG=C
+  export LANG
+  unset DISPLAY
+  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+  CPPFLAGS="${CPPFLAGS} -I${STAGING_DIR_HOST}${prefix}"
+  CFLAGS="${CFLAGS} -I${STAGING_DIR_HOST}${prefix}"
+  
+  autotools_do_configure sysroot_native=${STAGING_DIR_NATIVE}
+  
 }
 
+
 do_compile() {
  cd ${S}
   LANG=C
   export LANG
   unset DISPLAY
   LD_AS_NEEDED=1; export LD_AS_NEEDED ;
-  
-  
-  
-   
-  autotools_do_configure
+  CPPFLAGS="${CPPFLAGS} -I${STAGING_DIR_HOST}${prefix}"
+  CFLAGS="${CFLAGS} -I${STAGING_DIR_HOST}${prefix}"
   
   oe_runmake ${PARALLEL_MAKE}
   
-  
-  
 }
-EXTRA_OECONF += " --disable-static --enable-ecore-wayland --disable-ecore-x --disable-build-examples"
+EXTRA_OECONF += " --disable-static --enable-ecore-wayland --disable-ecore-x --disable-build-examples \
+					--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+					--with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
+					--with-elementary-codegen=${STAGING_BINDIR_NATIVE}/elementary_codegen \
+					--with-elm-prefs-cc=${STAGING_BINDIR_NATIVE}/elm_prefs_cc \
+					--with-eolian-gen=${STAGING_BINDIR_NATIVE}/eolian_gen \
+					--with-eolian-cxx=${STAGING_BINDIR_NATIVE}/eolian_cxx \
+					--with-sysroot-native=${STAGING_DIR_NATIVE} \
+				"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
@@ -98,6 +115,7 @@ do_install() {
          DESTDIR=${D} \
          INSTALL_ROOT=${D} \
          BINDIR=${prefix}/bin \
+         SYSROOTDIR=${STAGING_DIR_NATIVE} \
    install  
    rm -f ${D}${infodir}/dir 
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
diff --git a/meta-tizen-common-share/recipes-efl/elementary/elementary_git.bb b/meta-tizen-common-share/recipes-efl/elementary/elementary_git.bb
index df7bd4a7..0c9bbca8 100644
--- a/meta-tizen-common-share/recipes-efl/elementary/elementary_git.bb
+++ b/meta-tizen-common-share/recipes-efl/elementary/elementary_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/upstream/elementary;tag=48de6fe3127b0e8da306d0fa0b181469b101e3af;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/elementary;tag=0d21f750a7b9bd09e896ada235518bfea9735b7b;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
diff --git a/meta-tizen-common-share/recipes-efl/elementary/files/0001-Fix-pathinEOLIAN_FLAGSforyoctobuild.patch b/meta-tizen-common-share/recipes-efl/elementary/files/0001-Fix-pathinEOLIAN_FLAGSforyoctobuild.patch
new file mode 100644
index 00000000..31bc2e2e
--- /dev/null
+++ b/meta-tizen-common-share/recipes-efl/elementary/files/0001-Fix-pathinEOLIAN_FLAGSforyoctobuild.patch
@@ -0,0 +1,41 @@
+From e8c91961ada189601ea7ac73397609ba542924f7 Mon Sep 17 00:00:00 2001
+From: Xavier Roche <xavrock.os@gmail.com>
+Date: Thu, 12 Mar 2015 11:27:11 +0100
+Subject: [PATCH] Fix path in eolian sysroot
+
+Signed-off-by: Xavier Roche <xavrock.os@gmail.com>
+---
+ configure.ac | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67057a6..df11e49 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,6 +54,13 @@ AC_ARG_WITH([elementary-base-dir],
+ AC_MSG_NOTICE([ELEMENTARY_BASE_DIR set to ${elementary_base_dir}])
+ AC_DEFINE_UNQUOTED([ELEMENTARY_BASE_DIR], ["${elementary_base_dir}"], ["subdirectory for all elementary data"])
+ 
++# Yocto : adding sysroot-native dir
++
++AC_ARG_WITH([sysroot-native],
++   [AS_HELP_STRING([--with-sysroot-native=PATH], [specify the sysroot-native dir @<:@default=""@:>@])],
++   [sysroot_native=${withval}],
++   [sysroot_native=""])
++
+ # Build and install examples
+ 
+ EFL_CHECK_BUILD_EXAMPLES(
+@@ -273,7 +280,8 @@ AC_DEFINE_UNQUOTED([MODULE_EDJE], ["$MODULE_EDJE"], ["Edje module architecture"]
+ 
+ # Needs to be moved into a macro, and also, needs a way to automatically fetch
+ # from all the dependencies using the Requires.
+-DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo evas edje ecore efl`
++
++DEPS_EOLIAN_FLAGS="-I${sysroot_native}/usr/share/eolian/include/eo-1 -I${sysroot_native}/usr/share/eolian/include/evas-1 -I${sysroot_native}/usr/share/eolian/include/edje-1 -I${sysroot_native}/usr/share/eolian/include/ecore-1 -I${sysroot_native}/usr/share/eolian/include/efl-1"
+ AC_SUBST([DEPS_EOLIAN_FLAGS])
+ 
+ requirement_elm_libs="-lm"
+-- 
+1.9.1
+
diff --git a/meta-tizen-common-share/recipes-efl/elementary/files/0001-add-wayland-clientlibinlinkstep.patch b/meta-tizen-common-share/recipes-efl/elementary/files/0001-add-wayland-clientlibinlinkstep.patch
new file mode 100644
index 00000000..59d226fa
--- /dev/null
+++ b/meta-tizen-common-share/recipes-efl/elementary/files/0001-add-wayland-clientlibinlinkstep.patch
@@ -0,0 +1,27 @@
+From 99fe0de5b3afd3fdb074f07bfa9bbb69dfb358f5 Mon Sep 17 00:00:00 2001
+From: Xavier Roche <xavrock.os@gmail.com>
+Date: Thu, 12 Mar 2015 14:02:34 +0100
+Subject: [PATCH] add wayland-client lib in link step
+
+Signed-off-by: Xavier Roche <xavrock.os@gmail.com>
+---
+ src/lib/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 5bbe572..c9d82d3 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -503,7 +503,8 @@ elu_ews_wm.c
+ libelementary_la_CFLAGS = @ELEMENTARY_CFLAGS@
+ libelementary_la_LIBADD = \
+ @ELEMENTARY_LIBS@ \
+-@LTLIBINTL@
++@LTLIBINTL@ \
++-lwayland-client
+ 
+ libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+ 
+-- 
+1.9.1
+