From d63bf232902190b20ba9c391c073263d6e239d30 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 5 Sep 2014 10:01:56 +0200 Subject: [PATCH] meta-tizen: Fix ico-uxf-homescreen build Change-Id: Iaef1cffad487cd1d8b6f4218f93e9db1f5d0d046 (From meta-tizen rev: 4187a00c9c58fd855a88169f78c5a7f33f05c530) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../ico-uxf-homescreen-extraconf.inc | 22 ++++++++++++++++++++++ .../ico-uxf-homescreen/ico-uxf-homescreen_git.bb | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc b/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc index e239e2f..c886f8d 100644 --- a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc +++ b/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc @@ -11,3 +11,25 @@ do_prep() { ${STAGING_BINDIR_NATIVE}/wayland-scanner code < "${protocol}" > "${protocol/.xml/.c}" done } + +do_compile_prepend() { + find ${S} -name Makefile.am -exec sed -i "s@-I/usr/include/ico-util@-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/ico-util@g" {} \; + find ${S} -name Makefile.am -exec sed -i "s@-I/usr/include/ilm@-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/ilm@g" {} \; + find ${S} -name Makefile.am -exec sed -i "s@-I/usr/include/layermanager@-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/layermanager@g" {} \; + find ${S} -name Makefile.am -exec sed -i "s@-I/usr/include/ico-uxf-weston-plugin@-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/ico-uxf-weston-plugin@g" {} \; + + sed -i "s@-I/usr/include/ico-util@-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/ico-util@g" ${S}/configure.ac +} + + +FILES_${PN} += "${datadir}/icons/default/small/org.tizen.ico.onscreen.png" +FILES_${PN} += "${datadir}/icons/default/small/org.tizen.ico.homescreen.png" +FILES_${PN} += "${datadir}/icons/default/small/org.tizen.ico.statusbar.png" + +INSANE_SKIP_${PN} = "dev-so" +#FILES_${PN}-system-controller-dev += "${prefix}/lib/libico-state-machine.so" + +FILES_${PN}-dbg += "${prefix}/apps/org.tizen.ico.onscreen/bin/.debug" +FILES_${PN}-dbg += "${prefix}/apps/org.tizen.ico.statusbar/bin/.debug/StatusBar" +FILES_${PN}-dbg += "${prefix}/apps/org.tizen.ico.homescreen/bin/.debug/HomeScreen" +FILES_${PN}-dbg += "${prefix}/apps/org.tizen.ico.system-controller/bin/.debug" \ No newline at end of file diff --git a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_git.bb b/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_git.bb index 4dadba9..36a0dac 100644 --- a/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_git.bb +++ b/meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_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/profile/ivi/ico-uxf-homescreen;tag=9fe1c18f6967ff97d36a818460629a5574deb51a;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/ico-uxf-homescreen;tag=bd1720857784580d8f86427aa94b31c9027b7b44;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4