Fix elementary build

Change-Id: I2e85a31e255637c3972aa7be48281e25b6443d80
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/recipes-tizen/efl/efl-extraconf.inc b/recipes-tizen/efl/efl-extraconf.inc
index 6927b92..6e343ca 100644 (file)
--- a/recipes-tizen/efl/efl-extraconf.inc
+++ b/recipes-tizen/efl/efl-extraconf.inc
@@ -33,10 +33,11 @@ EXTRA_OECONF_class-native = " \
     --enable-lua-old \
 "
 
-DEPENDS_append_class-target = " efl-native "
 
-DEPENDS = " zlib tiff ibus harfbuzz openssl curl fontconfig gst-plugins-base systemd freetype wayland dlog glib-2.0 lua libtbm libbullet libpng sensor pixman libsndfile1 libcheck giflib udev gnutls mesa util-linux vconf libxkbcommon fribidi libjpeg-turbo dbus gstreamer pulseaudio libexif"
-DEPENDS_class-native = " zlib tiff ibus harfbuzz openssl curl fontconfig gst-plugins-base freetype wayland dlog glib-2.0 lua libtbm libbullet libpng sensor pixman  libcheck giflib udev gnutls  util-linux vconf  fribidi libjpeg-turbo dbus "
+DEPENDS_class-target = " zlib tiff ibus harfbuzz openssl curl fontconfig gstreamer1.0-plugins-base systemd freetype wayland dlog glib-2.0 lua libtbm libbullet libpng sensor pixman libsndfile1 libcheck giflib udev gnutls mesa util-linux vconf libxkbcommon fribidi libjpeg-turbo dbus gstreamer1.0 pulseaudio libexif"
+DEPENDS_class-native = " zlib-native tiff-native openssl-native curl-native fontconfig-native freetype-native wayland-native glib-2.0-native lua-native libpng-native pixman-native  libcheck-native giflib-native gnutls-native  util-linux-native vconf-native  fribidi-native dbus-native "
+
+DEPENDS_append_class-target = " efl-native "
 
 # new efl doesn't have option to disable eeze build and we don't want to provide udev-native just to build eeze-native we don't need
 do_configure_prepend_class-native() {

diff --git a/recipes-tizen/efl/efl.inc b/recipes-tizen/efl/efl.inc
index 51ed023..5c9949d 100644 (file)
--- a/recipes-tizen/efl/efl.inc
+++ b/recipes-tizen/efl/efl.inc
@@ -274,20 +274,19 @@ RDEPENDS_eio += "efl-data"
 
 DEPENDS = ""
 #DEPENDS of efl
-DEPENDS += "zlib"
 DEPENDS += "tiff"
 DEPENDS += "ibus"
 DEPENDS += "harfbuzz"
 DEPENDS += "openssl"
 DEPENDS += "curl"
 DEPENDS += "fontconfig"
-DEPENDS += "gst-plugins-base"
 DEPENDS += "systemd"
 DEPENDS += "freetype"
-DEPENDS += "wayland"
+DEPENDS += "lua"
+DEPENDS += "gstreamer1.0-plugins-base"
 DEPENDS += "dlog"
 DEPENDS += "glib-2.0"
-DEPENDS += "lua"
+DEPENDS += "giflib"
 DEPENDS += "libtbm"
 DEPENDS += "libbullet"
 DEPENDS += "libpng"
@@ -295,7 +294,6 @@ DEPENDS += "sensor"
 DEPENDS += "pixman"
 DEPENDS += "libsndfile1"
 DEPENDS += "libcheck"
-DEPENDS += "giflib"
 DEPENDS += "udev"
 DEPENDS += "gnutls"
 DEPENDS += "mesa"
@@ -307,9 +305,11 @@ DEPENDS += "libxkbcommon"
 DEPENDS += "fribidi"
 DEPENDS += "libjpeg-turbo"
 DEPENDS += "dbus"
-DEPENDS += "gstreamer"
+DEPENDS += "zlib"
 DEPENDS += "pulseaudio"
 DEPENDS += "libexif"
+DEPENDS += "wayland"
+DEPENDS += "gstreamer1.0"
 
 do_prep() {
  cd ${S}

diff --git a/recipes-tizen/elementary/elementary-extraconf.inc b/recipes-tizen/elementary/elementary-extraconf.inc
index e69de29..f124de5 100644 (file)
--- a/recipes-tizen/elementary/elementary-extraconf.inc
+++ b/recipes-tizen/elementary/elementary-extraconf.inc
@@ -0,0 +1,36 @@
+SRC_URI += "file://Fix_build.patch"
+
+do_configure_prepend() {
+    # 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 \
+        sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i
+    done
+}
+
+do_install_append () {
+    rm -fr ${D}${prefix}/lib/elementary/examples
+
+}
+
+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 \
+"
+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"
\ No newline at end of file

diff --git a/recipes-tizen/elementary/elementary.inc b/recipes-tizen/elementary/elementary.inc
index 9c96c4a..0473a76 100644 (file)
--- a/recipes-tizen/elementary/elementary.inc
+++ b/recipes-tizen/elementary/elementary.inc
@@ -70,7 +70,7 @@ do_compile() {
   
   
 }
-EXTRA_OECONF += " --disable-static --enable-ecore-wayland --disable-ecore-x --disable-build-examples #eol"
+EXTRA_OECONF += " --disable-static --enable-ecore-wayland --disable-ecore-x --disable-build-examples"
 
 do_install() {
  echo export RPM_BUILD_ROOT=${D}

diff --git a/recipes-tizen/elementary/files/Fix_build.patch b/recipes-tizen/elementary/files/Fix_build.patch
new file mode 100644 (file)
index 0000000..1590371
--- /dev/null
+++ b/recipes-tizen/elementary/files/Fix_build.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index ce534c8..acc931a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -420,7 +420,7 @@ AC_ARG_ENABLE([ecore-wayland],
+ 
+ if test "x$want_elementary_wayland" != "xno"; then
+    PKG_CHECK_MODULES([ELEMENTARY_WAYLAND],
+-      [ecore-wayland],
++      [ecore-wayland wayland-client],
+       [
+        AC_DEFINE(HAVE_ELEMENTARY_WAYLAND, 1, [Wayland support for Elementary])
+        have_elementary_wayland="yes"