diff options
| author | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-10-14 13:49:17 +0200 |
|---|---|---|
| committer | Kévin THIERRY <kevin.thierry@open.eurogiciel.org> | 2014-10-16 10:47:45 +0200 |
| commit | 2346bb21c34075f249a5fd727916276293e4c023 (patch) | |
| tree | c9570f161e8b790b9072fc49d327b7c24415c41d | |
| parent | 5657c0b72ca9fd210ed5095472caf6339cb4eadf (diff) | |
| download | meta-tizen-2346bb21c34075f249a5fd727916276293e4c023.tar.gz meta-tizen-2346bb21c34075f249a5fd727916276293e4c023.tar.bz2 meta-tizen-2346bb21c34075f249a5fd727916276293e4c023.zip | |
Update recipes
Also update layer.conf.
Note that even though meta-tizen provides a working recipe for
libjpeg-turbo, the version used is still the one from Poky since there
is an unresolved conflict between the two versions (maybe a recipe
expliciely requiring the Poky version).
Change-Id: I1b7fda99971d78465fa7a2dbb7aa932f6d5e57de
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
107 files changed, 350 insertions, 150 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index cf017500..cb825b1b 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -41,19 +41,21 @@ VIRTUAL-RUNTIME_init_manager = "systemd" PREFERRED_PROVIDER_python-dbus = "dbus-python" PREFERRED_PROVIDER_jpeg = "libjpeg-turbo" +PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native" PREFERRED_PROVIDER_libtdb = "tdb" PREFERRED_PROVIDER_make-native = "make-native" PREFERRED_PROVIDER_python-setuptools = "python-setuptools" PREFERRED_PROVIDER_rpmbuild = "rpm-native" PREFERRED_PROVIDER_libpam = "pam" PREFERRED_PROVIDER_pciutils-ids = "pciutils" -PREFERRED_PROVIDER_jpeg-native = "jpeg-native" PREFERRED_VERSION_pulseaudio = "git" PREFERRED_VERSION_libav = "git" PREFERRED_VERSION_linux-yocto ?= "3.14%" PREFERRED_VERSION_weston = "git" PREFERRED_VERSION_pam = "git" +PREFERRED_VERSION_libjpeg-turbo = "8d%" +PREFERRED_VERSION_libjpeg-turbo-native = "8d%" LICENSE_FLAGS_WHITELIST += "commercial" diff --git a/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc b/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc index 24378c53..da3ef86c 100644 --- a/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc +++ b/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc @@ -23,6 +23,7 @@ RDEPENDS_${PN} += "Modello-Common" DEPENDS = "" #DEPENDS of Modello-AMBSimulator DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "zip" do_prep() { diff --git a/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc b/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc index a89c139e..708362fd 100644 --- a/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc +++ b/recipes-tizen/Modello-Appmanager/Modello-Appmanager.inc @@ -23,6 +23,7 @@ RDEPENDS_${PN} += "Modello-Common" DEPENDS = "" #DEPENDS of Modello-Appmanager DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "zip" do_prep() { diff --git a/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc b/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc index a6fdd6b1..2f2647fa 100644 --- a/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc +++ b/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc @@ -23,6 +23,7 @@ RDEPENDS_${PN} += "Modello-Common" DEPENDS = "" #DEPENDS of Modello-Dashboard DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "zip" do_prep() { diff --git a/recipes-tizen/Modello-Hvac/Modello-Hvac.inc b/recipes-tizen/Modello-Hvac/Modello-Hvac.inc index a9768dc7..bbd8fd78 100644 --- a/recipes-tizen/Modello-Hvac/Modello-Hvac.inc +++ b/recipes-tizen/Modello-Hvac/Modello-Hvac.inc @@ -23,6 +23,7 @@ RDEPENDS_${PN} += "Modello-Common" DEPENDS = "" #DEPENDS of Modello-Hvac DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "zip" do_prep() { diff --git a/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc b/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc index ca8f7896..99f44f44 100644 --- a/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc +++ b/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc @@ -23,6 +23,7 @@ RDEPENDS_${PN} += "Modello-Common" DEPENDS = "" #DEPENDS of Modello-Multimediaplayer DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "zip" do_prep() { diff --git a/recipes-tizen/Modello-Nav/Modello-Nav.inc b/recipes-tizen/Modello-Nav/Modello-Nav.inc index 36d1bb6b..1cc4990c 100644 --- a/recipes-tizen/Modello-Nav/Modello-Nav.inc +++ b/recipes-tizen/Modello-Nav/Modello-Nav.inc @@ -23,6 +23,7 @@ RDEPENDS_${PN} += "Modello-Common" DEPENDS = "" #DEPENDS of Modello-Nav DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "zip" do_prep() { diff --git a/recipes-tizen/Modello-Phone/Modello-Phone.inc b/recipes-tizen/Modello-Phone/Modello-Phone.inc index 6142f32c..7be75169 100644 --- a/recipes-tizen/Modello-Phone/Modello-Phone.inc +++ b/recipes-tizen/Modello-Phone/Modello-Phone.inc @@ -24,6 +24,7 @@ RDEPENDS_${PN} += "phoned" DEPENDS = "" #DEPENDS of Modello-Phone DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "zip" do_prep() { diff --git a/recipes-tizen/Modello-SDL/Modello-SDL.inc b/recipes-tizen/Modello-SDL/Modello-SDL.inc index e52e575c..d74d5014 100644 --- a/recipes-tizen/Modello-SDL/Modello-SDL.inc +++ b/recipes-tizen/Modello-SDL/Modello-SDL.inc @@ -23,6 +23,7 @@ RDEPENDS_${PN} += "Modello-Common" DEPENDS = "" #DEPENDS of Modello-SDL DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "zip" do_prep() { diff --git a/recipes-tizen/ail/ail.inc b/recipes-tizen/ail/ail.inc index fa1aa114..8c368ed5 100644 --- a/recipes-tizen/ail/ail.inc +++ b/recipes-tizen/ail/ail.inc @@ -36,6 +36,7 @@ DEPENDS = "" #DEPENDS of ail inherit tizen_cmake DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "smack" DEPENDS += "sqlite3" diff --git a/recipes-tizen/app-checker/app-checker.inc b/recipes-tizen/app-checker/app-checker.inc index b98defa6..2ba1abbf 100644 --- a/recipes-tizen/app-checker/app-checker.inc +++ b/recipes-tizen/app-checker/app-checker.inc @@ -41,6 +41,7 @@ RDEPENDS_${PN}-server += "app-checker" DEPENDS = "" #DEPENDS of app-checker inherit tizen_cmake +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" diff --git a/recipes-tizen/app-core/app-core.inc b/recipes-tizen/app-core/app-core.inc index aea84f9c..cd16c1eb 100644 --- a/recipes-tizen/app-core/app-core.inc +++ b/recipes-tizen/app-core/app-core.inc @@ -61,9 +61,10 @@ inherit tizen_cmake DEPENDS += "tizen-platform-config" DEPENDS += "aul" DEPENDS += "dlog" -DEPENDS += "glib-2.0" +inherit pkgconfig DEPENDS += "elementary" DEPENDS += "ecore" +DEPENDS += "glib-2.0" DEPENDS += "sensor" DEPENDS += "vconf" diff --git a/recipes-tizen/app-svc/app-svc.inc b/recipes-tizen/app-svc/app-svc.inc index 95933648..efb23f11 100644 --- a/recipes-tizen/app-svc/app-svc.inc +++ b/recipes-tizen/app-svc/app-svc.inc @@ -34,15 +34,16 @@ DEPENDS += "libsoup-2.4" inherit tizen_cmake DEPENDS += "iniparser" DEPENDS += "tizen-platform-config" +inherit pkgconfig +DEPENDS += "dlog" DEPENDS += "aul" -DEPENDS += "bundle" -DEPENDS += "glib-2.0" DEPENDS += "xdgmime" DEPENDS += "ail" -DEPENDS += "dlog" +DEPENDS += "bundle" DEPENDS += "sqlite3" DEPENDS += "ecore" DEPENDS += "libprivilege-control" +DEPENDS += "glib-2.0" DEPENDS += "dbus-glib" do_prep() { diff --git a/recipes-tizen/appcore-agent/appcore-agent.inc b/recipes-tizen/appcore-agent/appcore-agent.inc index 44debef7..580490b0 100644 --- a/recipes-tizen/appcore-agent/appcore-agent.inc +++ b/recipes-tizen/appcore-agent/appcore-agent.inc @@ -27,11 +27,12 @@ RDEPENDS_${PN}-dev += "appcore-agent" DEPENDS = "" #DEPENDS of appcore-agent inherit tizen_cmake +inherit pkgconfig +DEPENDS += "dlog" DEPENDS += "capi-appfw-application" +DEPENDS += "system-server" DEPENDS += "aul" -DEPENDS += "dlog" DEPENDS += "glib-2.0" -DEPENDS += "system-server" DEPENDS += "vconf" do_prep() { diff --git a/recipes-tizen/audio-session-manager/audio-session-manager_git.bb b/recipes-tizen/audio-session-manager/audio-session-manager_git.bb index 7158b61c..74c00eed 100644 --- a/recipes-tizen/audio-session-manager/audio-session-manager_git.bb +++ b/recipes-tizen/audio-session-manager/audio-session-manager_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/core/multimedia/audio-session-manager;tag=e3971547dc8877cb20ab39f5e437f5dc40a275a0;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/audio-session-manager;tag=ee4096c72a636cd1112a62903fefb0432e720bea;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/aul/aul.inc b/recipes-tizen/aul/aul.inc index 68682dde..fcc7f2fb 100644 --- a/recipes-tizen/aul/aul.inc +++ b/recipes-tizen/aul/aul.inc @@ -36,6 +36,7 @@ inherit tizen_cmake DEPENDS += "attr" DEPENDS += "tizen-platform-config" DEPENDS += "privacy-manager-server" +inherit pkgconfig DEPENDS += "bundle" DEPENDS += "ail" DEPENDS += "smack" diff --git a/recipes-tizen/automotive-message-broker/automotive-message-broker.inc b/recipes-tizen/automotive-message-broker/automotive-message-broker.inc index e32f8b2e..87673ade 100644 --- a/recipes-tizen/automotive-message-broker/automotive-message-broker.inc +++ b/recipes-tizen/automotive-message-broker/automotive-message-broker.inc @@ -119,6 +119,7 @@ DEPENDS += "opencv" DEPENDS += "json-c" DEPENDS += "dbus" DEPENDS += "murphy" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "sqlite3" DEPENDS_append_class-native = " libtool" diff --git a/recipes-tizen/badge/badge.inc b/recipes-tizen/badge/badge.inc index 5bc126d5..bd052f4e 100644 --- a/recipes-tizen/badge/badge.inc +++ b/recipes-tizen/badge/badge.inc @@ -36,8 +36,9 @@ DEPENDS = "" inherit tizen_cmake DEPENDS += "dbus" DEPENDS += "tizen-platform-config" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "dlog" +DEPENDS += "aul" DEPENDS += "sqlite3" DEPENDS += "libcom-core" DEPENDS += "vconf" diff --git a/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc b/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc index a60c1f38..5e160a41 100644 --- a/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc +++ b/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc @@ -53,10 +53,11 @@ DEPENDS += "libxml2" DEPENDS += "dbus" DEPENDS += "syspopup" DEPENDS += "tizen-platform-config" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "capi-network-tethering" +DEPENDS += "aul" DEPENDS += "security-server" DEPENDS += "notification" DEPENDS += "alarm-manager" diff --git a/recipes-tizen/bundle/bundle.inc b/recipes-tizen/bundle/bundle.inc index d89156a7..647eb5ad 100644 --- a/recipes-tizen/bundle/bundle.inc +++ b/recipes-tizen/bundle/bundle.inc @@ -27,6 +27,7 @@ RDEPENDS_${PN}-dev += "bundle" DEPENDS = "" #DEPENDS of bundle inherit tizen_cmake +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" diff --git a/recipes-tizen/calendar-service/calendar-service.inc b/recipes-tizen/calendar-service/calendar-service.inc index 98beb5be..fe265d5e 100644 --- a/recipes-tizen/calendar-service/calendar-service.inc +++ b/recipes-tizen/calendar-service/calendar-service.inc @@ -38,6 +38,7 @@ DEPENDS += "contacts-service" DEPENDS += "bundle" DEPENDS += "tizen-platform-config" DEPENDS += "app-svc" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "alarm-manager" diff --git a/recipes-tizen/capi-appfw-app-manager/capi-appfw-app-manager.inc b/recipes-tizen/capi-appfw-app-manager/capi-appfw-app-manager.inc index d099c418..e0e23a31 100644 --- a/recipes-tizen/capi-appfw-app-manager/capi-appfw-app-manager.inc +++ b/recipes-tizen/capi-appfw-app-manager/capi-appfw-app-manager.inc @@ -30,9 +30,10 @@ inherit tizen_cmake DEPENDS += "pkgmgr" DEPENDS += "aul" DEPENDS += "dlog" -DEPENDS += "glib-2.0" +inherit pkgconfig DEPENDS += "ail" DEPENDS += "pkgmgr-info" +DEPENDS += "glib-2.0" DEPENDS += "vconf" DEPENDS += "capi-base-common" diff --git a/recipes-tizen/capi-appfw-application/capi-appfw-application.inc b/recipes-tizen/capi-appfw-application/capi-appfw-application.inc index 8782d785..13d6da3b 100644 --- a/recipes-tizen/capi-appfw-application/capi-appfw-application.inc +++ b/recipes-tizen/capi-appfw-application/capi-appfw-application.inc @@ -33,11 +33,12 @@ DEPENDS += "tizen-platform-config" DEPENDS += "app-svc" DEPENDS += "aul" DEPENDS += "bundle" -DEPENDS += "app-core" +inherit pkgconfig DEPENDS += "ail" DEPENDS += "alarm-manager" DEPENDS += "dlog" DEPENDS += "elementary" +DEPENDS += "app-core" DEPENDS += "capi-base-common" do_prep() { diff --git a/recipes-tizen/capi-appfw-package-manager/capi-appfw-package-manager.inc b/recipes-tizen/capi-appfw-package-manager/capi-appfw-package-manager.inc index 91326b70..cca210aa 100644 --- a/recipes-tizen/capi-appfw-package-manager/capi-appfw-package-manager.inc +++ b/recipes-tizen/capi-appfw-package-manager/capi-appfw-package-manager.inc @@ -29,8 +29,9 @@ DEPENDS = "" inherit tizen_cmake DEPENDS += "pkgmgr" DEPENDS += "tizen-platform-config" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "pkgmgr-info" +DEPENDS += "aul" DEPENDS += "ail" DEPENDS += "dlog" DEPENDS += "vconf" diff --git a/recipes-tizen/capi-content-media-content/capi-content-media-content.inc b/recipes-tizen/capi-content-media-content/capi-content-media-content.inc index 6249aca3..e135749d 100644 --- a/recipes-tizen/capi-content-media-content/capi-content-media-content.inc +++ b/recipes-tizen/capi-content-media-content/capi-content-media-content.inc @@ -29,6 +29,7 @@ DEPENDS = "" DEPENDS += "libmedia-thumbnail" inherit tizen_cmake DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "media-server" DEPENDS += "capi-base-common" diff --git a/recipes-tizen/capi-location-manager/capi-location-manager.inc b/recipes-tizen/capi-location-manager/capi-location-manager.inc index ea1c2d18..8cb32ccf 100644 --- a/recipes-tizen/capi-location-manager/capi-location-manager.inc +++ b/recipes-tizen/capi-location-manager/capi-location-manager.inc @@ -26,8 +26,9 @@ RDEPENDS_${PN}-dev += "capi-location-manager" DEPENDS = "" #DEPENDS of capi-location-manager -inherit tizen_cmake DEPENDS += "capi-base-common" +inherit tizen_cmake +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "libslp-location" diff --git a/recipes-tizen/capi-media-image-util/capi-media-image-util.inc b/recipes-tizen/capi-media-image-util/capi-media-image-util.inc index 59c6f68b..ee48c5ea 100644 --- a/recipes-tizen/capi-media-image-util/capi-media-image-util.inc +++ b/recipes-tizen/capi-media-image-util/capi-media-image-util.inc @@ -34,6 +34,7 @@ inherit tizen_cmake #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "libmm-common" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "libmm-utility" DEPENDS += "capi-base-common" diff --git a/recipes-tizen/capi-media-sound-manager/capi-media-sound-manager.inc b/recipes-tizen/capi-media-sound-manager/capi-media-sound-manager.inc index 8c8a059e..d4a60601 100644 --- a/recipes-tizen/capi-media-sound-manager/capi-media-sound-manager.inc +++ b/recipes-tizen/capi-media-sound-manager/capi-media-sound-manager.inc @@ -28,9 +28,10 @@ DEPENDS = "" #DEPENDS of capi-media-sound-manager DEPENDS += "libmm-sound" inherit tizen_cmake -DEPENDS += "libmm-session" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "capi-base-common" +DEPENDS += "libmm-session" do_prep() { cd ${S} diff --git a/recipes-tizen/capi-media-wav-player/capi-media-wav-player.inc b/recipes-tizen/capi-media-wav-player/capi-media-wav-player.inc index 3055c9bb..13be1e8f 100644 --- a/recipes-tizen/capi-media-wav-player/capi-media-wav-player.inc +++ b/recipes-tizen/capi-media-wav-player/capi-media-wav-player.inc @@ -26,11 +26,12 @@ RDEPENDS_${PN}-dev += "capi-media-wav-player" DEPENDS = "" #DEPENDS of capi-media-wav-player -DEPENDS += "capi-media-sound-manager" DEPENDS += "libmm-sound" inherit tizen_cmake -DEPENDS += "capi-base-common" +DEPENDS += "capi-media-sound-manager" +inherit pkgconfig DEPENDS += "dlog" +DEPENDS += "capi-base-common" do_prep() { cd ${S} diff --git a/recipes-tizen/capi-network-bluetooth/capi-network-bluetooth.inc b/recipes-tizen/capi-network-bluetooth/capi-network-bluetooth.inc index dc88eee2..384b8204 100644 --- a/recipes-tizen/capi-network-bluetooth/capi-network-bluetooth.inc +++ b/recipes-tizen/capi-network-bluetooth/capi-network-bluetooth.inc @@ -27,6 +27,7 @@ RDEPENDS_${PN}-dev += "capi-network-bluetooth" DEPENDS = "" #DEPENDS of capi-network-bluetooth inherit tizen_cmake +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "capi-base-common" diff --git a/recipes-tizen/capi-network-connection/capi-network-connection.inc b/recipes-tizen/capi-network-connection/capi-network-connection.inc index 9afd6243..5dc2255a 100644 --- a/recipes-tizen/capi-network-connection/capi-network-connection.inc +++ b/recipes-tizen/capi-network-connection/capi-network-connection.inc @@ -27,6 +27,7 @@ RDEPENDS_${PN}-dev += "capi-network-connection" DEPENDS = "" #DEPENDS of capi-network-connection inherit tizen_cmake +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "capi-base-common" diff --git a/recipes-tizen/capi-network-nfc/capi-network-nfc.inc b/recipes-tizen/capi-network-nfc/capi-network-nfc.inc index 5f2d0003..0aea26bf 100644 --- a/recipes-tizen/capi-network-nfc/capi-network-nfc.inc +++ b/recipes-tizen/capi-network-nfc/capi-network-nfc.inc @@ -31,6 +31,7 @@ DEPENDS = "" #DEPENDS of capi-network-nfc inherit tizen_cmake DEPENDS += "vconf" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "capi-base-common" diff --git a/recipes-tizen/capi-network-tethering/capi-network-tethering.inc b/recipes-tizen/capi-network-tethering/capi-network-tethering.inc index ff23f3da..31fcfc8a 100644 --- a/recipes-tizen/capi-network-tethering/capi-network-tethering.inc +++ b/recipes-tizen/capi-network-tethering/capi-network-tethering.inc @@ -27,6 +27,7 @@ RDEPENDS_${PN}-dev += "capi-network-tethering" DEPENDS = "" #DEPENDS of capi-network-tethering inherit tizen_cmake +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "capi-base-common" diff --git a/recipes-tizen/capi-network-wifi/capi-network-wifi.inc b/recipes-tizen/capi-network-wifi/capi-network-wifi.inc index 55e54746..084bee07 100644 --- a/recipes-tizen/capi-network-wifi/capi-network-wifi.inc +++ b/recipes-tizen/capi-network-wifi/capi-network-wifi.inc @@ -27,6 +27,7 @@ RDEPENDS_${PN}-dev += "capi-network-wifi" DEPENDS = "" #DEPENDS of capi-network-wifi inherit tizen_cmake +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "capi-base-common" diff --git a/recipes-tizen/capi-system-device/capi-system-device.inc b/recipes-tizen/capi-system-device/capi-system-device.inc index 7ce6cdd8..e382722c 100644 --- a/recipes-tizen/capi-system-device/capi-system-device.inc +++ b/recipes-tizen/capi-system-device/capi-system-device.inc @@ -26,10 +26,11 @@ RDEPENDS_${PN}-dev += "capi-system-device" DEPENDS = "" #DEPENDS of capi-system-device -DEPENDS += "system-server" inherit tizen_cmake -DEPENDS += "capi-base-common" +inherit pkgconfig DEPENDS += "dlog" +DEPENDS += "system-server" +DEPENDS += "capi-base-common" DEPENDS += "vconf" do_prep() { diff --git a/recipes-tizen/capi-system-info/capi-system-info.inc b/recipes-tizen/capi-system-info/capi-system-info.inc index 8bfb2d93..08b1874a 100644 --- a/recipes-tizen/capi-system-info/capi-system-info.inc +++ b/recipes-tizen/capi-system-info/capi-system-info.inc @@ -27,12 +27,13 @@ RDEPENDS_${PN}-dev += "capi-system-info" DEPENDS = "" #DEPENDS of capi-system-info inherit tizen_cmake -DEPENDS += "dlog" DEPENDS += "libxml2" +inherit pkgconfig DEPENDS += "iniparser" -DEPENDS += "capi-base-common" +DEPENDS += "dlog" DEPENDS += "ecore" DEPENDS += "vconf" +DEPENDS += "capi-base-common" do_prep() { cd ${S} diff --git a/recipes-tizen/capi-system-power/capi-system-power.inc b/recipes-tizen/capi-system-power/capi-system-power.inc index d0d03a3b..ef362b14 100644 --- a/recipes-tizen/capi-system-power/capi-system-power.inc +++ b/recipes-tizen/capi-system-power/capi-system-power.inc @@ -27,6 +27,7 @@ RDEPENDS_${PN}-dev += "capi-system-power" DEPENDS = "" #DEPENDS of capi-system-power inherit tizen_cmake +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "system-server" diff --git a/recipes-tizen/capi-system-runtime-info/capi-system-runtime-info.inc b/recipes-tizen/capi-system-runtime-info/capi-system-runtime-info.inc index 3f0755da..b1df93e0 100644 --- a/recipes-tizen/capi-system-runtime-info/capi-system-runtime-info.inc +++ b/recipes-tizen/capi-system-runtime-info/capi-system-runtime-info.inc @@ -27,10 +27,11 @@ RDEPENDS_${PN}-dev += "capi-system-runtime-info" DEPENDS = "" #DEPENDS of capi-system-runtime-info +DEPENDS += "capi-base-common" inherit tizen_cmake -DEPENDS += "vconf" +inherit pkgconfig DEPENDS += "dlog" -DEPENDS += "capi-base-common" +DEPENDS += "vconf" do_prep() { cd ${S} diff --git a/recipes-tizen/capi-system-sensor/capi-system-sensor.inc b/recipes-tizen/capi-system-sensor/capi-system-sensor.inc index 086781b3..faf982cd 100644 --- a/recipes-tizen/capi-system-sensor/capi-system-sensor.inc +++ b/recipes-tizen/capi-system-sensor/capi-system-sensor.inc @@ -28,8 +28,9 @@ DEPENDS = "" #DEPENDS of capi-system-sensor DEPENDS += "sensor" inherit tizen_cmake -DEPENDS += "capi-base-common" +inherit pkgconfig DEPENDS += "dlog" +DEPENDS += "capi-base-common" do_prep() { cd ${S} diff --git a/recipes-tizen/capi-system-system-settings/capi-system-system-settings.inc b/recipes-tizen/capi-system-system-settings/capi-system-system-settings.inc index 2fd84294..73c561c4 100644 --- a/recipes-tizen/capi-system-system-settings/capi-system-system-settings.inc +++ b/recipes-tizen/capi-system-system-settings/capi-system-system-settings.inc @@ -30,6 +30,7 @@ DEPENDS = "" inherit tizen_cmake DEPENDS += "fontconfig" DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "app-core" DEPENDS += "capi-base-common" diff --git a/recipes-tizen/capi-web-favorites/capi-web-favorites.inc b/recipes-tizen/capi-web-favorites/capi-web-favorites.inc index 6b85a687..aeba0ca9 100644 --- a/recipes-tizen/capi-web-favorites/capi-web-favorites.inc +++ b/recipes-tizen/capi-web-favorites/capi-web-favorites.inc @@ -32,6 +32,7 @@ DEPENDS = "" inherit tizen_cmake DEPENDS += "evas" DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "capi-base-common" DEPENDS += "libslp-db-util" diff --git a/recipes-tizen/capi-web-url-download/capi-web-url-download.inc b/recipes-tizen/capi-web-url-download/capi-web-url-download.inc index d1b4d343..b7c67daa 100644 --- a/recipes-tizen/capi-web-url-download/capi-web-url-download.inc +++ b/recipes-tizen/capi-web-url-download/capi-web-url-download.inc @@ -26,11 +26,12 @@ RDEPENDS_${PN}-dev += "capi-web-url-download" DEPENDS = "" #DEPENDS of capi-web-url-download +inherit tizen_cmake +inherit pkgconfig DEPENDS += "bundle" DEPENDS += "download-provider" -inherit tizen_cmake -DEPENDS += "capi-base-common" DEPENDS += "dlog" +DEPENDS += "capi-base-common" do_prep() { cd ${S} diff --git a/recipes-tizen/contacts-service/contacts-service.inc b/recipes-tizen/contacts-service/contacts-service.inc index 708a5a70..02659b4a 100644 --- a/recipes-tizen/contacts-service/contacts-service.inc +++ b/recipes-tizen/contacts-service/contacts-service.inc @@ -44,12 +44,13 @@ DEPENDS += "libaccounts-svc" inherit tizen_cmake DEPENDS += "capi-media-image-util" DEPENDS += "tizen-platform-config" -DEPENDS += "security-server" -DEPENDS += "libtapi" +inherit pkgconfig +DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "libexif" DEPENDS += "smack" -DEPENDS += "dlog" +DEPENDS += "libtapi" +DEPENDS += "security-server" DEPENDS += "sqlite3" DEPENDS += "capi-base-common" DEPENDS += "badge" diff --git a/recipes-tizen/crosswalk/crosswalk.inc b/recipes-tizen/crosswalk/crosswalk.inc index 22d3b6cc..0f8cf385 100644 --- a/recipes-tizen/crosswalk/crosswalk.inc +++ b/recipes-tizen/crosswalk/crosswalk.inc @@ -35,6 +35,7 @@ DEPENDS += "bzip2" DEPENDS += "nss" DEPENDS += "alsa-lib" DEPENDS += "elfutils" +inherit pkgconfig DEPENDS += "fontconfig" DEPENDS += "system-server" DEPENDS += "wayland" @@ -235,7 +236,7 @@ pkg_postinst_${PN}() { pkg_prerm_${PN}() { #!/bin/sh -e - if [ $1 -eq 0 ] ; then + if [ $1 -eq 1 ] ; then # don't remove if we are upgrade the rpm package [ -L /etc/package-manager/backendlib/libxpk.so ] && rm /etc/package-manager/backendlib/libxpk.so [ -L /etc/package-manager/backendlib/libwgt.so ] && rm /etc/package-manager/backendlib/libwgt.so diff --git a/recipes-tizen/download-provider/download-provider.inc b/recipes-tizen/download-provider/download-provider.inc index f19139eb..0af444f2 100644 --- a/recipes-tizen/download-provider/download-provider.inc +++ b/recipes-tizen/download-provider/download-provider.inc @@ -33,27 +33,28 @@ RDEPENDS_${PN}-dev += "download-provider" DEPENDS = "" #DEPENDS of download-provider -DEPENDS += "libwifi-direct" +DEPENDS += "dlog" +DEPENDS += "xdgmime" +DEPENDS += "systemd" inherit tizen_cmake +DEPENDS += "notification" +DEPENDS += "app-svc" +inherit pkgconfig #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext -DEPENDS += "capi-appfw-app-manager" -DEPENDS += "capi-network-connection" -DEPENDS += "tizen-platform-config" -DEPENDS += "app-svc" -DEPENDS += "smack" -DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "libsoup-2.4" -DEPENDS += "systemd" -DEPENDS += "bundle" -DEPENDS += "notification" DEPENDS += "sqlite3" -DEPENDS += "xdgmime" DEPENDS += "libprivilege-control" +DEPENDS += "capi-appfw-app-manager" +DEPENDS += "tizen-platform-config" +DEPENDS += "bundle" +DEPENDS += "smack" +DEPENDS += "vconf" +DEPENDS += "libwifi-direct" +DEPENDS += "capi-network-connection" DEPENDS_append_class-native = " fdupes-native" DEPENDS_append_class-target = " fdupes-native" -DEPENDS += "vconf" DEPENDS += "capi-base-common" do_prep() { diff --git a/recipes-tizen/drm-client/drm-client.inc b/recipes-tizen/drm-client/drm-client.inc index f925bb25..1e1939a4 100644 --- a/recipes-tizen/drm-client/drm-client.inc +++ b/recipes-tizen/drm-client/drm-client.inc @@ -26,10 +26,11 @@ RDEPENDS_${PN}-dev += "drm-client" DEPENDS = "" #DEPENDS of drm-client +DEPENDS += "glib-2.0" inherit tizen_cmake -DEPENDS += "capi-base-common" +inherit pkgconfig DEPENDS += "dlog" -DEPENDS += "glib-2.0" +DEPENDS += "capi-base-common" do_prep() { cd ${S} diff --git a/recipes-tizen/evolution-data-server/evolution-data-server.inc b/recipes-tizen/evolution-data-server/evolution-data-server.inc index 74c48ee2..94ecba39 100644 --- a/recipes-tizen/evolution-data-server/evolution-data-server.inc +++ b/recipes-tizen/evolution-data-server/evolution-data-server.inc @@ -81,11 +81,11 @@ DEPENDS_append_class-target = " intltool-native" DEPENDS += "gnome-common" DEPENDS += "gperf" DEPENDS += "nss" -DEPENDS += "eglibc-locale" +DEPENDS += "vala" DEPENDS += "db" #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext -DEPENDS += "libical" +inherit pkgconfig DEPENDS += "libsoup-2.4" inherit pythonnative DEPENDS += "gcr" @@ -94,7 +94,7 @@ DEPENDS += "icu" DEPENDS += "sqlite3" DEPENDS_append_class-native = " fdupes-native" DEPENDS_append_class-target = " fdupes-native" -DEPENDS += "vala" +DEPENDS += "libical" DEPENDS += "gtk-doc" do_prep() { diff --git a/recipes-tizen/festival/festival-extraconf.inc b/recipes-tizen/festival/festival-extraconf.inc index 9634a561..9a7be745 100644 --- a/recipes-tizen/festival/festival-extraconf.inc +++ b/recipes-tizen/festival/festival-extraconf.inc @@ -1,6 +1,6 @@ do_prep_prepend() { pushd ${S}/../ - ln -s ${S} festival-2.1 + ln -sf ${S} festival-2.1 popd } @@ -32,9 +32,9 @@ do_compile() { --datadir=${prefix}/share/festival \ --sysconfdir=${sysconfdir} - make CC="i586-poky-linux-gcc -fPIC $RPM_OPT_FLAGS" CXX="i586-poky-linux-g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" + make CC="i586-oe-linux-gcc -fPIC $RPM_OPT_FLAGS" CXX="i586-oe-linux-g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" cd ../festival-2.1 - make CC="i586-poky-linux-gcc -fPIC $RPM_OPT_FLAGS" CXX="i586-poky-linux-g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" + make CC="i586-oe-linux-gcc -fPIC $RPM_OPT_FLAGS" CXX="i586-oe-linux-g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" make doc -}
\ No newline at end of file +} diff --git a/recipes-tizen/festival/festival.inc b/recipes-tizen/festival/festival.inc index cfdf83ed..fd1b3547 100644 --- a/recipes-tizen/festival/festival.inc +++ b/recipes-tizen/festival/festival.inc @@ -27,6 +27,7 @@ RDEPENDS_${PN}-dev += "festival" DEPENDS = "" #DEPENDS of festival DEPENDS += "ncurses" +inherit pkgconfig do_prep() { cd ${S} diff --git a/recipes-tizen/gcr/gcr.inc b/recipes-tizen/gcr/gcr.inc index 864a8a24..c98abc08 100644 --- a/recipes-tizen/gcr/gcr.inc +++ b/recipes-tizen/gcr/gcr.inc @@ -71,6 +71,7 @@ DEPENDS += "p11-kit" DEPENDS += "gnome-common" DEPENDS += "dbus" DEPENDS += "libtasn1" +inherit pkgconfig DEPENDS += "gpg2" DEPENDS += "glib-2.0" DEPENDS += "update-desktop-files" diff --git a/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc b/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc index 3986e2e7..a258991c 100644 --- a/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc +++ b/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc @@ -36,6 +36,7 @@ inherit tizen_cmake inherit pythonnative DEPENDS += "dbus" DEPENDS += "zlib" +inherit pkgconfig DEPENDS += "CommonAPI" DEPENDS_append_class-native = " bison-native" DEPENDS_append_class-target = " bison-native" diff --git a/recipes-tizen/gobject-introspection/gobject-introspection.inc b/recipes-tizen/gobject-introspection/gobject-introspection.inc index 3268c5de..624d2833 100644 --- a/recipes-tizen/gobject-introspection/gobject-introspection.inc +++ b/recipes-tizen/gobject-introspection/gobject-introspection.inc @@ -52,6 +52,7 @@ DEPENDS = "" DEPENDS += "flex" inherit pythonnative DEPENDS += "cairo" +inherit pkgconfig DEPENDS += "python-xml" DEPENDS_append_class-native = " libtool" DEPENDS_append_class-target = " libtool-cross" diff --git a/recipes-tizen/heynoti/heynoti.inc b/recipes-tizen/heynoti/heynoti.inc index c2994a3e..7c7b329f 100644 --- a/recipes-tizen/heynoti/heynoti.inc +++ b/recipes-tizen/heynoti/heynoti.inc @@ -26,11 +26,12 @@ RDEPENDS_${PN}-dev += "heynoti" DEPENDS = "" #DEPENDS of heynoti -DEPENDS += "ecore" -DEPENDS += "tizen-platform-config" inherit tizen_cmake +DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" +DEPENDS += "ecore" do_prep() { cd ${S} 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 3d37e167..5c8937ca 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,11 +24,12 @@ RDEPENDS_${PN} += "ico-uxf-weston-plugin" DEPENDS = "" #DEPENDS of ico-uxf-device-input-controller +DEPENDS += "ico-uxf-utilities" +inherit pkgconfig +DEPENDS += "glib-2.0" DEPENDS += "wayland" DEPENDS += "mesa" 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 51e337b5..ead093d8 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 @@ -43,10 +43,11 @@ DEPENDS += "evas" DEPENDS += "tizen-platform-config" DEPENDS += "pulseaudio" DEPENDS += "capi-appfw-application" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "bundle" DEPENDS += "glib-2.0" DEPENDS += "eina" +DEPENDS += "aul" DEPENDS += "elementary" DEPENDS += "ecore" DEPENDS += "dbus" diff --git a/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc b/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc index 6e30ecc5..fdedc05c 100644 --- a/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc +++ b/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc @@ -60,11 +60,12 @@ DEPENDS += "edje" DEPENDS += "genivi-shell" DEPENDS += "pkgmgr" DEPENDS += "capi-appfw-application" +DEPENDS += "aul" DEPENDS += "eina" DEPENDS += "json-glib" DEPENDS += "notification" DEPENDS += "app-svc" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "wayland" DEPENDS += "boost" diff --git a/recipes-tizen/ico-uxf-utilities/ico-uxf-utilities.inc b/recipes-tizen/ico-uxf-utilities/ico-uxf-utilities.inc index 9871bed0..7ed2d8fd 100644 --- a/recipes-tizen/ico-uxf-utilities/ico-uxf-utilities.inc +++ b/recipes-tizen/ico-uxf-utilities/ico-uxf-utilities.inc @@ -33,6 +33,7 @@ DEPENDS = "" #DEPENDS of ico-uxf-utilities DEPENDS += "libwebsockets" DEPENDS += "edbus" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" 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 312b15af..0edd0b92 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 @@ -26,6 +26,7 @@ DEPENDS = "" DEPENDS += "ico-uxf-utilities" inherit tizen_cmake DEPENDS += "json-c" +inherit pkgconfig DEPENDS += "app-core" DEPENDS += "automotive-message-broker" DEPENDS += "elementary" diff --git a/recipes-tizen/lemolo/lemolo.inc b/recipes-tizen/lemolo/lemolo.inc index 5643e994..860296e7 100644 --- a/recipes-tizen/lemolo/lemolo.inc +++ b/recipes-tizen/lemolo/lemolo.inc @@ -31,9 +31,10 @@ DEPENDS += "ofono" DEPENDS += "capi-system-power" DEPENDS += "evas" DEPENDS += "app-svc" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "app-core" DEPENDS += "contacts-service" +DEPENDS += "aul" DEPENDS += "efl" DEPENDS += "notification" DEPENDS += "elementary" diff --git a/recipes-tizen/libaccounts-svc/libaccounts-svc.inc b/recipes-tizen/libaccounts-svc/libaccounts-svc.inc index f2cd5b59..973a451a 100644 --- a/recipes-tizen/libaccounts-svc/libaccounts-svc.inc +++ b/recipes-tizen/libaccounts-svc/libaccounts-svc.inc @@ -36,6 +36,7 @@ inherit tizen_cmake DEPENDS += "libxml2" DEPENDS += "tizen-platform-config" DEPENDS += "capi-appfw-application" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "aul" diff --git a/recipes-tizen/libcom-core/libcom-core.inc b/recipes-tizen/libcom-core/libcom-core.inc index 2f342ed8..904fc9f2 100644 --- a/recipes-tizen/libcom-core/libcom-core.inc +++ b/recipes-tizen/libcom-core/libcom-core.inc @@ -31,6 +31,7 @@ inherit gettext inherit tizen_cmake DEPENDS += "systemd" DEPENDS += "dlog" +inherit pkgconfig DEPENDS += "glib-2.0" do_prep() { diff --git a/recipes-tizen/libdevice-node/libdevice-node.inc b/recipes-tizen/libdevice-node/libdevice-node.inc index 0c1b1b65..35194ee4 100644 --- a/recipes-tizen/libdevice-node/libdevice-node.inc +++ b/recipes-tizen/libdevice-node/libdevice-node.inc @@ -27,8 +27,9 @@ RDEPENDS_${PN}-dev += "libdevice-node" DEPENDS = "" #DEPENDS of libdevice-node inherit tizen_cmake -DEPENDS += "vconf" +inherit pkgconfig DEPENDS += "dlog" +DEPENDS += "vconf" do_prep() { cd ${S} diff --git a/recipes-tizen/libdrm/libdrm.inc b/recipes-tizen/libdrm/libdrm.inc index 16371f6c..b8502263 100644 --- a/recipes-tizen/libdrm/libdrm.inc +++ b/recipes-tizen/libdrm/libdrm.inc @@ -45,6 +45,7 @@ DEPENDS = "" #DEPENDS of libdrm DEPENDS += "libpciaccess" DEPENDS += "libpthread-stubs" +inherit pkgconfig do_prep() { cd ${S} diff --git a/recipes-tizen/libfeedback/libfeedback.inc b/recipes-tizen/libfeedback/libfeedback.inc index 8ecc993d..397dfe90 100644 --- a/recipes-tizen/libfeedback/libfeedback.inc +++ b/recipes-tizen/libfeedback/libfeedback.inc @@ -51,6 +51,7 @@ DEPENDS += "libmm-sound" inherit tizen_cmake DEPENDS += "libxml2" DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "system-server" diff --git a/recipes-tizen/libmedia-service/libmedia-service.inc b/recipes-tizen/libmedia-service/libmedia-service.inc index d46644c1..ec958395 100644 --- a/recipes-tizen/libmedia-service/libmedia-service.inc +++ b/recipes-tizen/libmedia-service/libmedia-service.inc @@ -36,10 +36,11 @@ DEPENDS += "drm-client" DEPENDS += "libmm-common" DEPENDS += "aul" DEPENDS += "dlog" -DEPENDS += "glib-2.0" +inherit pkgconfig DEPENDS += "libexif" DEPENDS += "media-server" DEPENDS += "sqlite3" +DEPENDS += "glib-2.0" DEPENDS += "libslp-db-util" do_prep() { diff --git a/recipes-tizen/libmedia-thumbnail/libmedia-thumbnail.inc b/recipes-tizen/libmedia-thumbnail/libmedia-thumbnail.inc index 2560fc93..dd1b015b 100644 --- a/recipes-tizen/libmedia-thumbnail/libmedia-thumbnail.inc +++ b/recipes-tizen/libmedia-thumbnail/libmedia-thumbnail.inc @@ -48,8 +48,9 @@ inherit tizen_cmake DEPENDS += "drm-client" DEPENDS += "evas" DEPENDS += "tizen-platform-config" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "dlog" +DEPENDS += "aul" DEPENDS += "libexif" DEPENDS += "libmm-utility" DEPENDS += "media-server" diff --git a/recipes-tizen/libmm-sound/libmm-sound.inc b/recipes-tizen/libmm-sound/libmm-sound.inc index e44c4e78..d0220c00 100644 --- a/recipes-tizen/libmm-sound/libmm-sound.inc +++ b/recipes-tizen/libmm-sound/libmm-sound.inc @@ -48,10 +48,11 @@ DEPENDS += "avsystem" DEPENDS += "libmm-common" DEPENDS += "audio-session-manager" DEPENDS += "libmm-log" -DEPENDS += "security-server" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "system-server" DEPENDS += "vconf" +DEPENDS += "security-server" DEPENDS += "heynoti" DEPENDS += "libmm-session" diff --git a/recipes-tizen/libprivilege-control/libprivilege-control.inc b/recipes-tizen/libprivilege-control/libprivilege-control.inc index fe740bc1..06ce2b7e 100644 --- a/recipes-tizen/libprivilege-control/libprivilege-control.inc +++ b/recipes-tizen/libprivilege-control/libprivilege-control.inc @@ -35,6 +35,7 @@ DEPENDS = "" #DEPENDS of libprivilege-control inherit tizen_cmake DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "libiri" DEPENDS += "smack" diff --git a/recipes-tizen/librua/librua.inc b/recipes-tizen/librua/librua.inc index 4f7f350d..50d71c20 100644 --- a/recipes-tizen/librua/librua.inc +++ b/recipes-tizen/librua/librua.inc @@ -36,6 +36,7 @@ DEPENDS = "" DEPENDS += "sqlite3" DEPENDS += "tizen-platform-config" inherit tizen_cmake +inherit pkgconfig DEPENDS += "libslp-db-util" do_prep() { diff --git a/recipes-tizen/libsecret/libsecret.inc b/recipes-tizen/libsecret/libsecret.inc index ac543ae9..a49b826a 100644 --- a/recipes-tizen/libsecret/libsecret.inc +++ b/recipes-tizen/libsecret/libsecret.inc @@ -45,6 +45,7 @@ inherit gettext DEPENDS_append_class-native = " intltool-native" DEPENDS_append_class-target = " intltool-native" DEPENDS += "vala" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "docbook-xsl-stylesheets" DEPENDS += "gtk-doc-stub" diff --git a/recipes-tizen/libsf-common/libsf-common.inc b/recipes-tizen/libsf-common/libsf-common.inc index 8fb5e8c2..c6f52605 100644 --- a/recipes-tizen/libsf-common/libsf-common.inc +++ b/recipes-tizen/libsf-common/libsf-common.inc @@ -29,6 +29,7 @@ DEPENDS = "" inherit tizen_cmake DEPENDS += "attr" DEPENDS += "dlog" +inherit pkgconfig do_prep() { cd ${S} diff --git a/recipes-tizen/libslp-db-util/libslp-db-util.inc b/recipes-tizen/libslp-db-util/libslp-db-util.inc index 817b5f48..ba4e4921 100644 --- a/recipes-tizen/libslp-db-util/libslp-db-util.inc +++ b/recipes-tizen/libslp-db-util/libslp-db-util.inc @@ -26,11 +26,12 @@ RDEPENDS_${PN}-dev += "libslp-db-util" DEPENDS = "" #DEPENDS of libslp-db-util -DEPENDS += "sqlite3" inherit tizen_cmake -DEPENDS += "icu" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" +DEPENDS += "sqlite3" +DEPENDS += "icu" do_prep() { cd ${S} diff --git a/recipes-tizen/libslp-memo/libslp-memo.inc b/recipes-tizen/libslp-memo/libslp-memo.inc index 6d78b822..16cee0b6 100644 --- a/recipes-tizen/libslp-memo/libslp-memo.inc +++ b/recipes-tizen/libslp-memo/libslp-memo.inc @@ -28,6 +28,7 @@ DEPENDS = "" #DEPENDS of libslp-memo inherit tizen_cmake DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "sqlite3" DEPENDS += "heynoti" diff --git a/recipes-tizen/libtapi/libtapi.inc b/recipes-tizen/libtapi/libtapi.inc index 1299eee9..e7cb1e45 100644 --- a/recipes-tizen/libtapi/libtapi.inc +++ b/recipes-tizen/libtapi/libtapi.inc @@ -33,6 +33,7 @@ DEPENDS += "libtapi3" inherit tizen_cmake DEPENDS += "security-server" DEPENDS += "dlog" +inherit pkgconfig DEPENDS += "glib-2.0" do_prep() { diff --git a/recipes-tizen/libtapi3/libtapi3.inc b/recipes-tizen/libtapi3/libtapi3.inc index b8bbee4a..0420dad4 100644 --- a/recipes-tizen/libtapi3/libtapi3.inc +++ b/recipes-tizen/libtapi3/libtapi3.inc @@ -28,9 +28,10 @@ DEPENDS = "" #DEPENDS of libtapi3 inherit tizen_cmake inherit pythonnative -DEPENDS += "security-server" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" +DEPENDS += "security-server" DEPENDS += "python-xml" do_prep() { diff --git a/recipes-tizen/libwebsockets/libwebsockets.inc b/recipes-tizen/libwebsockets/libwebsockets.inc index 87c0ebe9..1dc8ca41 100644 --- a/recipes-tizen/libwebsockets/libwebsockets.inc +++ b/recipes-tizen/libwebsockets/libwebsockets.inc @@ -33,6 +33,7 @@ DEPENDS += "systemd" DEPENDS += "zlib" inherit tizen_cmake DEPENDS += "openssl" +inherit pkgconfig do_prep() { cd ${S} diff --git a/recipes-tizen/libwifi-direct/libwifi-direct.inc b/recipes-tizen/libwifi-direct/libwifi-direct.inc index 1f6fb07c..5fa5245d 100644 --- a/recipes-tizen/libwifi-direct/libwifi-direct.inc +++ b/recipes-tizen/libwifi-direct/libwifi-direct.inc @@ -26,12 +26,13 @@ RDEPENDS_${PN}-dev += "libwifi-direct" DEPENDS = "" #DEPENDS of libwifi-direct +inherit tizen_cmake +inherit pkgconfig #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext -inherit tizen_cmake DEPENDS += "dlog" -DEPENDS += "dbus-glib" DEPENDS += "vconf" +DEPENDS += "dbus-glib" do_prep() { cd ${S} diff --git a/recipes-tizen/message-port/message-port.inc b/recipes-tizen/message-port/message-port.inc index 19f37322..5da9004a 100644 --- a/recipes-tizen/message-port/message-port.inc +++ b/recipes-tizen/message-port/message-port.inc @@ -42,9 +42,10 @@ RDEPENDS_${PN}-tests += "libmessage-port" DEPENDS = "" #DEPENDS of libmessage-port #DEPENDS of message-port -DEPENDS += "dlog" -DEPENDS += "aul" DEPENDS += "pkgmgr-info" +DEPENDS += "aul" +inherit pkgconfig +DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "bundle" diff --git a/recipes-tizen/msg-service/msg-service.inc b/recipes-tizen/msg-service/msg-service.inc index dcb8090b..2dfd75b4 100644 --- a/recipes-tizen/msg-service/msg-service.inc +++ b/recipes-tizen/msg-service/msg-service.inc @@ -60,19 +60,20 @@ DEPENDS = "" #DEPENDS of msg-service DEPENDS += "libxml2" DEPENDS += "capi-appfw-application" +DEPENDS += "aul" DEPENDS += "contacts-service" DEPENDS += "curl" DEPENDS += "libmm-session" -DEPENDS += "libmm-fileinfo" +DEPENDS += "system-server" DEPENDS += "systemd" inherit tizen_cmake DEPENDS += "drm-client" DEPENDS += "notification" DEPENDS += "app-svc" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" -DEPENDS += "system-server" +DEPENDS += "libmm-fileinfo" DEPENDS += "alarm-manager" DEPENDS += "sensor" DEPENDS += "libwbxml2" diff --git a/recipes-tizen/murphy/murphy.inc b/recipes-tizen/murphy/murphy.inc index 10369ef6..50248998 100644 --- a/recipes-tizen/murphy/murphy.inc +++ b/recipes-tizen/murphy/murphy.inc @@ -16,6 +16,10 @@ PROVIDES = "" PROVIDES += "murphy-dev" +#PROVIDES by murphy-core +PROVIDES += "murphy-core" + + #PROVIDES by murphy-ecore PROVIDES += "murphy-ecore" @@ -51,6 +55,17 @@ PROVIDES += "murphy-tests" PROVIDES += "murphy-gam" +#PROVIDES by murphy-system-controller +PROVIDES += "murphy-system-controller" +# the PROVIDES rules is ignore "system-controller " +PROVIDES += "system-controller" +RPROVIDES_murphy-system-controller += "system-controller" + + +#PROVIDES by murphy-plugins-base +PROVIDES += "murphy-plugins-base" + + #PROVIDES by murphy-glib PROVIDES += "murphy-glib" @@ -65,16 +80,17 @@ PROVIDES += "murphy-ecore-dev" RDEPENDS = "" #RDEPENDS of murphy-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "murphy-core" RDEPENDS_${PN}-dev += "json-c" -RDEPENDS_${PN}-dev += "murphy" #RDEPENDS of murphy-ecore (${PN}-ecore) -RDEPENDS_${PN}-ecore += "murphy" +RDEPENDS_${PN}-ecore += "murphy-core" #RDEPENDS of murphy-pulse (${PN}-pulse) -RDEPENDS_${PN}-pulse += "murphy" +RDEPENDS_${PN}-pulse += "murphy-core" #RDEPENDS of murphy (${PN}) +RDEPENDS_${PN} += "murphy-core" RDEPENDS_${PN} += "libcap" RDEPENDS_${PN} += "/bin/systemctl" @@ -82,25 +98,33 @@ RDEPENDS_${PN} += "/bin/systemctl" RDEPENDS_${PN}-gam-dev += "murphy-gam" #RDEPENDS of murphy-pulse-dev (${PN}-pulse-dev) +RDEPENDS_${PN}-pulse-dev += "murphy-core" RDEPENDS_${PN}-pulse-dev += "murphy-pulse" -RDEPENDS_${PN}-pulse-dev += "murphy" #RDEPENDS of murphy-tests (${PN}-tests) +RDEPENDS_${PN}-tests += "murphy-core" RDEPENDS_${PN}-tests += "murphy" #RDEPENDS of murphy-gam (${PN}-gam) RDEPENDS_${PN}-gam += "murphy" +#RDEPENDS of murphy-system-controller (${PN}-system-controller) +#RDEPENDS_${PN}-system-controller += "ico-uxf-homescreen" + +#RDEPENDS of murphy-plugins-base (${PN}-plugins-base) +RDEPENDS_${PN}-plugins-base += "murphy-core" +RDEPENDS_${PN}-plugins-base += "murphy" + #RDEPENDS of murphy-glib (${PN}-glib) -RDEPENDS_${PN}-glib += "murphy" +RDEPENDS_${PN}-glib += "murphy-core" #RDEPENDS of murphy-glib-dev (${PN}-glib-dev) -RDEPENDS_${PN}-glib-dev += "murphy" +RDEPENDS_${PN}-glib-dev += "murphy-core" RDEPENDS_${PN}-glib-dev += "murphy-glib" #RDEPENDS of murphy-ecore-dev (${PN}-ecore-dev) +RDEPENDS_${PN}-ecore-dev += "murphy-core" RDEPENDS_${PN}-ecore-dev += "murphy-ecore" -RDEPENDS_${PN}-ecore-dev += "murphy" DEPENDS = "" @@ -110,8 +134,9 @@ DEPENDS += "ofono" DEPENDS += "json-c" DEPENDS += "libxml2" DEPENDS += "audio-session-manager" -DEPENDS += "systemd" DEPENDS += "aul" +DEPENDS += "systemd" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "lua" DEPENDS += "libcap" @@ -134,9 +159,7 @@ do_prep() { chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q cp ${S}/packaging/murphy.manifest . - - echo "_with_icosyscon: \"0\"" - echo "_enable_icosyscon: \"0\"" + echo "Build with icosyscon" } @@ -177,7 +200,7 @@ do_compile() { CONFIG_OPTIONS="$CONFIG_OPTIONS --enable-smack" - CONFIG_OPTIONS="$CONFIG_OPTIONS --disable-system-controller" + CONFIG_OPTIONS="$CONFIG_OPTIONS --enable-system-controller" CONFIG_OPTIONS="$CONFIG_OPTIONS --enable-system-monitor" @@ -255,8 +278,11 @@ do_install() { # Copy the systemd files in place. mkdir -p ${D}${systemd_unitdir}/system - mkdir -p ${D}${systemd_unitdir}/user cp packaging.in/murphyd.service ${D}${systemd_unitdir}/system + mkdir -p ${D}${systemd_unitdir}/user + cp packaging.in/ico-homescreen.service ${D}${systemd_unitdir}/user + cp packaging.in/murphy-wait-for-launchpad-ready.path \ + ${D}${systemd_unitdir}/user mkdir -p ${D}${sysconfdir}/dbus-1/system.d sed "s/@TZ_SYS_USER_GROUP@/users/g" \ @@ -309,6 +335,32 @@ pkg_postinst_${PN}() { } +pkg_postinst_${PN}() { + #!/bin/sh -e + + ldconfig + +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + # prevent system controller from starting + rm -f ${systemd_unitdir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path + # instead launch just ico-homescreen + rm -f ${systemd_unitdir}/user/weston.target.wants/murphy-wait-for-launchpad-ready.path + ln -s ${systemd_unitdir}/user/murphy-wait-for-launchpad-ready.path \ + ${systemd_unitdir}/user/weston.target.wants/murphy-wait-for-launchpad-ready.path + +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + ldconfig + +} + pkg_postrm_${PN}() { #!/bin/sh -e @@ -320,6 +372,19 @@ pkg_postrm_${PN}() { #!/bin/sh -e if [ "$1" = "0" ]; then + rm -f ${systemd_unitdir}/user/weston.target.wants/murphy-wait-for-launchpad-ready.path + if [ -f ${systemd_unitdir}/user/ico-uxf-wait-launchpad-ready.path ]; then + ln -sf ${systemd_unitdir}/user/ico-uxf-wait-launchpad-ready.path \ + ${systemd_unitdir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path + fi + fi + +} + +pkg_postrm_${PN}() { + #!/bin/sh -e + + if [ "$1" = "0" ]; then /bin/systemctl disable murphyd.service fi ldconfig @@ -347,19 +412,50 @@ pkg_postrm_${PN}() { } +pkg_postrm_${PN}() { + #!/bin/sh -e + + ldconfig + +} + +pkg_postrm_${PN}() { + #!/bin/sh -e + + ldconfig + +} + PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " murphy-core " PACKAGES += " murphy-dev " PACKAGES += " murphy-ecore " +PACKAGES += " murphy-gam-dev " PACKAGES += " murphy-pulse " PACKAGES += " murphy " PACKAGES += " murphy-ivi-resource-manager " -PACKAGES += " murphy-glib-dev " PACKAGES += " murphy-ecore-dev " PACKAGES += " murphy-pulse-dev " PACKAGES += " murphy-tests " PACKAGES += " murphy-gam " +PACKAGES += " murphy-system-controller " PACKAGES += " murphy-glib " -PACKAGES += " murphy-gam-dev " +PACKAGES += " murphy-glib-dev " +PACKAGES += " murphy-plugins-base " + +murphy-core_files = "" +murphy-core_files += "${prefix}/lib/libmurphy-common.so.*" +murphy-core_files += "${prefix}/lib/libmurphy-core.so.*" +murphy-core_files += "${prefix}/lib/libmurphy-resolver.so.*" +murphy-core_files += "${prefix}/lib/libmurphy-resource.so.*" +murphy-core_files += "${prefix}/lib/libmurphy-resource-backend.so.*" +murphy-core_files += "${prefix}/lib/libmurphy-lua-utils.so.*" +murphy-core_files += "${prefix}/lib/libmurphy-lua-decision.so.*" +murphy-core_files += "${prefix}/lib/libmurphy-domain-controller.so.*" +murphy-core_files += "${prefix}/lib/murphy/*.so.*" +murphy-core_files += "${prefix}/lib/libbreedline*.so.*" +murphy-core_files += "${prefix}/lib/libmurphy-libdbus.so.*" +murphy-core_files += "${prefix}/lib/libmurphy-dbus-libdbus.so.*" murphy-dev_files = "" murphy-dev_files += "${prefix}/include/murphy-db" @@ -392,16 +488,21 @@ murphy-ecore_files = "" murphy-ecore_files += "${prefix}/lib/libmurphy-ecore.so.*" MANIFESTFILES_${PN}-ecore = "murphy.manifest" +murphy-gam-dev_files = "" +murphy-gam-dev_files += "${prefix}/bin/decision-test" +murphy-gam-dev_files += "${prefix}/bin/pattern-generator" +murphy-gam-dev_files += "${prefix}/lib/libmurphy-decision-tree.so" + murphy-pulse_files = "" murphy-pulse_files += "${prefix}/lib/libmurphy-pulse.so.*" MANIFESTFILES_${PN}-pulse = "murphy.manifest" murphy-doc_files = "" -murphy-doc_files += "${prefix}/share/doc/packages/../murphy/AUTHORS" -murphy-doc_files += "${prefix}/share/doc/packages/../murphy/CODING-STYLE" -murphy-doc_files += "${prefix}/share/doc/packages/../murphy/ChangeLog" -murphy-doc_files += "${prefix}/share/doc/packages/../murphy/NEWS" -murphy-doc_files += "${prefix}/share/doc/packages/../murphy/README" +murphy-doc_files += "${prefix}/share/doc/murphy/AUTHORS" +murphy-doc_files += "${prefix}/share/doc/murphy/CODING-STYLE" +murphy-doc_files += "${prefix}/share/doc/murphy/ChangeLog" +murphy-doc_files += "${prefix}/share/doc/murphy/NEWS" +murphy-doc_files += "${prefix}/share/doc/murphy/README" murphy_files = "" murphy_files += "${prefix}/bin/murphyd" @@ -412,21 +513,6 @@ murphy_files += "${prefix}/sbin/asm-bridge" murphy_files += "${sysconfdir}/dbus-1/system.d" murphy_files += "${sysconfdir}/dbus-1/system.d/org.Murphy.conf" murphy_files += "${prefix}/share/murphy" -murphy_files += "${prefix}/lib/libmurphy-common.so.*" -murphy_files += "${prefix}/lib/libmurphy-core.so.*" -murphy_files += "${prefix}/lib/libmurphy-resolver.so.*" -murphy_files += "${prefix}/lib/libmurphy-resource.so.*" -murphy_files += "${prefix}/lib/libmurphy-resource-backend.so.*" -murphy_files += "${prefix}/lib/libmurphy-lua-utils.so.*" -murphy_files += "${prefix}/lib/libmurphy-lua-decision.so.*" -murphy_files += "${prefix}/lib/libmurphy-domain-controller.so.*" -murphy_files += "${prefix}/lib/murphy/*.so.*" -murphy_files += "${prefix}/lib/libbreedline*.so.*" -murphy_files += "${prefix}/lib/libmurphy-libdbus.so.*" -murphy_files += "${prefix}/lib/libmurphy-dbus-libdbus.so.*" -murphy_files += "${prefix}/lib/murphy/plugins/plugin-domain-control.so" -murphy_files += "${prefix}/lib/murphy/plugins/plugin-resource-asm.so" -murphy_files += "${prefix}/lib/murphy/plugins/plugin-resource-native.so" CONFFILES_${PN} = "" CONFFILES_${PN} += "${sysconfdir}/murphy" CONFFILES_${PN} += "${sysconfdir}/dbus-1/system.d/org.Murphy.conf" @@ -436,11 +522,6 @@ murphy-ivi-resource-manager_files = "" murphy-ivi-resource-manager_files += "${prefix}/lib/murphy/plugins/plugin-ivi-resource-manager.so" MANIFESTFILES_${PN}-ivi-resource-manager = "murphy.manifest" -murphy-glib-dev_files = "" -murphy-glib-dev_files += "${prefix}/include/murphy/common/glib-glue.h" -murphy-glib-dev_files += "${prefix}/lib/libmurphy-glib.so" -murphy-glib-dev_files += "${prefix}/lib/pkgconfig/murphy-glib.pc" - murphy-ecore-dev_files = "" murphy-ecore-dev_files += "${prefix}/include/murphy/common/ecore-glue.h" murphy-ecore-dev_files += "${prefix}/lib/libmurphy-ecore.so" @@ -464,42 +545,59 @@ murphy-gam_files += "${prefix}/lib/libmurphy-decision-tree.so.*" murphy-gam_files += "${prefix}/lib/libmurphy-decision-tree.so.0.0.0" murphy-gam_files += "${prefix}/lib/murphy/plugins/plugin-gam-resource-manager.so" +murphy-system-controller_files = "" +murphy-system-controller_files += "${prefix}/lib/murphy/plugins/plugin-system-controller.so" +murphy-system-controller_files += "${systemd_unitdir}/user/ico-homescreen.service" +murphy-system-controller_files += "${systemd_unitdir}/user/murphy-wait-for-launchpad-ready.path" +MANIFESTFILES_${PN}-system-controller = "murphy.manifest" + murphy-glib_files = "" murphy-glib_files += "${prefix}/lib/libmurphy-glib.so.*" MANIFESTFILES_${PN}-glib = "murphy.manifest" -murphy-gam-dev_files = "" -murphy-gam-dev_files += "${prefix}/bin/decision-test" -murphy-gam-dev_files += "${prefix}/bin/pattern-generator" -murphy-gam-dev_files += "${prefix}/lib/libmurphy-decision-tree.so" +murphy-glib-dev_files = "" +murphy-glib-dev_files += "${prefix}/include/murphy/common/glib-glue.h" +murphy-glib-dev_files += "${prefix}/lib/libmurphy-glib.so" +murphy-glib-dev_files += "${prefix}/lib/pkgconfig/murphy-glib.pc" + +murphy-plugins-base_files = "" +murphy-plugins-base_files += "${prefix}/lib/murphy/plugins/plugin-domain-control.so" +murphy-plugins-base_files += "${prefix}/lib/murphy/plugins/plugin-resource-asm.so" +murphy-plugins-base_files += "${prefix}/lib/murphy/plugins/plugin-resource-native.so" +FILES_${PN}-core = "${murphy-core_files}" FILES_${PN}-dev = "${murphy-dev_files}" FILES_${PN}-ecore = "${murphy-ecore_files}" +FILES_${PN}-gam-dev = "${murphy-gam-dev_files}" FILES_${PN}-pulse = "${murphy-pulse_files}" FILES_${PN}-doc = "${murphy-doc_files}" FILES_${PN} = "${murphy_files}" FILES_${PN}-ivi-resource-manager = "${murphy-ivi-resource-manager_files}" -FILES_${PN}-glib-dev = "${murphy-glib-dev_files}" FILES_${PN}-ecore-dev = "${murphy-ecore-dev_files}" FILES_${PN}-pulse-dev = "${murphy-pulse-dev_files}" FILES_${PN}-tests = "${murphy-tests_files}" FILES_${PN}-gam = "${murphy-gam_files}" +FILES_${PN}-system-controller = "${murphy-system-controller_files}" FILES_${PN}-glib = "${murphy-glib_files}" -FILES_${PN}-gam-dev = "${murphy-gam-dev_files}" +FILES_${PN}-glib-dev = "${murphy-glib-dev_files}" +FILES_${PN}-plugins-base = "${murphy-plugins-base_files}" +PKG_murphy-core= "murphy-core" PKG_murphy-dev= "murphy-dev" PKG_murphy-ecore= "murphy-ecore" +PKG_murphy-gam-dev= "murphy-gam-dev" PKG_murphy-pulse= "murphy-pulse" PKG_murphy-doc= "murphy-doc" PKG_murphy= "murphy" PKG_murphy-ivi-resource-manager= "murphy-ivi-resource-manager" -PKG_murphy-glib-dev= "murphy-glib-dev" PKG_murphy-ecore-dev= "murphy-ecore-dev" PKG_murphy-pulse-dev= "murphy-pulse-dev" PKG_murphy-tests= "murphy-tests" PKG_murphy-gam= "murphy-gam" +PKG_murphy-system-controller= "murphy-system-controller" PKG_murphy-glib= "murphy-glib" -PKG_murphy-gam-dev= "murphy-gam-dev" +PKG_murphy-glib-dev= "murphy-glib-dev" +PKG_murphy-plugins-base= "murphy-plugins-base" require murphy-extraconf.inc diff --git a/recipes-tizen/murphy/murphy_git.bb b/recipes-tizen/murphy/murphy_git.bb index 2731d747..44799db6 100644 --- a/recipes-tizen/murphy/murphy_git.bb +++ b/recipes-tizen/murphy/murphy_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/murphy;tag=23cf28af5042e100997008c53e05a3cfe6e3a7b1;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/murphy;tag=7934858e21456e894778c8ec5da8d1c7f21e7830;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/net-config/net-config.inc b/recipes-tizen/net-config/net-config.inc index 209e818a..8f9adce0 100644 --- a/recipes-tizen/net-config/net-config.inc +++ b/recipes-tizen/net-config/net-config.inc @@ -26,9 +26,10 @@ DEPENDS = "" DEPENDS += "libwifi-direct" inherit tizen_cmake DEPENDS += "syspopup" -DEPENDS += "systemd" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" +DEPENDS += "systemd" DEPENDS += "libtapi" DEPENDS += "vconf" DEPENDS += "dbus-glib" diff --git a/recipes-tizen/nfc-manager-neard/nfc-manager-neard.inc b/recipes-tizen/nfc-manager-neard/nfc-manager-neard.inc index b8a44228..fabade8d 100644 --- a/recipes-tizen/nfc-manager-neard/nfc-manager-neard.inc +++ b/recipes-tizen/nfc-manager-neard/nfc-manager-neard.inc @@ -43,6 +43,7 @@ DEPENDS = "" #DEPENDS of nfc-manager-neard DEPENDS += "pkgmgr" DEPENDS += "security-server" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "curl" inherit tizen_cmake diff --git a/recipes-tizen/notification/notification.inc b/recipes-tizen/notification/notification.inc index 44421df1..61c59948 100644 --- a/recipes-tizen/notification/notification.inc +++ b/recipes-tizen/notification/notification.inc @@ -44,8 +44,9 @@ DEPENDS += "eina" DEPENDS += "dbus" DEPENDS += "app-svc" DEPENDS += "tizen-platform-config" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "bundle" +DEPENDS += "aul" DEPENDS += "ail" DEPENDS += "dlog" DEPENDS += "ecore" diff --git a/recipes-tizen/phoned/phoned.inc b/recipes-tizen/phoned/phoned.inc index 49a934ff..398685ad 100644 --- a/recipes-tizen/phoned/phoned.inc +++ b/recipes-tizen/phoned/phoned.inc @@ -23,6 +23,7 @@ inherit tizen_cmake DEPENDS += "evolution-data-server" DEPENDS += "dbus" DEPENDS += "expat" +inherit pkgconfig #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "json-glib" diff --git a/recipes-tizen/pims-ipc/pims-ipc.inc b/recipes-tizen/pims-ipc/pims-ipc.inc index c1cb32ce..c14c8354 100644 --- a/recipes-tizen/pims-ipc/pims-ipc.inc +++ b/recipes-tizen/pims-ipc/pims-ipc.inc @@ -28,9 +28,10 @@ DEPENDS = "" #DEPENDS of pims-ipc DEPENDS += "systemd" inherit tizen_cmake -DEPENDS += "zeromq" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" +DEPENDS += "zeromq" do_prep() { cd ${S} diff --git a/recipes-tizen/pkgmgr-info/pkgmgr-info.inc b/recipes-tizen/pkgmgr-info/pkgmgr-info.inc index 1067e518..b7cfd97f 100644 --- a/recipes-tizen/pkgmgr-info/pkgmgr-info.inc +++ b/recipes-tizen/pkgmgr-info/pkgmgr-info.inc @@ -45,6 +45,7 @@ inherit tizen_cmake DEPENDS += "libxml2" DEPENDS += "dbus" DEPENDS += "tizen-platform-config" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "smack" DEPENDS += "dbus-glib" diff --git a/recipes-tizen/pkgmgr/pkgmgr.inc b/recipes-tizen/pkgmgr/pkgmgr.inc index 4d085420..eee6e770 100644 --- a/recipes-tizen/pkgmgr/pkgmgr.inc +++ b/recipes-tizen/pkgmgr/pkgmgr.inc @@ -69,17 +69,18 @@ DEPENDS += "unzip" inherit tizen_cmake DEPENDS += "iniparser" DEPENDS += "dbus" -DEPENDS += "security-server" +inherit pkgconfig DEPENDS += "dlog" -DEPENDS += "app-core" +DEPENDS += "security-server" DEPENDS += "ail" DEPENDS += "smack" DEPENDS += "bundle" DEPENDS += "ecore" -DEPENDS_append_class-native = " fdupes-native" -DEPENDS_append_class-target = " fdupes-native" +DEPENDS += "app-core" DEPENDS += "tizen-platform-config" DEPENDS += "dbus-glib" +DEPENDS_append_class-native = " fdupes-native" +DEPENDS_append_class-target = " fdupes-native" do_prep() { cd ${S} diff --git a/recipes-tizen/privacy-manager-server/privacy-manager-server.inc b/recipes-tizen/privacy-manager-server/privacy-manager-server.inc index c4e9a9df..31256ddd 100644 --- a/recipes-tizen/privacy-manager-server/privacy-manager-server.inc +++ b/recipes-tizen/privacy-manager-server/privacy-manager-server.inc @@ -62,15 +62,16 @@ DEPENDS += "pkgmgr-info" inherit gettext inherit tizen_cmake DEPENDS += "capi-system-info" +DEPENDS += "dbus-glib" DEPENDS += "libxml2" DEPENDS += "dbus" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" -DEPENDS += "libslp-db-util" DEPENDS += "capi-base-common" DEPENDS += "sqlite3" DEPENDS += "tizen-platform-config" -DEPENDS += "dbus-glib" +DEPENDS += "libslp-db-util" do_prep() { cd ${S} diff --git a/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc b/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc index 60e0f364..9bb019b3 100644 --- a/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc +++ b/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc @@ -1,7 +1,7 @@ do_install_append() { # Tmp fix: # Remove modules combine-sink and augment-properties from - #pulseaudio-module-murphy-ivi since they conflict with modules with + # pulseaudio-module-murphy-ivi since they conflict with modules with # the same name provided by pulseaudio. Modules provided by # pulseaudio-module-murphy-ivi are based on the ones provided by # pulseaudio but incorpoate muprhy/IVI specific changes. The muprhy 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 d3e72ea4..74e7316d 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 @@ -1,7 +1,7 @@ DESCRIPTION = "Pulseaudio module for enforcing policy decisions in the audio domain" HOMEPAGE = "http://nohomepage.org" -SECTION = "System Environment/Daemons" -LICENSE = "LGPLv2.1" +SECTION = "Multimedia/Audio FW" +LICENSE = "LGPL-2.1" SRC_URI = "" @@ -23,9 +23,10 @@ RDEPENDS_${PN} += "aul" DEPENDS = "" #DEPENDS of pulseaudio-module-murphy-ivi +DEPENDS += "pulseaudio" DEPENDS += "dbus" DEPENDS += "murphy" -DEPENDS += "pulseaudio" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "lua" DEPENDS += "aul" @@ -59,7 +60,7 @@ do_compile() { unset LD_AS_NEEDED autotools_do_configure - make + oe_runmake @@ -88,7 +89,6 @@ do_install() { rm -f ${prefix}/lib/pulse-*/modules/module-*.la - } pkg_postinst_${PN}() { @@ -110,6 +110,8 @@ pulseaudio-module-murphy-ivi_files = "" pulseaudio-module-murphy-ivi_files += "${prefix}/lib/pulse-*/modules/module-*.so" pulseaudio-module-murphy-ivi_files += "${sysconfdir}/dbus-1/system.d/pulseaudio-murphy-ivi.conf" pulseaudio-module-murphy-ivi_files += "${sysconfdir}/pulse/murphy-ivi.lua" +CONFFILES_${PN} = "" +CONFFILES_${PN} += "${sysconfdir}/dbus-1/system.d/pulseaudio-murphy-ivi.conf" FILES_${PN} = "${pulseaudio-module-murphy-ivi_files}" diff --git a/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi_git.bb b/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi_git.bb index 310c343f..5c50907a 100644 --- a/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi_git.bb +++ b/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi_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/pulseaudio-module-murphy-ivi;tag=eacc58c41e0ba000c2faa14e60c72ebf02fe258d;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/pulseaudio-module-murphy-ivi;tag=b81902a13e47d93f066bb130c928d831cfe53beb;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/pulseaudio/pulseaudio.inc b/recipes-tizen/pulseaudio/pulseaudio.inc index 692195d9..f67ad61a 100644 --- a/recipes-tizen/pulseaudio/pulseaudio.inc +++ b/recipes-tizen/pulseaudio/pulseaudio.inc @@ -115,10 +115,10 @@ DEPENDS += "speex" DEPENDS += "libsndfile1" DEPENDS_append_class-native = " intltool-native" DEPENDS_append_class-target = " intltool-native" -DEPENDS += "json-c" +DEPENDS += "openssl" DEPENDS += "alsa-lib" DEPENDS += "dbus" -DEPENDS += "openssl" +inherit pkgconfig DEPENDS += "udev" DEPENDS += "glib-2.0" DEPENDS += "bluez4" @@ -127,8 +127,9 @@ DEPENDS += "systemd" DEPENDS_append_class-native = " libtool" DEPENDS_append_class-target = " libtool-cross" DEPENDS += "tdb" -DEPENDS += "libcap" DEPENDS += "gconf" +DEPENDS += "libcap" +DEPENDS += "json-c" DEPENDS_append_class-native = " fdupes-native" DEPENDS_append_class-target = " fdupes-native" DEPENDS += "vconf" diff --git a/recipes-tizen/rpm/rpm.inc b/recipes-tizen/rpm/rpm.inc index 7b74d9cc..8b7ef8da 100644 --- a/recipes-tizen/rpm/rpm.inc +++ b/recipes-tizen/rpm/rpm.inc @@ -87,6 +87,7 @@ DEPENDS += "bzip2" DEPENDS += "lua" DEPENDS += "elfutils" DEPENDS += "patch" +inherit pkgconfig inherit pythonnative DEPENDS += "libcap" DEPENDS += "ncurses" diff --git a/recipes-tizen/rygel/rygel.inc b/recipes-tizen/rygel/rygel.inc index 4462ad80..faa1a6e5 100644 --- a/recipes-tizen/rygel/rygel.inc +++ b/recipes-tizen/rygel/rygel.inc @@ -35,6 +35,7 @@ DEPENDS += "gupnp-dlna" DEPENDS += "gnome-common" DEPENDS += "gstreamer1.0-plugins-base" DEPENDS += "vala" +inherit pkgconfig DEPENDS += "gupnp" DEPENDS += "libsoup-2.4" DEPENDS_append_class-native = " intltool-native" diff --git a/recipes-tizen/security-server/security-server.inc b/recipes-tizen/security-server/security-server.inc index 964343de..91a25863 100644 --- a/recipes-tizen/security-server/security-server.inc +++ b/recipes-tizen/security-server/security-server.inc @@ -58,6 +58,7 @@ DEPENDS += "attr" DEPENDS += "zip" DEPENDS += "openssl" DEPENDS += "dlog" +inherit pkgconfig DEPENDS += "smack" DEPENDS += "libcap" DEPENDS += "libprivilege-control" diff --git a/recipes-tizen/sensor/sensor.inc b/recipes-tizen/sensor/sensor.inc index fa588d0c..9dcdd624 100644 --- a/recipes-tizen/sensor/sensor.inc +++ b/recipes-tizen/sensor/sensor.inc @@ -27,9 +27,10 @@ RDEPENDS_${PN}-dev += "sensor" DEPENDS = "" #DEPENDS of sensor DEPENDS += "libsf-common" +DEPENDS += "glib-2.0" inherit tizen_cmake DEPENDS += "vconf" -DEPENDS += "glib-2.0" +inherit pkgconfig do_prep() { cd ${S} diff --git a/recipes-tizen/sphinxbase/sphinxbase.inc b/recipes-tizen/sphinxbase/sphinxbase.inc index 1b756078..2ac69d8d 100644 --- a/recipes-tizen/sphinxbase/sphinxbase.inc +++ b/recipes-tizen/sphinxbase/sphinxbase.inc @@ -41,6 +41,7 @@ inherit pythonnative DEPENDS += "python-setuptools" DEPENDS_append_class-native = " bison-native" DEPENDS_append_class-target = " bison-native" +inherit pkgconfig do_prep() { cd ${S} diff --git a/recipes-tizen/status/status.inc b/recipes-tizen/status/status.inc index 08f6a7b5..dce8b1c5 100644 --- a/recipes-tizen/status/status.inc +++ b/recipes-tizen/status/status.inc @@ -29,11 +29,12 @@ RDEPENDS_${PN}-dev += "status" DEPENDS = "" #DEPENDS of status -DEPENDS += "dbus" inherit tizen_cmake -DEPENDS += "vconf" -DEPENDS += "dlog" +DEPENDS += "dbus" DEPENDS += "aul" +DEPENDS += "dlog" +inherit pkgconfig +DEPENDS += "vconf" do_prep() { cd ${S} diff --git a/recipes-tizen/sync-agent/sync-agent.inc b/recipes-tizen/sync-agent/sync-agent.inc index db301af4..1c641d9a 100644 --- a/recipes-tizen/sync-agent/sync-agent.inc +++ b/recipes-tizen/sync-agent/sync-agent.inc @@ -35,6 +35,7 @@ DEPENDS = "" #DEPENDS of sync-agent DEPENDS += "libslp-location" DEPENDS += "libxml2" +DEPENDS += "aul" DEPENDS += "contacts-service" DEPENDS += "libgcrypt" DEPENDS += "capi-base-common" @@ -43,7 +44,7 @@ DEPENDS += "dbus-glib" DEPENDS += "libsoup-2.4" inherit tizen_cmake DEPENDS += "app-svc" -DEPENDS += "aul" +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "system-server" diff --git a/recipes-tizen/syspopup/syspopup.inc b/recipes-tizen/syspopup/syspopup.inc index ad96a49c..15c11ea0 100644 --- a/recipes-tizen/syspopup/syspopup.inc +++ b/recipes-tizen/syspopup/syspopup.inc @@ -44,11 +44,12 @@ DEPENDS = "" inherit tizen_cmake DEPENDS += "evas" DEPENDS += "tizen-platform-config" +inherit pkgconfig +DEPENDS += "bundle" DEPENDS += "aul" DEPENDS += "dlog" -DEPENDS += "app-core" -DEPENDS += "bundle" DEPENDS += "sqlite3" +DEPENDS += "app-core" DEPENDS += "dbus-glib" do_prep() { diff --git a/recipes-tizen/system-server/system-server.inc b/recipes-tizen/system-server/system-server.inc index d6c85843..f8ffd78a 100644 --- a/recipes-tizen/system-server/system-server.inc +++ b/recipes-tizen/system-server/system-server.inc @@ -123,8 +123,9 @@ inherit gettext DEPENDS += "notification" DEPENDS += "tizen-platform-config" DEPENDS += "syspopup" -DEPENDS += "usbutils" +inherit pkgconfig DEPENDS += "libtapi" +DEPENDS += "usbutils" DEPENDS += "libdevice-node" DEPENDS += "systemd" DEPENDS += "dlog" diff --git a/recipes-tizen/systemd/systemd_git.bb b/recipes-tizen/systemd/systemd_git.bb index 0f050528..5f7ba77d 100644 --- a/recipes-tizen/systemd/systemd_git.bb +++ b/recipes-tizen/systemd/systemd_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/systemd;tag=4598371276d8e2311bc356fa4f39a96f05373d0c;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/systemd;tag=9986a304a0a3f771d671f04d1eebfea6d9a32a20;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc b/recipes-tizen/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc index 3ebc003d..306f84a9 100644 --- a/recipes-tizen/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc +++ b/recipes-tizen/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc @@ -62,6 +62,7 @@ DEPENDS += "sync-agent" DEPENDS += "dbus-glib" DEPENDS += "pkgmgr-info" DEPENDS += "notification" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "system-server" DEPENDS += "wayland" diff --git a/recipes-tizen/vala/vala-extraconf.inc b/recipes-tizen/vala/vala-extraconf.inc index 6f929d84..390a11af 100644 --- a/recipes-tizen/vala/vala-extraconf.inc +++ b/recipes-tizen/vala/vala-extraconf.inc @@ -1,3 +1,5 @@ +inherit pkgconfig + EXTRA_OECONF = " --with-pic --disable-vapigen" SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch" diff --git a/recipes-tizen/vconf/vconf.inc b/recipes-tizen/vconf/vconf.inc index 5111d7a5..8ec76822 100644 --- a/recipes-tizen/vconf/vconf.inc +++ b/recipes-tizen/vconf/vconf.inc @@ -39,9 +39,10 @@ RDEPENDS_${PN}-dev += "glib-2.0" DEPENDS = "" #DEPENDS of vconf +inherit tizen_cmake DEPENDS += "vconf-internal-keys" DEPENDS += "tizen-platform-config" -inherit tizen_cmake +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" diff --git a/recipes-tizen/wrt-widgets/wrt-widgets.inc b/recipes-tizen/wrt-widgets/wrt-widgets.inc index a179256c..82ad26c0 100644 --- a/recipes-tizen/wrt-widgets/wrt-widgets.inc +++ b/recipes-tizen/wrt-widgets/wrt-widgets.inc @@ -24,6 +24,7 @@ RDEPENDS_${PN} += "desktop-skin" DEPENDS = "" #DEPENDS of wrt-widgets DEPENDS += "tizen-platform-config" +inherit pkgconfig do_prep() { cd ${S} |