From ee78128f72cb6b70ef76a10c4fe0e189645700b9 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 29 Jul 2014 16:23:00 +0200 Subject: [PATCH] Fix ivi recipes Change-Id: Id26938ed03495454058fc79372d2fb7c8b373fe4 Signed-off-by: Ronan Le Martret --- .../automotive-message-broker/automotive-message-broker.inc | 6 +++--- recipes-tizen/crosswalk/crosswalk.inc | 2 +- recipes-tizen/evolution-data-server/evolution-data-server.inc | 2 +- .../ico-uxf-device-input-controller.inc | 7 +++---- .../ico-uxf-homescreen-sample-apps.inc | 4 ++-- recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc | 8 +++----- recipes-tizen/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc | 3 +-- recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc | 2 +- recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc | 2 +- recipes-tizen/murphy/murphy.inc | 3 +-- .../pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi.inc | 1 - 11 files changed, 17 insertions(+), 23 deletions(-) diff --git a/recipes-tizen/automotive-message-broker/automotive-message-broker.inc b/recipes-tizen/automotive-message-broker/automotive-message-broker.inc index c0799c1..ba63f36 100644 --- a/recipes-tizen/automotive-message-broker/automotive-message-broker.inc +++ b/recipes-tizen/automotive-message-broker/automotive-message-broker.inc @@ -119,7 +119,7 @@ RDEPENDS_${PN}-plugins-cansim += "automotive-message-broker" #RDEPENDS of automotive-message-broker-dev (${PN}-dev) RDEPENDS_${PN}-dev += "libuuid-dev" -RDEPENDS_${PN}-dev += "boost-dev" +RDEPENDS_${PN}-dev += "boost" RDEPENDS_${PN}-dev += "automotive-message-broker" #RDEPENDS of automotive-message-broker (${PN}) @@ -151,13 +151,13 @@ RDEPENDS_${PN}-plugins-gpsnmea += "automotive-message-broker" DEPENDS = "" #DEPENDS of automotive-message-broker DEPENDS += "qt5-plugin-bearer-connman" -DEPENDS += "boost-dev" DEPENDS_append_class-native = " cmake-native" DEPENDS_append_class-target = " cmake-native" DEPENDS += "sqlite-dev" DEPENDS += "qt5-qtnetwork-dev" DEPENDS += "libwebsockets-dev" DEPENDS += "qt5-plugin-bearer-generic" +DEPENDS += "libuuid-dev" DEPENDS += "dbus" DEPENDS += "murphy" DEPENDS += "glib-2.0" @@ -169,7 +169,7 @@ DEPENDS_append_class-target = " libtool-cross" DEPENDS += "murphy-glib-dev" DEPENDS += "libjson-dev" DEPENDS += "qt5-plugin-bearer-nm" -DEPENDS += "libuuid-dev" +DEPENDS += "boost" DEPENDS += "murphy-glib" DEPENDS += "opencv-dev" diff --git a/recipes-tizen/crosswalk/crosswalk.inc b/recipes-tizen/crosswalk/crosswalk.inc index ffdc6df..d170472 100644 --- a/recipes-tizen/crosswalk/crosswalk.inc +++ b/recipes-tizen/crosswalk/crosswalk.inc @@ -21,6 +21,7 @@ DEPENDS = "" #DEPENDS of crosswalk DEPENDS += "libhaptic" DEPENDS += "cairo" +DEPENDS += "expat" DEPENDS += "udev" DEPENDS += "app-core" DEPENDS += "libslp-sensor" @@ -54,7 +55,6 @@ DEPENDS += "vconf" DEPENDS += "nspr" DEPENDS += "dbus" DEPENDS += "libxkbcommon" -DEPENDS += "expat-dev" DEPENDS += "pulseaudio" DEPENDS += "location-manager" DEPENDS += "libexif" diff --git a/recipes-tizen/evolution-data-server/evolution-data-server.inc b/recipes-tizen/evolution-data-server/evolution-data-server.inc index 149a3b0..119b499 100644 --- a/recipes-tizen/evolution-data-server/evolution-data-server.inc +++ b/recipes-tizen/evolution-data-server/evolution-data-server.inc @@ -101,12 +101,12 @@ DEPENDS += "db" #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "pkgconfig(libsecret-unstable)" +inherit pythonnative DEPENDS += "libsoup-2.4" DEPENDS += "pkgconfig(gobject-introspection-1.0)" DEPENDS += "icu" DEPENDS += "pkgconfig(libical)" DEPENDS += "sqlite3" -DEPENDS += "pkgconfig(python-2.7)" DEPENDS_append_class-native = " fdupes-native" DEPENDS_append_class-target = " fdupes-native" DEPENDS += "vala" diff --git a/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc b/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc index f9ffe90..f68aad3 100644 --- a/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc +++ b/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc @@ -24,12 +24,11 @@ RDEPENDS_${PN} += "ico-uxf-weston-plugin" DEPENDS = "" #DEPENDS of ico-uxf-device-input-controller -DEPENDS += "glib-2.0" DEPENDS += "wayland" -DEPENDS += "ico-uxf-utilities-dev" -DEPENDS += "ico-uxf-weston-plugin-dev" DEPENDS += "mesa" -DEPENDS += "mesa-dev" +DEPENDS += "ico-uxf-weston-plugin" +DEPENDS += "ico-uxf-utilities" +DEPENDS += "glib-2.0" do_prep() { cd ${S} diff --git a/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps.inc b/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps.inc index c7a7e90..307ac7f 100644 --- a/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps.inc +++ b/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps.inc @@ -39,16 +39,16 @@ RDEPENDS_${PN} += "ico-uxf-weston-plugin" DEPENDS = "" #DEPENDS of ico-uxf-homescreen-sample-apps DEPENDS += "edje" +DEPENDS += "ico-uxf-utilities" DEPENDS += "edbus" DEPENDS += "application" DEPENDS += "evas" DEPENDS += "dbus" +DEPENDS += "pulseaudio" DEPENDS += "aul" DEPENDS += "bundle" DEPENDS += "glib-2.0" DEPENDS += "eina" -DEPENDS += "ico-uxf-utilities-dev" -DEPENDS += "libpulse-dev" DEPENDS += "elementary" DEPENDS += "ecore" diff --git a/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc b/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc index 27176d0..04137ba 100644 --- a/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc +++ b/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc @@ -41,11 +41,9 @@ RDEPENDS_${PN} += "ico-uxf-weston-plugin" DEPENDS = "" #DEPENDS of ico-uxf-homescreen DEPENDS += "edje" -DEPENDS += "weston-ivi-shell-dev" DEPENDS += "genivi-shell" DEPENDS += "eina" DEPENDS += "json-glib" -DEPENDS += "mesa-dev" DEPENDS += "genivi-shell-dev" DEPENDS += "slp-pkgmgr" DEPENDS += "wayland" @@ -54,18 +52,18 @@ DEPENDS += "app-svc" DEPENDS += "aul" DEPENDS += "glib-2.0" DEPENDS += "application" -DEPENDS += "boost-dev" +DEPENDS += "boost" +DEPENDS += "ico-uxf-weston-plugin" +DEPENDS += "ico-uxf-utilities" DEPENDS += "evas" DEPENDS += "murphy" DEPENDS += "bundle" -DEPENDS += "ico-uxf-utilities-dev" DEPENDS += "weston-ivi-shell" DEPENDS += "libwebsockets" DEPENDS += "ecore" DEPENDS += "mesa" DEPENDS += "dbus" DEPENDS += "ail" -DEPENDS += "ico-uxf-weston-plugin-dev" do_prep() { cd ${S} diff --git a/recipes-tizen/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc b/recipes-tizen/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc index 6487b7a..716bec7 100644 --- a/recipes-tizen/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc +++ b/recipes-tizen/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc @@ -32,13 +32,12 @@ RDEPENDS_${PN} += "weekeyboard" DEPENDS = "" #DEPENDS of ico-uxf-weston-plugin -DEPENDS += "weston-ivi-shell-dev" DEPENDS += "evas" DEPENDS += "aul" +DEPENDS += "weston-ivi-shell" DEPENDS += "weston" DEPENDS += "ecore" DEPENDS += "mesa" -DEPENDS += "mesa-dev" DEPENDS += "genivi-shell-dev" DEPENDS += "pixman" diff --git a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc index 4f8df36..dc9f93d 100644 --- a/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc +++ b/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin.inc @@ -25,13 +25,13 @@ RDEPENDS_${PN} += "eglibc" DEPENDS = "" #DEPENDS of ico-vic-amb-plugin DEPENDS += "ico-uxf-utilities" -DEPENDS += "boost-dev" DEPENDS_append_class-native = " cmake-native" DEPENDS_append_class-target = " cmake-native" DEPENDS += "app-core" DEPENDS += "automotive-message-broker" DEPENDS += "libjson-dev" DEPENDS += "elementary" +DEPENDS += "boost" do_prep() { cd ${S} diff --git a/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc b/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc index a83c7e7..6980df9 100644 --- a/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc +++ b/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc @@ -26,12 +26,12 @@ RDEPENDS_${PN} += "ico-uxf-utilities" DEPENDS = "" #DEPENDS of ico-vic-carsimulator DEPENDS += "ico-uxf-utilities" -DEPENDS += "boost-dev" DEPENDS += "make" DEPENDS += "glib-2.0" DEPENDS += "json-glib-dev" DEPENDS_append_class-native = " automake-native" DEPENDS_append_class-target = " automake-native" +DEPENDS += "boost" do_prep() { cd ${S} diff --git a/recipes-tizen/murphy/murphy.inc b/recipes-tizen/murphy/murphy.inc index 7f3b309..ef6c67b 100644 --- a/recipes-tizen/murphy/murphy.inc +++ b/recipes-tizen/murphy/murphy.inc @@ -100,14 +100,12 @@ DEPENDS = "" #DEPENDS of murphy DEPENDS += "flex" DEPENDS += "systemd" -DEPENDS += "mesa-libEGL" DEPENDS += "smack" DEPENDS += "ofono" DEPENDS += "ail" DEPENDS += "json-c" DEPENDS += "libxml2" DEPENDS += "dbus" -DEPENDS += "mesa-libGLESv2" DEPENDS += "pulseaudio" DEPENDS += "glib-2.0" DEPENDS += "lua" @@ -117,6 +115,7 @@ DEPENDS_append_class-target = " bison-native" DEPENDS += "ecore" DEPENDS += "libwebsockets" DEPENDS += "libcap" +DEPENDS += "mesa" DEPENDS += "audio-session-manager" DEPENDS += "ico-uxf-weston-plugin" diff --git a/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi.inc b/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi.inc index 7903559..07cd45f 100644 --- a/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi.inc +++ b/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi.inc @@ -23,7 +23,6 @@ RDEPENDS_${PN} += "aul" DEPENDS = "" #DEPENDS of pulseaudio-module-murphy-ivi -DEPENDS += "config(pulseaudio)" DEPENDS += "dbus" DEPENDS += "murphy" DEPENDS += "pulseaudio" -- 2.7.4