meta-tizen: sync project Tizen yocto with tizen upstream
authorRonan Le Martret <ronan@fridu.net>
Tue, 16 Sep 2014 15:01:41 +0000 (17:01 +0200)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 17:22:36 +0000 (09:22 -0800)
Change-Id: I6957d50ad7c690f07f53cb4e06bc10b503d6d7dd
(From meta-tizen rev: 0d12f43b79fd17fd96ec68f2d3773e6fd966b8c1)

Signed-off-by: Ronan Le Martret <ronan@fridu.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
97 files changed:
meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen_git.bb
meta-tizen/recipes-tizen/ail/ail.inc
meta-tizen/recipes-tizen/ail/ail_git.bb
meta-tizen/recipes-tizen/ail/files/remove-dlog-for-native-build.patch
meta-tizen/recipes-tizen/alarm-manager/alarm-manager.inc
meta-tizen/recipes-tizen/alarm-manager/alarm-manager_git.bb
meta-tizen/recipes-tizen/app-core/app-core_git.bb
meta-tizen/recipes-tizen/appcore-agent/appcore-agent.inc
meta-tizen/recipes-tizen/audio-session-manager/audio-session-manager.inc
meta-tizen/recipes-tizen/aul-1/aul-1-extraconf.inc
meta-tizen/recipes-tizen/aul-1/aul-1.inc
meta-tizen/recipes-tizen/aul-1/aul-1/CMakeLists.txt.patch [deleted file]
meta-tizen/recipes-tizen/aul-1/aul-1/Removing-Ecore-or-EFL-related-packages-depedencies.patch [deleted file]
meta-tizen/recipes-tizen/aul-1/aul-1/am_daemon.patch [deleted file]
meta-tizen/recipes-tizen/aul-1/aul-1/include.patch [deleted file]
meta-tizen/recipes-tizen/aul-1/aul-1/test.patch [deleted file]
meta-tizen/recipes-tizen/aul-1/aul-1_git.bb
meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker.inc
meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker_git.bb
meta-tizen/recipes-tizen/badge/badge_git.bb
meta-tizen/recipes-tizen/crosswalk/crosswalk.inc
meta-tizen/recipes-tizen/crosswalk/crosswalk_git.bb
meta-tizen/recipes-tizen/dbus-python/dbus-python-extraconf.inc
meta-tizen/recipes-tizen/dbus-python/dbus-python.inc
meta-tizen/recipes-tizen/dlt-daemon/dlt-daemon.inc
meta-tizen/recipes-tizen/dlt-daemon/dlt-daemon_git.bb
meta-tizen/recipes-tizen/efl/efl.inc
meta-tizen/recipes-tizen/efl/efl_git.bb
meta-tizen/recipes-tizen/elementary/elementary.inc
meta-tizen/recipes-tizen/elementary/elementary_git.bb
meta-tizen/recipes-tizen/festival/festival.inc
meta-tizen/recipes-tizen/festival/festival_git.bb
meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc
meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc
meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager_git.bb
meta-tizen/recipes-tizen/gpg2/gpg2.inc
meta-tizen/recipes-tizen/heynoti/heynoti-extraconf.inc
meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps.inc
meta-tizen/recipes-tizen/ico-uxf-homescreen-sample-apps/ico-uxf-homescreen-sample-apps_git.bb
meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc
meta-tizen/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen_git.bb
meta-tizen/recipes-tizen/ico-uxf-utilities/ico-uxf-utilities.inc
meta-tizen/recipes-tizen/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc
meta-tizen/recipes-tizen/ico-vic-amb-plugin/ico-vic-amb-plugin_git.bb
meta-tizen/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator_git.bb
meta-tizen/recipes-tizen/libgsignon-glib/libgsignon-glib.inc
meta-tizen/recipes-tizen/libgsignon-glib/libgsignon-glib_git.bb
meta-tizen/recipes-tizen/libhangul/libhangul.inc
meta-tizen/recipes-tizen/libhangul/libhangul_git.bb
meta-tizen/recipes-tizen/libhaptic/libhaptic-extraconf.inc [deleted file]
meta-tizen/recipes-tizen/libhaptic/libhaptic.inc [deleted file]
meta-tizen/recipes-tizen/libhaptic/libhaptic_git.bb [deleted file]
meta-tizen/recipes-tizen/libmm-common/libmm-common.inc
meta-tizen/recipes-tizen/libmm-common/libmm-common_git.bb
meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
meta-tizen/recipes-tizen/libmm-fileinfo/libmm-fileinfo_git.bb
meta-tizen/recipes-tizen/libmm-sound/libmm-sound.inc
meta-tizen/recipes-tizen/libmm-sound/libmm-sound_git.bb
meta-tizen/recipes-tizen/libmm-utility/libmm-utility.inc
meta-tizen/recipes-tizen/libmm-utility/libmm-utility_git.bb
meta-tizen/recipes-tizen/libnet-client/libnet-client_git.bb
meta-tizen/recipes-tizen/libprivilege-control/libprivilege-control.inc
meta-tizen/recipes-tizen/libprivilege-control/libprivilege-control_git.bb
meta-tizen/recipes-tizen/libslp-pm/libslp-pm-extraconf.inc [deleted file]
meta-tizen/recipes-tizen/libslp-pm/libslp-pm.inc [deleted file]
meta-tizen/recipes-tizen/libslp-pm/libslp-pm_git.bb [deleted file]
meta-tizen/recipes-tizen/libslp-sysman/libslp-sysman_git.bb [deleted file]
meta-tizen/recipes-tizen/libtbm/libtbm_git.bb
meta-tizen/recipes-tizen/media-server/media-server.inc
meta-tizen/recipes-tizen/meta-generic/meta-generic_git.bb
meta-tizen/recipes-tizen/meta/meta_git.bb
meta-tizen/recipes-tizen/murphy/murphy.inc
meta-tizen/recipes-tizen/package-manager/package-manager.inc
meta-tizen/recipes-tizen/phoned/phoned.inc
meta-tizen/recipes-tizen/phoned/phoned_git.bb
meta-tizen/recipes-tizen/pkgmgr-info/pkgmgr-info_git.bb
meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi_git.bb
meta-tizen/recipes-tizen/rpm/rpm.inc
meta-tizen/recipes-tizen/rpm/rpm_git.bb
meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr.inc
meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr_git.bb
meta-tizen/recipes-tizen/sphinxbase/sphinxbase.inc
meta-tizen/recipes-tizen/sphinxbase/sphinxbase_git.bb
meta-tizen/recipes-tizen/system-info/system-info.inc
meta-tizen/recipes-tizen/system-info/system-info_git.bb
meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc [new file with mode: 0644]
meta-tizen/recipes-tizen/system-server/system-server.inc [new file with mode: 0644]
meta-tizen/recipes-tizen/system-server/system-server_git.bb [new file with mode: 0644]
meta-tizen/recipes-tizen/tizen-extensions-crosswalk/tizen-extensions-crosswalk_git.bb
meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config_git.bb
meta-tizen/recipes-tizen/update-desktop-files/update-desktop-files.inc
meta-tizen/recipes-tizen/update-desktop-files/update-desktop-files_git.bb
meta-tizen/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc
meta-tizen/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension_git.bb
meta-tizen/recipes-tizen/weston-ivi-shell/weston-ivi-shell-extraconf.inc
meta-tizen/recipes-tizen/weston-ivi-shell/weston-ivi-shell.inc
meta-tizen/recipes-tizen/weston-ivi-shell/weston-ivi-shell_git.bb

index 5d2bc3b..35c1626 100644 (file)
@@ -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/Modello_Homescreen;tag=52db02f7c42a50653ccd4dd9e1ccf491fdfbd123;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Homescreen;tag=910082584eda27963772610cd244a64ee72e41a6;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 0bec457..da41aba 100644 (file)
@@ -170,6 +170,7 @@ ail_files += "${prefix}/bin/ail_initdb"
 ail_files += "${prefix}/bin/ail_fota"
 ail_files += "${prefix}/bin/ail_desktop"
 ail_files += "${prefix}/bin/ail_filter"
+ail_files += "${prefix}/bin/ail_list"
 ail_files += "${prefix}/bin/ail_package"
 ail_files += "${prefix}/share/install-info/*"
 ail_files += "${prefix}/lib/libail.so.0"
index a3019c2..56ef55f 100644 (file)
@@ -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/appfw/ail;tag=d8b4d50672dce40fce54cf1c43a6e4a7a064c982;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/ail;tag=2d6337e338911b2731dbbc7bfe23b484ff9217c9;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 97be6ef..2c5b572 100644 (file)
@@ -62,13 +62,5 @@ index e898c7e..e0dd903 100755
  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
  
-@@ -54,4 +54,4 @@ TARGET_LINK_LIBRARIES(${PKG} ${LIBNAME} ${INITDB_PKGS_LIBRARIES})
- SET_TARGET_PROPERTIES(${PKG} PROPERTIES COMPILE_FLAGS "${EXTRA_CFLAGS}")
- SET_TARGET_PROPERTIES(${PKG} PROPERTIES SKIP_BUILD_RPATH true)
--INSTALL(TARGETS ${PKG} DESTINATION ${BINDIR})
-\ No newline at end of file
-+INSTALL(TARGETS ${PKG} DESTINATION ${BINDIR})
--- 
-1.8.1.4
+
 
index 7480653..7f9dbc2 100644 (file)
@@ -118,10 +118,6 @@ do_install() {
  
  mkdir -p ${D}/${sysconfdir}/dbus-1/system.d
  install -m0644  ${S}/packaging/alarm-service.conf ${D}${sysconfdir}/dbus-1/system.d/
- mkdir -p ${D}${prefix}/share/license
- cp LICENSE ${D}${prefix}/share/license/alarm-server
- cp LICENSE ${D}${prefix}/share/license/libalarm
- cp LICENSE ${D}${prefix}/share/license/libalarm-devel
  
  
 }
@@ -178,7 +174,6 @@ PACKAGES += " libalarm-dev "
 libalarm_files = ""
 libalarm_files += "${prefix}/lib/libalarm.so.0.0.0"
 libalarm_files += "${prefix}/lib/libalarm.so.0"
-libalarm_files += "${prefix}/share/license/libalarm"
 MANIFESTFILES_libalarm = "alarm-manager.manifest"
 
 alarm-server_files = ""
@@ -186,15 +181,15 @@ alarm-server_files += "${prefix}/bin/alarm-server"
 alarm-server_files += "/lib/systemd/system/multi-user.target.wants/alarm-server.service"
 alarm-server_files += "/lib/systemd/system/alarm-server.service"
 alarm-server_files += "${sysconfdir}/dbus-1/system.d/alarm-service.conf"
-alarm-server_files += "${sysconfdir}/udev/rules.d/60-alarm-manager-rtc.rules"
-alarm-server_files += "${prefix}/share/license/alarm-server"
+alarm-server_files += "%config ${sysconfdir}/udev/rules.d/60-alarm-manager-rtc.rules"
+CONFFILES_alarm-server = ""
+CONFFILES_alarm-server += "${sysconfdir}/dbus-1/system.d/alarm-service.conf"
 MANIFESTFILES_alarm-server = "alarm-manager.manifest"
 
 libalarm-dev_files = ""
 libalarm-dev_files += "${prefix}/include/*.h"
 libalarm-dev_files += "${prefix}/lib/pkgconfig/*.pc"
 libalarm-dev_files += "${prefix}/lib/libalarm.so"
-libalarm-dev_files += "${prefix}/share/license/libalarm-devel"
 MANIFESTFILES_libalarm-dev = "alarm-manager.manifest"
 
 FILES_libalarm = "${libalarm_files}"
index b098b6e..211bb09 100644 (file)
@@ -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/appfw/alarm-manager;tag=90ac77c2887b9d409bb834c8212a82bd60fa3387;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/alarm-manager;tag=19baeb3cdc026c400eef251ab4df53d2c3c05cf9;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index e095494..844e737 100644 (file)
@@ -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/appfw/app-core;tag=b772c8ca27263c3f2d5f23340000bb79081123ec;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/app-core;tag=58b4a5a46100477fe7164a02ba9afe05eec0599d;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 90ba29b..7d892b1 100644 (file)
@@ -31,8 +31,8 @@ DEPENDS_append_class-target = " cmake-native"
 DEPENDS += "aul"
 DEPENDS += "dlog"
 DEPENDS += "glib-2.0"
+DEPENDS += "system-server"
 DEPENDS += "application"
-DEPENDS += "libslp-sysman"
 DEPENDS += "libslp-pm"
 DEPENDS += "vconf"
 
index 14f95d1..b63748d 100644 (file)
@@ -41,7 +41,7 @@ DEPENDS += "avsystem"
 DEPENDS += "libmm-common"
 DEPENDS += "security-server"
 DEPENDS += "glib-2.0"
-DEPENDS += "libslp-sysman"
+DEPENDS += "system-server"
 DEPENDS += "vconf"
 
 do_prep() {
index e507548..7f2f493 100644 (file)
@@ -1,10 +1,5 @@
 inherit pkgconfig cmake
 
-SRC_URI += "file://CMakeLists.txt.patch \
-            file://am_daemon.patch \
-            file://include.patch \
-            file://test.patch \
-           "
 
 #PROVIDES by aul
 PROVIDES += "aul"
index 50a05d9..8b80077 100644 (file)
@@ -38,11 +38,10 @@ DEPENDS_append_class-target = " cmake-native"
 DEPENDS += "attr"
 DEPENDS += "tizen-platform-config"
 DEPENDS += "bundle"
-DEPENDS += "xdgmime"
 DEPENDS += "ail"
 DEPENDS += "dlog"
 DEPENDS += "sqlite3"
-DEPENDS += "ecore"
+DEPENDS += "xdgmime"
 DEPENDS += "libprivilege-control"
 DEPENDS += "app-checker"
 DEPENDS += "vconf"
@@ -84,8 +83,7 @@ do_compile() {
          -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
          -DCMAKE_SKIP_RPATH:BOOL=ON \
          -DBUILD_SHARED_LIBS:BOOL=ON \
-         ${EXTRA_OECMAKE} . \
-  -DWITH_WAYLAND=On \
+         ${EXTRA_OECMAKE} .
  
  make -j16
  
diff --git a/meta-tizen/recipes-tizen/aul-1/aul-1/CMakeLists.txt.patch b/meta-tizen/recipes-tizen/aul-1/aul-1/CMakeLists.txt.patch
deleted file mode 100644 (file)
index ad3d20e..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 22e73a7..28102f2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,15 +19,17 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
- # Set required packages
- INCLUDE(FindPkgConfig)
--SET(AUL-1_PKG_CHECK_MODULES dlog ecore libprivilege-control app-checker rua glib-2.0 ecore-input evas vconf pkgmgr-info privacy-manager-client)
-+SET(AUL-1_PKG_CHECK_MODULES dlog ecore libprivilege-control app-checker rua glib-2.0 vconf pkgmgr-info privacy-manager-client)
- OPTION(WITH_WAYLAND "Build with wayland" OFF)
--IF(WITH_WAYLAND)
--    ADD_DEFINITIONS("-DWAYLAND")
--    pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} ecore-wayland)
--ELSE(WITH_WAYLAND)
--    ADD_DEFINITIONS("-DX11")
--    pkg_check_modules(pkgs REQUIRED  ${AUL-1_PKG_CHECK_MODULES} x11 ecore-x)
--ENDIF(WITH_WAYLAND)
-+pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} )
-+
-+#IF(WITH_WAYLAND)
-+#    ADD_DEFINITIONS("-DWAYLAND")
-+#    pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} ecore-wayland)
-+#ELSE(WITH_WAYLAND)
-+#    ADD_DEFINITIONS("-DX11")
-+#    pkg_check_modules(pkgs REQUIRED  ${AUL-1_PKG_CHECK_MODULES} x11 ecore-x)
-+#ENDIF(WITH_WAYLAND)
- pkg_check_modules(libpkgs REQUIRED dlog bundle dbus-glib-1 ail xdgmime app-checker libtzplatform-config)
- PKG_CHECK_MODULES(PKGS REQUIRED glib-2.0 gio-2.0 dlog bundle)
-@@ -56,7 +58,7 @@ SET(CMAKE_C_FLAGS_RELEASE "-O2")
- SET(CMAKE_SKIP_BUILD_RPATH true)
--# Get uname value to set 'TARGET' definition 
-+# Get uname value to set 'TARGET' definition
- # TODO: Is this needed?
- FIND_PROGRAM(UNAME NAMES uname)
- EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-@@ -121,11 +123,9 @@ add_executable(amd
-               am_daemon/amd_status.c
-                 )
- SET(AUL-1_LINK_LIBRARY amd aul_mods app-checker-server rua glib-2.0 bundle ail aul)
--IF (WITH_WAYLAND)
-+
- target_link_libraries(${AUL-1_LINK_LIBRARY} ${pkgs_LDFLAGS})
--ELSE(WITH_WAYLAND)
--target_link_libraries(${AUL-1_LINK_LIBRARY} utilX ${pkgs_LDFLAGS})
--ENDIF(WITH_WAYLAND)
-+
- SET(REL_AGENT daemon-manager-release-agent)
- ADD_EXECUTABLE(${REL_AGENT} agent/${REL_AGENT}.c)
diff --git a/meta-tizen/recipes-tizen/aul-1/aul-1/Removing-Ecore-or-EFL-related-packages-depedencies.patch b/meta-tizen/recipes-tizen/aul-1/aul-1/Removing-Ecore-or-EFL-related-packages-depedencies.patch
deleted file mode 100644 (file)
index 0a7b2a8..0000000
+++ /dev/null
@@ -1,590 +0,0 @@
-From 1d140d85b41a8c7a5c696a1253d82b4b29038aa6 Mon Sep 17 00:00:00 2001
-From: Xavier Roche <xavrock.os@gmail.com>
-Date: Wed, 11 Jun 2014 16:32:18 +0200
-Subject: [PATCH] meta-tizen: Removing Ecore or EFL related packages depedencies
-
-Signed-off-by: Xavier Roche <xavrock.os@gmail.com>
----
- CMakeLists.txt         |   39 ++++++++++++++++++++-------------------
- am_daemon/amd_key.c    |   40 ++++++++++++++++++++--------------------
- am_daemon/amd_main.c   |   32 ++++++++++++++++----------------
- am_daemon/amd_status.c |   10 +++++-----
- include/SLP_AUL_PG.h   |    6 +++---
- test/app_test.c        |   11 ++++++-----
- test/aul_test.c        |   24 ++++++++++++------------
- test/launch_app.c      |   16 ++++++++--------
- test/open_app.c        |   18 +++++++++---------
- 9 files changed, 99 insertions(+), 97 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index af23cb0..d39a7e2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,15 +19,16 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
- # Set required packages
- INCLUDE(FindPkgConfig)
--SET(AUL-1_PKG_CHECK_MODULES dlog ecore libprivilege-control app-checker rua glib-2.0 ecore-input evas vconf pkgmgr-info privacy-manager-client)
-+SET(AUL-1_PKG_CHECK_MODULES dlog libprivilege-control app-checker rua glib-2.0 vconf pkgmgr-info privacy-manager-client)
- OPTION(WITH_WAYLAND "Build with wayland" OFF)
--IF(WITH_WAYLAND)
--    ADD_DEFINITIONS("-DWAYLAND")
--    pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} ecore-wayland)
--ELSE(WITH_WAYLAND)
--    ADD_DEFINITIONS("-DX11")
--    pkg_check_modules(pkgs REQUIRED  ${AUL-1_PKG_CHECK_MODULES} x11 ecore-x)
--ENDIF(WITH_WAYLAND)
-+#IF(WITH_WAYLAND)
-+#    ADD_DEFINITIONS("-DWAYLAND")
-+#    pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} ecore-wayland)
-+#ELSE(WITH_WAYLAND)
-+#    ADD_DEFINITIONS("-DX11")
-+#    pkg_check_modules(pkgs REQUIRED  ${AUL-1_PKG_CHECK_MODULES} x11 ecore-x)
-+#ENDIF(WITH_WAYLAND)
-+pkg_check_modules(pkgs REQUIRED  ${AUL-1_PKG_CHECK_MODULES} )
- pkg_check_modules(libpkgs REQUIRED dlog bundle dbus-glib-1 ail xdgmime app-checker libtzplatform-config)
- PKG_CHECK_MODULES(PKGS REQUIRED glib-2.0 gio-2.0 dlog bundle)
-@@ -100,16 +101,16 @@ SET_TARGET_PROPERTIES(aul PROPERTIES VERSION ${VERSION})
- # launchpad(old avatar) daemon
- SET(AVATAR_NAME "launchpad_preloading_preinitializing_daemon")
--IF (WITH_WAYLAND)
-+#IF (WITH_WAYLAND)
- add_executable(${AVATAR_NAME}
-         launchpad_src/launchpad.c
-         )
--ELSE(WITH_WAYLAND)
--add_executable(${AVATAR_NAME}
--      launchpad_src/launchpad.c
--      launchpad_src/util_x.c
--      )
--ENDIF(WITH_WAYLAND)
-+#ELSE(WITH_WAYLAND)
-+#{add_executable(${AVATAR_NAME}
-+#     launchpad_src/launchpad.c
-+#     launchpad_src/util_x.c
-+#     )
-+#ENDIF(WITH_WAYLAND)
- MESSAGE("       "${pkgs_LDFLAGS})
- target_link_libraries(${AVATAR_NAME} aul_mods aul ${pkgs_LDFLAGS} ${LIB_DL})
-@@ -127,11 +128,11 @@ add_executable(amd
-               am_daemon/amd_status.c
-                 )
- SET(AUL-1_LINK_LIBRARY amd aul_mods app-checker-server rua glib-2.0 bundle ail aul)
--IF (WITH_WAYLAND)
-+#IF (WITH_WAYLAND)
- target_link_libraries(${AUL-1_LINK_LIBRARY} ${pkgs_LDFLAGS})
--ELSE(WITH_WAYLAND)
--target_link_libraries(${AUL-1_LINK_LIBRARY} utilX ${pkgs_LDFLAGS})
--ENDIF(WITH_WAYLAND)
-+#ELSE(WITH_WAYLAND)
-+#target_link_libraries(${AUL-1_LINK_LIBRARY} utilX ${pkgs_LDFLAGS})
-+#ENDIF(WITH_WAYLAND)
- SET(REL_AGENT daemon-manager-release-agent)
- ADD_EXECUTABLE(${REL_AGENT} agent/${REL_AGENT}.c)
-diff --git a/am_daemon/amd_key.c b/am_daemon/amd_key.c
-index 4725889..3943b70 100755
---- a/am_daemon/amd_key.c
-+++ b/am_daemon/amd_key.c
-@@ -19,16 +19,16 @@
-  *
-  */
--#include <Ecore.h>
--#include <Evas.h>
--#include <Ecore_Input.h>
--#ifdef X11
--#include <Ecore_X.h>
--#include <utilX.h>
--#endif
--#ifdef WAYLAND
--#include <Ecore_Wayland.h>
--#endif
-+//#include <Ecore.h>
-+//#include <Evas.h>
-+//#include <Ecore_Input.h>
-+//#ifdef X11
-+//#include <Ecore_X.h>
-+//#include <utilX.h>
-+//#endif
-+//#ifdef WAYLAND
-+//#include <Ecore_Wayland.h>
-+//#endif
- #include <aul.h>
- #include <glib.h>
-@@ -37,7 +37,7 @@
- #include "app_sock.h"
- #include "launch.h"
--static struct {
-+/*static struct {
-       Evas_Object *win;
-       Ecore_Event_Handler *key_up;
-       Ecore_Event_Handler *key_down;
-@@ -45,14 +45,14 @@ static struct {
-       .win = NULL,
-       .key_up = NULL,
-       .key_down = NULL,
--};
-+};*/
- GSList *key_pid_list = NULL;
--static Eina_Bool __key_release_cb(void *data, int type, void *event);
--static Eina_Bool __key_press_cb(void *data, int type, void *event);
-+//static Eina_Bool __key_release_cb(void *data, int type, void *event);
-+//static Eina_Bool __key_press_cb(void *data, int type, void *event);
--static Eina_Bool __key_release_cb(void *data, int type, void *event)
-+/*static Eina_Bool __key_release_cb(void *data, int type, void *event)
- {
-       Evas_Event_Key_Up *ev = event;
-       int ret;
-@@ -83,10 +83,10 @@ static Eina_Bool __key_release_cb(void *data, int type, void *event)
-       }
-       return ECORE_CALLBACK_RENEW;
--}
-+}*/
--static Eina_Bool __key_press_cb(void *data, int type, void *event)
-+/*static Eina_Bool __key_press_cb(void *data, int type, void *event)
- {
-       Evas_Event_Key_Down *ev = event;
-       int ret;
-@@ -117,7 +117,7 @@ static Eina_Bool __key_press_cb(void *data, int type, void *event)
-       }
-       return ECORE_CALLBACK_RENEW;
--}
-+}*/
- int _register_key_event(int pid)
- {
-@@ -171,7 +171,7 @@ int _unregister_key_event(int pid)
- int _key_init()
- {
--#ifdef X11
-+/*#ifdef X11
-       key_info.win = ecore_x_window_input_new(0, 0, 0, 1, 1);
-       if (!key_info.win) {
-               _D("Failed to create hidden window");
-@@ -198,7 +198,7 @@ int _key_init()
-       if (!key_info.key_down) {
-               _D("Failed to register a key down event handler");
-       }
--#endif // X11
-+#endif // X11*/
-       return 0;
- }
-diff --git a/am_daemon/amd_main.c b/am_daemon/amd_main.c
-index 4b29192..8c60700 100755
---- a/am_daemon/amd_main.c
-+++ b/am_daemon/amd_main.c
-@@ -23,16 +23,16 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--#include <Ecore.h>
--#include <Ecore_Input.h>
--#include <Evas.h>
--#ifdef X11
--#include <Ecore_X.h>
--#include <utilX.h>
--#endif
--#ifdef WAYLAND
--#include <Ecore_Wayland.h>
--#endif
-+//#include <Ecore.h>
-+//#include <Ecore_Input.h>
-+//#include <Evas.h>
-+//#ifdef X11
-+//#include <Ecore_X.h>
-+//#include <utilX.h>
-+//#endif
-+//#ifdef WAYLAND
-+//#include <Ecore_Wayland.h>
-+//#endif
- #include <aul.h>
- #include <vconf.h>
- #include <app-checker-server.h>
-@@ -258,16 +258,16 @@ static int __init()
-       int ret;
--      ecore_init();
--      evas_init();
--      ecore_event_init();
--#ifdef X11
-+      //ecore_init();
-+      //evas_init();
-+      //ecore_event_init();
-+/*#ifdef X11
-       ret = ecore_x_init(NULL);
-       _D("ecore_x_init initialized %d times\n", ret);
- #endif
- #ifdef WAYLAND
-     ecore_wl_init(NULL);
--#endif
-+#endif*/
-       appinfo_init(&amd.af);
-       cgutil_create(MOUNT_PATH, AGENT_PATH, &amd.cg);
-@@ -312,7 +312,7 @@ int main(int argc, char *argv[])
-       g_idle_add(__amd_ready, NULL);
--      ecore_main_loop_begin();
-+      //ecore_main_loop_begin();
-       return 0;
- }
-diff --git a/am_daemon/amd_status.c b/am_daemon/amd_status.c
-index d1e70f0..551139a 100755
---- a/am_daemon/amd_status.c
-+++ b/am_daemon/amd_status.c
-@@ -24,7 +24,7 @@
- #include <glib.h>
- #include <aul.h>
- #include <string.h>
--#include <Ecore.h>
-+//#include <Ecore.h>
- #include "amd_config.h"
- #include "amd_status.h"
-@@ -69,7 +69,7 @@ int _status_add_app_info_list(char *appid, char *app_path, int pid, int pad_pid)
-       return 0;
- }
--static Eina_Bool __app_terminate_timer_cb(void *data)
-+static int __app_terminate_timer_cb(void *data)
- {
-       int pid = (int)data;
-       int ret = 0;
-@@ -80,7 +80,7 @@ static Eina_Bool __app_terminate_timer_cb(void *data)
-       if (ret == -1)
-               _D("send SIGKILL: %s", strerror(errno));
--      return ECORE_CALLBACK_CANCEL;
-+      return ret;
- }
- int _status_update_app_info_list(int pid, int status)
-@@ -93,10 +93,10 @@ int _status_update_app_info_list(int pid, int status)
-               info_t = (app_status_info_t *)iter->data;
-               if(pid == info_t->pid) {
-                       info_t->status = status;
--                      if(status == STATUS_DYING) {
-+                      /*if(status == STATUS_DYING) {
-                               if(info_t->pad_pid != DEBUG_LAUNCHPAD_PID)
-                                       ecore_timer_add(2, __app_terminate_timer_cb, info_t->pid);
--                      }
-+                      }*/
-                       break;
-               }
-       }
-diff --git a/include/SLP_AUL_PG.h b/include/SLP_AUL_PG.h
-index 60fe408..8166b7d 100755
---- a/include/SLP_AUL_PG.h
-+++ b/include/SLP_AUL_PG.h
-@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
- // Callee application
- #include <aul.h>
- #include <bundle.h>
--#include <Ecore.h>
-+//#include <Ecore.h>
- static int aul_handler(aul_type type, bundle *kb,void* data)
- {
-@@ -234,13 +234,13 @@ static int aul_handler(aul_type type, bundle *kb,void* data)
- int main(int argc, char** argv)
- {
--      ecore_init();
-+      //ecore_init();
-       aul_launch_init(aul_handler,NULL);
-       // enable this if you want to handle at aul_handler when launch
-       aul_launch_argv_handler(argc, argv);
--      ecore_main_loop_begin();  // You must need ecore or glib mainloop
-+      //ecore_main_loop_begin();  // You must need ecore or glib mainloop
-       return 0;
- } 
- @endcode
-diff --git a/test/app_test.c b/test/app_test.c
-index d92da2a..ce75ddc 100755
---- a/test/app_test.c
-+++ b/test/app_test.c
-@@ -22,11 +22,12 @@
- #include <poll.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <sys/time.h>
- #include "aul.h"
- /* ecore-glib integration */
--#include <Ecore.h>
-+//#include <Ecore.h>
- extern int aul_listen_app_dead_signal(int (*func) (int, void *), void *data);
-@@ -44,7 +45,7 @@ void do_resume()
-       printf("=================================\n");
- }
--static Eina_Bool send_result(void *data)
-+static int send_result(void *data)
- {
-       bundle *kb;
-       bundle *res_b;
-@@ -94,7 +95,7 @@ int do_start(void *data)
-       bundle_iterate(kb, prt_bundle, NULL);
--      ecore_timer_add(5, send_result, bundle_dup(kb));
-+      //ecore_timer_add(5, send_result, bundle_dup(kb));
-       return 0;
- }
-@@ -134,7 +135,7 @@ int app_launch_handler(int pid, void *data)
- __attribute__ ((visibility("default")))
- int main(int argc, char **argv)
- {
--      ecore_init();
-+      //ecore_init();
-       do_create();
-@@ -152,7 +153,7 @@ int main(int argc, char **argv)
-               exit(0);
-       }
--      ecore_main_loop_begin();
-+      //ecore_main_loop_begin();
-       return 0;
- }
-diff --git a/test/aul_test.c b/test/aul_test.c
-index c912951..ef40ab7 100755
---- a/test/aul_test.c
-+++ b/test/aul_test.c
-@@ -24,7 +24,7 @@
- #include <stdio.h>
- #include <sys/time.h>
- #include <unistd.h>
--#include <Ecore.h>
-+//#include <Ecore.h>
- #include "menu_db_util.h"
- #include "aul.h"
-@@ -121,9 +121,9 @@ static void cb_func(bundle *kb, int is_cancel, void *data)
-               bundle_iterate(kb, prt_recvd_bundle, NULL);
-       }
--      if ((strcmp(cmd, "launch_res") == 0)
-+      /*if ((strcmp(cmd, "launch_res") == 0)
-           || (strcmp(cmd, "open_svc_res") == 0))
--              ecore_main_loop_quit();
-+              ecore_main_loop_quit();*/
- }
- int open_test()
-@@ -175,14 +175,14 @@ static test_func_t scn_func[] = {
-       {"n", launch_test, "launch_test", ""}
- };
--static Eina_Bool run_all_test(void *data)
-+static int run_all_test(void *data)
- {
-       static int pos = 0;
-       int ret;
-       if (pos > sizeof(scn_func) / sizeof(test_func_t) - 1) {
-               printf("all internal test done\n");
--              ecore_main_loop_quit();
-+              //ecore_main_loop_quit();
-               return 0;
-       }
-@@ -204,7 +204,7 @@ static Eina_Bool run_all_test(void *data)
- int all_test()
- {
--      ecore_timer_add(2, run_all_test, NULL);
-+      //ecore_timer_add(2, run_all_test, NULL);
-       return 0;
- }
-@@ -661,7 +661,7 @@ void print_usage(char *progname)
-               "cmd is internal purpose\n");
- }
--static Eina_Bool run_func(void *data)
-+static int run_func(void *data)
- {
-       callfunc(cmd);
-@@ -669,8 +669,8 @@ static Eina_Bool run_func(void *data)
-           || strcmp(cmd, "dbuslaunch") == 0
-           || strcmp(cmd, "open_svc_res") == 0)
-               return 0;
--      else
--              ecore_main_loop_quit();
-+      /*else
-+              ecore_main_loop_quit();*/
-       return 0;
- }
-@@ -682,7 +682,7 @@ int main(int argc, char **argv)
-               exit(0);
-       }
--      ecore_init();
-+      //ecore_init();
-       cmd = argv[1];
-       gargc = argc;
-@@ -694,9 +694,9 @@ int main(int argc, char **argv)
-       /*aul_listen_app_dead_signal(dead_tracker,NULL); */
-       /*aul_listen_app_dead_signal(NULL,NULL); */
--      ecore_idler_add(run_func, NULL);
-+      /*ecore_idler_add(run_func, NULL);
--      ecore_main_loop_begin();
-+      ecore_main_loop_begin();*/
-       return 0;
- }
-diff --git a/test/launch_app.c b/test/launch_app.c
-index 47b9b2d..6cd1cfe 100755
---- a/test/launch_app.c
-+++ b/test/launch_app.c
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- #include <sys/types.h>
--#include <Ecore.h>
-+//#include <Ecore.h>
- #include "aul.h"
- #define ROOT_UID 0
-@@ -110,7 +110,7 @@ static int __launch_app_dead_handler(int pid, void *data)
-       return 0;
- }
--static Eina_Bool run_func(void *data)
-+static int run_func(void *data)
- {
-       int pid = -1;
-       char *str = NULL;
-@@ -121,12 +121,12 @@ static Eina_Bool run_func(void *data)
-               if( str && strcmp(str, "SYNC") == 0 ) {
-                       aul_listen_app_dead_signal(__launch_app_dead_handler, pid);
--              } else {
-+              } /*else {
-                       ecore_main_loop_quit();
--        }
-+        }*/
-       } else {
-               printf("... launch failed\n");
--              ecore_main_loop_quit();
-+              //ecore_main_loop_quit();
-       }
-       if (kb) {
-@@ -145,16 +145,16 @@ int main(int argc, char **argv)
-               exit(EXIT_FAILURE);
-       }
--      ecore_init();
-+      //ecore_init();
-       gargc = argc;
-       gargv = argv;
-       aul_launch_init(NULL, NULL);
--      ecore_idler_add(run_func, NULL);
-+      //ecore_idler_add(run_func, NULL);
--      ecore_main_loop_begin();
-+      //ecore_main_loop_begin();
-       return 0;
- }
-diff --git a/test/open_app.c b/test/open_app.c
-index d9b677c..49eb4f5 100755
---- a/test/open_app.c
-+++ b/test/open_app.c
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- #include <sys/types.h>
--#include <Ecore.h>
-+//#include <Ecore.h>
- #include "aul.h"
- #define ROOT_UID 0
-@@ -104,13 +104,13 @@ static int __launch_app_dead_handler(int pid, void *data)
- {
-       int listen_pid = (int) data;
--      if(listen_pid == pid)
--              ecore_main_loop_quit();
-+      /*if(listen_pid == pid)
-+              ecore_main_loop_quit();*/
-       return 0;
- }
--static Eina_Bool run_func(void *data)
-+static int run_func(void *data)
- {
-       int pid = -1;
-       char *str = NULL;
-@@ -124,9 +124,9 @@ static Eina_Bool run_func(void *data)
-       if( str && strcmp(str, "SYNC") == 0 ) {
-               aul_listen_app_dead_signal(__launch_app_dead_handler, pid);
--      } else {
-+      } /*else {
-               ecore_main_loop_quit();
--      }
-+      }*/
-       if (kb) {
-               bundle_free(kb);
-@@ -143,16 +143,16 @@ int main(int argc, char **argv)
-               exit(EXIT_FAILURE);
-       }
--      ecore_init();
-+      //ecore_init();
-       gargc = argc;
-       gargv = argv;
-       aul_launch_init(NULL, NULL);
--      ecore_idler_add(run_func, NULL);
-+      //ecore_idler_add(run_func, NULL);
--      ecore_main_loop_begin();
-+      //ecore_main_loop_begin();
-       return 0;
- }
--- 
-1.7.9.5
-
diff --git a/meta-tizen/recipes-tizen/aul-1/aul-1/am_daemon.patch b/meta-tizen/recipes-tizen/aul-1/aul-1/am_daemon.patch
deleted file mode 100644 (file)
index 63de491..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-diff --git a/am_daemon/amd_key.c b/am_daemon/amd_key.c
-index 4725889..3943b70 100755
---- a/am_daemon/amd_key.c
-+++ b/am_daemon/amd_key.c
-@@ -19,16 +19,16 @@
-  *
-  */
-
--#include <Ecore.h>
--#include <Evas.h>
--#include <Ecore_Input.h>
--#ifdef X11
--#include <Ecore_X.h>
--#include <utilX.h>
--#endif
--#ifdef WAYLAND
--#include <Ecore_Wayland.h>
--#endif
-+//#include <Ecore.h>
-+//#include <Evas.h>
-+//#include <Ecore_Input.h>
-+//#ifdef X11
-+//#include <Ecore_X.h>
-+//#include <utilX.h>
-+//#endif
-+//#ifdef WAYLAND
-+//#include <Ecore_Wayland.h>
-+//#endif
- #include <aul.h>
- #include <glib.h>
-
-@@ -37,7 +37,7 @@
- #include "app_sock.h"
- #include "launch.h"
-
--static struct {
-+/*static struct {
-       Evas_Object *win;
-       Ecore_Event_Handler *key_up;
-       Ecore_Event_Handler *key_down;
-@@ -45,14 +45,14 @@ static struct {
-       .win = NULL,
-       .key_up = NULL,
-       .key_down = NULL,
--};
-+};*/
-
- GSList *key_pid_list = NULL;
-
--static Eina_Bool __key_release_cb(void *data, int type, void *event);
--static Eina_Bool __key_press_cb(void *data, int type, void *event);
-+//static Eina_Bool __key_release_cb(void *data, int type, void *event);
-+//static Eina_Bool __key_press_cb(void *data, int type, void *event);
-
--static Eina_Bool __key_release_cb(void *data, int type, void *event)
-+/*static Eina_Bool __key_release_cb(void *data, int type, void *event)
- {
-       Evas_Event_Key_Up *ev = event;
-       int ret;
-@@ -83,10 +83,10 @@ static Eina_Bool __key_release_cb(void *data, int type, void *event)
-       }
-
-       return ECORE_CALLBACK_RENEW;
--}
-+}*/
-
-
--static Eina_Bool __key_press_cb(void *data, int type, void *event)
-+/*static Eina_Bool __key_press_cb(void *data, int type, void *event)
- {
-       Evas_Event_Key_Down *ev = event;
-       int ret;
-@@ -117,7 +117,7 @@ static Eina_Bool __key_press_cb(void *data, int type, void *event)
-       }
-
-       return ECORE_CALLBACK_RENEW;
--}
-+}*/
-
- int _register_key_event(int pid)
- {
-@@ -171,7 +171,7 @@ int _unregister_key_event(int pid)
-
- int _key_init()
- {
--#ifdef X11
-+/*#ifdef X11
-       key_info.win = ecore_x_window_input_new(0, 0, 0, 1, 1);
-       if (!key_info.win) {
-               _D("Failed to create hidden window");
-@@ -198,7 +198,7 @@ int _key_init()
-       if (!key_info.key_down) {
-               _D("Failed to register a key down event handler");
-       }
--#endif // X11
-+#endif // X11*/
-
-       return 0;
- }
-diff --git a/am_daemon/amd_main.c b/am_daemon/amd_main.c
-index 4b29192..8c60700 100755
---- a/am_daemon/amd_main.c
-+++ b/am_daemon/amd_main.c
-@@ -24,16 +24,16 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <string.h>
--#include <Ecore.h>
--#include <Ecore_Input.h>
--#include <Evas.h>
--#ifdef X11
--#include <Ecore_X.h>
--#include <utilX.h>
--#endif
--#ifdef WAYLAND
--#include <Ecore_Wayland.h>
--#endif
-+//#include <Ecore.h>
-+//#include <Ecore_Input.h>
-+//#include <Evas.h>
-+//#ifdef X11
-+//#include <Ecore_X.h>
-+//#include <utilX.h>
-+//#endif
-+//#ifdef WAYLAND
-+//#include <Ecore_Wayland.h>
-+//#endif
- #include <aul.h>
- #include <vconf.h>
- #include <app-checker-server.h>
-@@ -258,16 +258,16 @@ static int __init()
-
-       int ret;
-
--      ecore_init();
--      evas_init();
--      ecore_event_init();
--#ifdef X11
-+      //ecore_init();
-+      //evas_init();
-+      //ecore_event_init();
-+/*#ifdef X11
-       ret = ecore_x_init(NULL);
-       _D("ecore_x_init initialized %d times\n", ret);
- #endif
- #ifdef WAYLAND
-     ecore_wl_init(NULL);
--#endif
-+#endif*/
-
-       appinfo_init(&amd.af);
-       cgutil_create(MOUNT_PATH, AGENT_PATH, &amd.cg);
-@@ -321,7 +321,7 @@ int main(int argc, char *argv[])
-
-       g_idle_add(__amd_ready, NULL);
-
--      ecore_main_loop_begin();
-+      //ecore_main_loop_begin();
-
-       return 0;
- }
-diff --git a/am_daemon/amd_status.c b/am_daemon/amd_status.c
-index d1e70f0..551139a 100755
---- a/am_daemon/amd_status.c
-+++ b/am_daemon/amd_status.c
-@@ -24,7 +24,7 @@
- #include <glib.h>
- #include <aul.h>
- #include <string.h>
--#include <Ecore.h>
-+//#include <Ecore.h>
-
- #include "amd_config.h"
- #include "amd_status.h"
-@@ -69,7 +69,7 @@ int _status_add_app_info_list(char *appid, char *app_path, int pid, int pad_pid)
-       return 0;
- }
-
--static Eina_Bool __app_terminate_timer_cb(void *data)
-+static int __app_terminate_timer_cb(void *data)
- {
-       int pid = (int)data;
-       int ret = 0;
-@@ -80,7 +80,7 @@ static Eina_Bool __app_terminate_timer_cb(void *data)
-       if (ret == -1)
-               _D("send SIGKILL: %s", strerror(errno));
-
--      return ECORE_CALLBACK_CANCEL;
-+      return ret;
- }
-
- int _status_update_app_info_list(int pid, int status)
-@@ -93,10 +93,10 @@ int _status_update_app_info_list(int pid, int status)
-               info_t = (app_status_info_t *)iter->data;
-               if(pid == info_t->pid) {
-                       info_t->status = status;
--                      if(status == STATUS_DYING) {
-+                      /*if(status == STATUS_DYING) {
-                               if(info_t->pad_pid != DEBUG_LAUNCHPAD_PID)
-                                       ecore_timer_add(2, __app_terminate_timer_cb, info_t->pid);
--                      }
-+                      }*/
-                       break;
-               }
-       }
\ No newline at end of file
diff --git a/meta-tizen/recipes-tizen/aul-1/aul-1/include.patch b/meta-tizen/recipes-tizen/aul-1/aul-1/include.patch
deleted file mode 100644 (file)
index 082f66a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/include/SLP_AUL_PG.h b/include/SLP_AUL_PG.h
-index 60fe408..8166b7d 100755
---- a/include/SLP_AUL_PG.h
-+++ b/include/SLP_AUL_PG.h
-@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
- // Callee application
- #include <aul.h>
- #include <bundle.h>
--#include <Ecore.h>
-+//#include <Ecore.h>
-
- static int aul_handler(aul_type type, bundle *kb,void* data)
- {
-@@ -234,13 +234,13 @@ static int aul_handler(aul_type type, bundle *kb,void* data)
-
- int main(int argc, char** argv)
- {
--      ecore_init();
-+      //ecore_init();
-
-       aul_launch_init(aul_handler,NULL);
-       // enable this if you want to handle at aul_handler when launch
-       aul_launch_argv_handler(argc, argv);
-
--      ecore_main_loop_begin();  // You must need ecore or glib mainloop
-+      //ecore_main_loop_begin();  // You must need ecore or glib mainloop
-       return 0;
- }
- @endcode
\ No newline at end of file
diff --git a/meta-tizen/recipes-tizen/aul-1/aul-1/test.patch b/meta-tizen/recipes-tizen/aul-1/aul-1/test.patch
deleted file mode 100644 (file)
index c5a4e32..0000000
+++ /dev/null
@@ -1,269 +0,0 @@
-diff --git a/test/app_test.c b/test/app_test.c
-index d92da2a..ce75ddc 100755
---- a/test/app_test.c
-+++ b/test/app_test.c
-@@ -22,11 +22,12 @@
- #include <poll.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <sys/time.h>
- #include "aul.h"
-
- /* ecore-glib integration */
-
--#include <Ecore.h>
-+//#include <Ecore.h>
-
- extern int aul_listen_app_dead_signal(int (*func) (int, void *), void *data);
-
-@@ -44,7 +45,7 @@ void do_resume()
-       printf("=================================\n");
- }
-
--static Eina_Bool send_result(void *data)
-+static int send_result(void *data)
- {
-       bundle *kb;
-       bundle *res_b;
-@@ -94,7 +95,7 @@ int do_start(void *data)
-
-       bundle_iterate(kb, prt_bundle, NULL);
-
--      ecore_timer_add(5, send_result, bundle_dup(kb));
-+      //ecore_timer_add(5, send_result, bundle_dup(kb));
-
-       return 0;
- }
-@@ -134,7 +135,7 @@ int app_launch_handler(int pid, void *data)
- __attribute__ ((visibility("default")))
- int main(int argc, char **argv)
- {
--      ecore_init();
-+      //ecore_init();
-
-       do_create();
-
-@@ -152,7 +153,7 @@ int main(int argc, char **argv)
-               exit(0);
-       }
-
--      ecore_main_loop_begin();
-+      //ecore_main_loop_begin();
-       return 0;
- }
-
-diff --git a/test/aul_test.c b/test/aul_test.c
-index c912951..ef40ab7 100755
---- a/test/aul_test.c
-+++ b/test/aul_test.c
-@@ -24,7 +24,7 @@
- #include <stdio.h>
- #include <sys/time.h>
- #include <unistd.h>
--#include <Ecore.h>
-+//#include <Ecore.h>
-
- #include "menu_db_util.h"
- #include "aul.h"
-@@ -121,9 +121,9 @@ static void cb_func(bundle *kb, int is_cancel, void *data)
-               bundle_iterate(kb, prt_recvd_bundle, NULL);
-       }
-
--      if ((strcmp(cmd, "launch_res") == 0)
-+      /*if ((strcmp(cmd, "launch_res") == 0)
-           || (strcmp(cmd, "open_svc_res") == 0))
--              ecore_main_loop_quit();
-+              ecore_main_loop_quit();*/
- }
-
- int open_test()
-@@ -175,14 +175,14 @@ static test_func_t scn_func[] = {
-       {"n", launch_test, "launch_test", ""}
- };
-
--static Eina_Bool run_all_test(void *data)
-+static int run_all_test(void *data)
- {
-       static int pos = 0;
-       int ret;
-
-       if (pos > sizeof(scn_func) / sizeof(test_func_t) - 1) {
-               printf("all internal test done\n");
--              ecore_main_loop_quit();
-+              //ecore_main_loop_quit();
-               return 0;
-       }
-
-@@ -204,7 +204,7 @@ static Eina_Bool run_all_test(void *data)
-
- int all_test()
- {
--      ecore_timer_add(2, run_all_test, NULL);
-+      //ecore_timer_add(2, run_all_test, NULL);
-       return 0;
- }
-
-@@ -661,7 +661,7 @@ void print_usage(char *progname)
-               "cmd is internal purpose\n");
- }
-
--static Eina_Bool run_func(void *data)
-+static int run_func(void *data)
- {
-       callfunc(cmd);
-
-@@ -669,8 +669,8 @@ static Eina_Bool run_func(void *data)
-           || strcmp(cmd, "dbuslaunch") == 0
-           || strcmp(cmd, "open_svc_res") == 0)
-               return 0;
--      else
--              ecore_main_loop_quit();
-+      /*else
-+              ecore_main_loop_quit();*/
-
-       return 0;
- }
-@@ -682,7 +682,7 @@ int main(int argc, char **argv)
-               exit(0);
-       }
-
--      ecore_init();
-+      //ecore_init();
-
-       cmd = argv[1];
-       gargc = argc;
-@@ -694,9 +694,9 @@ int main(int argc, char **argv)
-       /*aul_listen_app_dead_signal(dead_tracker,NULL); */
-       /*aul_listen_app_dead_signal(NULL,NULL); */
-
--      ecore_idler_add(run_func, NULL);
-+      /*ecore_idler_add(run_func, NULL);
-
--      ecore_main_loop_begin();
-+      ecore_main_loop_begin();*/
-
-       return 0;
- }
-diff --git a/test/launch_app.c b/test/launch_app.c
-index 47b9b2d..6cd1cfe 100755
---- a/test/launch_app.c
-+++ b/test/launch_app.c
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- #include <sys/types.h>
-
--#include <Ecore.h>
-+//#include <Ecore.h>
- #include "aul.h"
-
- #define ROOT_UID 0
-@@ -110,7 +110,7 @@ static int __launch_app_dead_handler(int pid, void *data)
-       return 0;
- }
-
--static Eina_Bool run_func(void *data)
-+static int run_func(void *data)
- {
-       int pid = -1;
-       char *str = NULL;
-@@ -121,12 +121,12 @@ static Eina_Bool run_func(void *data)
-
-               if( str && strcmp(str, "SYNC") == 0 ) {
-                       aul_listen_app_dead_signal(__launch_app_dead_handler, pid);
--              } else {
-+              } /*else {
-                       ecore_main_loop_quit();
--        }
-+        }*/
-       } else {
-               printf("... launch failed\n");
--              ecore_main_loop_quit();
-+              //ecore_main_loop_quit();
-       }
-
-       if (kb) {
-@@ -145,16 +145,16 @@ int main(int argc, char **argv)
-               exit(EXIT_FAILURE);
-       }
-
--      ecore_init();
-+      //ecore_init();
-
-       gargc = argc;
-       gargv = argv;
-
-       aul_launch_init(NULL, NULL);
-
--      ecore_idler_add(run_func, NULL);
-+      //ecore_idler_add(run_func, NULL);
-
--      ecore_main_loop_begin();
-+      //ecore_main_loop_begin();
-
-       return 0;
- }
-diff --git a/test/open_app.c b/test/open_app.c
-index d9b677c..49eb4f5 100755
---- a/test/open_app.c
-+++ b/test/open_app.c
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- #include <sys/types.h>
-
--#include <Ecore.h>
-+//#include <Ecore.h>
- #include "aul.h"
-
- #define ROOT_UID 0
-@@ -104,13 +104,13 @@ static int __launch_app_dead_handler(int pid, void *data)
- {
-       int listen_pid = (int) data;
-
--      if(listen_pid == pid)
--              ecore_main_loop_quit();
-+      /*if(listen_pid == pid)
-+              ecore_main_loop_quit();*/
-
-       return 0;
- }
-
--static Eina_Bool run_func(void *data)
-+static int run_func(void *data)
- {
-       int pid = -1;
-       char *str = NULL;
-@@ -124,9 +124,9 @@ static Eina_Bool run_func(void *data)
-
-       if( str && strcmp(str, "SYNC") == 0 ) {
-               aul_listen_app_dead_signal(__launch_app_dead_handler, pid);
--      } else {
-+      } /*else {
-               ecore_main_loop_quit();
--      }
-+      }*/
-
-       if (kb) {
-               bundle_free(kb);
-@@ -143,16 +143,16 @@ int main(int argc, char **argv)
-               exit(EXIT_FAILURE);
-       }
-
--      ecore_init();
-+      //ecore_init();
-
-       gargc = argc;
-       gargv = argv;
-
-       aul_launch_init(NULL, NULL);
-
--      ecore_idler_add(run_func, NULL);
-+      //ecore_idler_add(run_func, NULL);
-
--      ecore_main_loop_begin();
-+      //ecore_main_loop_begin();
-
-       return 0;
- }
---
-1.7.9.5
-
index 1b68787..c08c4b8 100644 (file)
@@ -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/appfw/aul-1;tag=33faaaa1d1d72ed982c1c2454457858a24bea405;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/aul-1;tag=256ec13cd6cccf17cce98b1bb0caadf15d75d0cf;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index fb27cf0..9dae829 100644 (file)
@@ -131,7 +131,7 @@ DEPENDS += "boost"
 do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
- #setup -q -n automotive-message-broker-0.11.810
+ #setup -q -n automotive-message-broker-0.11.900
  
  
 }
@@ -167,7 +167,9 @@ do_compile() {
         -Dtest_plugin=ON \
         -Dgpsnmea_plugin=ON \
         -Dcangen_plugin=ON \
-        -Dcansim_plugin=ON
+        -Dcansim_plugin=ON \
+        -Denable_docs=ON
  
  oe_runmake -j16
  
@@ -318,7 +320,7 @@ automotive-message-broker-plugins-wheel_files += "${prefix}/lib/automotive-messa
 MANIFESTFILES_${PN}-plugins-wheel = "packaging.in/amb.manifest.plugins"
 
 automotive-message-broker-doc_files = ""
-automotive-message-broker-doc_files += "${prefix}/share/doc/packages/automotive-message-broker/*.txt"
+automotive-message-broker-doc_files += "${prefix}/share/doc/packages/automotive-message-broker/*"
 MANIFESTFILES_${PN}-doc = "packaging.in/amb.manifest.plugins"
 
 FILES_${PN}-plugins-cangen = "${automotive-message-broker-plugins-cangen_files}"
index 2a46fa4..b48d28f 100644 (file)
@@ -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/automotive-message-broker;tag=26e0b889f2e6dd43d70a047ee8b4bec2f83bb6c6;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/automotive-message-broker;tag=4d85122ae488d43757855760da785171f06e7552;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index cc91937..357c0a7 100644 (file)
@@ -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/appfw/badge;tag=beb1dd6f05cbb53204aa044c169e75d1af9d19e7;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/badge;tag=63663b8d2ba6f0b13121bbf3ba40ecea7f42744b;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index a7beffb..507686f 100644 (file)
@@ -58,6 +58,7 @@ DEPENDS += "libxkbcommon"
 DEPENDS += "pulseaudio"
 DEPENDS += "location-manager"
 DEPENDS += "libexif"
+DEPENDS += "ail"
 DEPENDS_append_class-native = " bison-native"
 DEPENDS_append_class-target = " bison-native"
 DEPENDS += "pciutils"
@@ -73,7 +74,7 @@ do_prep() {
  cp ${S}/packaging/crosswalk.manifest .
  cp ${S}/packaging/crosswalk.xml.in .
  cp ${S}/packaging/crosswalk.png .
- sed "s/@VERSION@/8.36.161.0/g" crosswalk.xml.in > crosswalk.xml
+ sed "s/@VERSION@/9.37.193.0/g" crosswalk.xml.in > crosswalk.xml
  sed "s|@LIB_INSTALL_DIR@|${prefix}/lib|g" xwalk.in > xwalk
  sed "s|@LIB_INSTALL_DIR@|${prefix}/lib|g" xwalk.service.in > xwalk.service
  
@@ -86,8 +87,6 @@ do_prep() {
  
  # The profiles using Wayland (and thus Ozone) do not need this patch.
  
- ###patch11
  
 }
 do_patch_append() {
@@ -130,7 +129,7 @@ do_compile() {
     ln -s "${BUILDDIR_NAME}" src/out
  fi
  
- GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=1"
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=0"
  
  # Force gold binary from chroot ld.gold provided by binutils-gold
  GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=1 -Dlinux_use_bundled_binutils=0 -Dlinux_use_bundled_gold=0 "
@@ -138,6 +137,16 @@ do_compile() {
  # Linking fails in Tizen Common when fatal ld warnings are enabled. XWALK-1379.
  GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
  
+ # Temporarily disable Alsa support while snd_seq_* support is not enabled on
+ # Tizen. See https://codereview.chromium.org/264973012 and
+ # https://review.tizen.org/gerrit/#/c/24336/
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_alsa=0"
+ # Temporarily disable WebRTC support because its build currently hardcodes
+ # dependencies on X11 and OpenSSL. We are still trying to get some
+ # clarifications as to whether this is really necessary. See XWALK-2160.
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_webrtc=0"
  # For building for arm in OBS, we need :
  # -> to unset sysroot value.
  # sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project
@@ -164,6 +173,7 @@ do_compile() {
  -Duse_system_libexif=1 \
  -Duse_system_libxml=1 \
  -Duse_system_nspr=1 \
+ -Dshared_process_mode=1 \
  -Denable_hidpi=1
  
  ninja -j16 -C src/out/Release xwalk xwalkctl xwalk_launcher xwalk-pkg-helper
@@ -182,7 +192,6 @@ do_install() {
  mkdir -p ${D}
  
  # Binaries.
- install -p -D xwalk ${D}${prefix}/bin/xwalk
  install -p -D ${S}/packaging/org.crosswalkproject.Runtime1.service ${D}/usr/share/dbus-1/services/org.crosswalkproject.Runtime1.service
  install -p -D xwalk.service ${D}/usr/lib/systemd/user/xwalk.service
  install -p -D src/out/Release/xwalk ${D}${prefix}/lib/xwalk/xwalk
@@ -199,8 +208,8 @@ do_install() {
  # PNaCl
  
  # Register xwalk to the package manager.
- install -p -D crosswalk.xml ${D}/usr/share/packages/crosswalk.xml
- install -p -D crosswalk.png ${D}/usr/share/icons/default/small/crosswalk.png
+ install -p -D crosswalk.xml ${D}${prefix}/share/packages/crosswalk.xml
+ install -p -D crosswalk.png ${D}%TZ_SYS_RW_ICONS/default/small/crosswalk.png
  
  
 }
@@ -208,8 +217,8 @@ do_install() {
 pkg_postinst_${PN}() {
     #!/bin/sh -e
 
-    mkdir -p /opt/share/icons/default/small
-    mkdir -p /opt/share/packages
+    mkdir -p %TZ_SYS_RO_ICONS/default/small
+    mkdir -p %TZ_SYS_RO_PACKAGE
 
 }
 
@@ -217,7 +226,6 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
 PACKAGES += " crosswalk "
 
 crosswalk_files = ""
-crosswalk_files += "${prefix}/bin/xwalk"
 crosswalk_files += "${prefix}/bin/xwalkctl"
 crosswalk_files += "${prefix}/bin/xwalk-launcher"
 crosswalk_files += "${prefix}/bin/xwalk-pkg-helper"
@@ -225,8 +233,7 @@ crosswalk_files += "${prefix}/lib/xwalk/icudtl.dat"
 crosswalk_files += "${prefix}/lib/xwalk/libffmpegsumo.so"
 crosswalk_files += "${prefix}/lib/xwalk/xwalk"
 crosswalk_files += "${prefix}/lib/xwalk/xwalk.pak"
-crosswalk_files += "/usr/share/packages/crosswalk.xml"
-crosswalk_files += "/usr/share/icons/default/small/crosswalk.png"
+crosswalk_files += "${prefix}/share/packages/crosswalk.xml"
 crosswalk_files += "/usr/share/dbus-1/services/org.crosswalkproject.Runtime1.service"
 crosswalk_files += "/usr/lib/systemd/user/xwalk.service"
 MANIFESTFILES_${PN} = "crosswalk.manifest"
index cba56ea..364d17b 100644 (file)
@@ -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/framework/web/crosswalk;tag=5fabe5fb1f490490fab842be91d0c92975631008;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=bafd14d8f156545fb0d487ed9c9ea66b378879a0;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 3a23aa0..00acdc5 100644 (file)
@@ -13,3 +13,7 @@ do_compile_prepend() {
 FILES_${PN}-dbg += "${prefix}/lib/python2.7/site-packages/.debug"
 
 FILES_${PN} += "/usr/share"
+
+RDEPENDS_${PN}_remove = "libxml2-python"
+
+RDEPENDS_${PN} += "python-xml"
\ No newline at end of file
index 53039ba..a71b1ed 100644 (file)
@@ -27,7 +27,7 @@ RDEPENDS_${PN}-dev += "dbus-python"
 #RDEPENDS of dbus-python (${PN})
 RDEPENDS_${PN} += "python-xml"
 RDEPENDS_${PN} += "dbus"
-RDEPENDS_${PN} += "python-xml"
+RDEPENDS_${PN} += "libxml2-python"
 
 
 DEPENDS = ""
index 36264a0..a2bbbe5 100644 (file)
@@ -77,8 +77,19 @@ do_compile() {
  mkdir -p build
  cd build
  
- cmake -DWITH_SYSTEMD=ON -DWITH_SYSTEMD_JOURNAL=ON \
-       -DWITH_MAN=OFF -DWITH_DLT_EXAMPLES=OFF ..
+   cmake \
+         -DCMAKE_VERBOSE_MAKEFILE=ON \
+         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+         -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
+         -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
+         -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
+         -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
+         -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
+         -DCMAKE_SKIP_RPATH:BOOL=ON \
+         -DBUILD_SHARED_LIBS:BOOL=ON \
+         ${EXTRA_OECMAKE} -DWITH_SYSTEMD=ON -DWITH_SYSTEMD_JOURNAL=ON \
+        -DWITH_MAN=OFF -DWITH_DLT_EXAMPLES=OFF ..
  make -j16
  
  
index 922f810..1d6ef8d 100644 (file)
@@ -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/dlt-daemon;tag=9976dbfe741fc3b71370ec82aecad2fe8221c9db;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/dlt-daemon;tag=9dbf393c4c9ca8f1dbf3b4a925a14d0e9c2dd179;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 3c4edb6..6588b83 100644 (file)
@@ -474,8 +474,12 @@ pkg_postinst_ecore() {
 
     [ "x\$D" == "x" ] && ldconfig
     f="/etc/profile.d/ecore.sh"
-    grep EFL_WAYLAND_USE_XDG_SHELL "$f" 2>/dev/null \
+    grep --silent EFL_WAYLAND_USE_XDG_SHELL "$f" \
         || printf "\nEFL_WAYLAND_USE_XDG_SHELL='defined'\nexport EFL_WAYLAND_USE_XDG_SHELL\n" >> "$f"
+    grep --silent ECORE_EVAS_ENGINE "$f" \
+        || printf "\nECORE_EVAS_ENGINE=wayland_shm\n[ ! -d /dev/dri ] || ECORE_EVAS_ENGINE=wayland_egl\nexport ECORE_EVAS_ENGINE" >> "$f"
+    grep --silent ECORE_IMF_MODULE "$f" \
+        || printf "\nECORE_IMF_MODULE=wayland\nexport ECORE_IMF_MODULE\n" >> "$f"
 
 }
 
index 68b9bc9..e103c72 100644 (file)
@@ -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=7e25b4449c74d76de4db40df259048e7da22dabf;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/efl;tag=78b3840c9c1d8915542145735414d75a2b349ec0;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index a2b4ecc..9d5a415 100644 (file)
@@ -80,7 +80,7 @@ do_compile() {
   
   
 }
-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"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
index b22ad3c..df7bd4a 100644 (file)
@@ -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=4400d8696a68fa665b89ed1ce29ab3c39c6ed3ac;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/elementary;tag=48de6fe3127b0e8da306d0fa0b181469b101e3af;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index f7a0fda..cfdf83e 100644 (file)
@@ -1,7 +1,7 @@
 DESCRIPTION = "A free speech synthesis and text-to-speech system"
 HOMEPAGE = "http://www.cstr.ed.ac.uk/projects/festival/"
 SECTION = "System/Libraries"
-LICENSE = "MIT and GPL+ and TCL"
+LICENSE = "MIT and GPL-2.0+ and TCL"
 
 SRC_URI = ""
 
@@ -74,7 +74,6 @@ do_prep() {
  #patch103 -p1
  cat ${S}/packaging/speech_tools-gcc47.patch | patch -s  -p1 --fuzz=2
  #patch104 -p1
  cat ${S}/packaging/festival-1.96-speechtools-shared-build.patch | patch -s  -p2 -b --suffix .shared-build --fuzz=2
  #patch200 -p2 -b .shared-build
  cat ${S}/packaging/festival-1.96-bettersonamehack.patch | patch -s  -p2 -b --suffix .bettersoname --fuzz=2
@@ -115,9 +114,8 @@ do_install() {
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/speech_tools/lib
  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/festival-2.1/src/lib
  cd -
- #%%make_install
-   find ${D} -regex ".*\.a$" | xargs rm -f --
- #make INSTALLED_BIN=$RPM_BUILD_ROOT${prefix}/bin make_installed_bin_shared
+ #%make_install
+ #make INSTALLED_BIN=%{buildroot}%{_bindir} make_installed_bin_shared
  cd ../speech_tools
  
    oe_runmake \
@@ -130,61 +128,61 @@ do_install() {
    find ${D} -regex ".*\.a$" | xargs rm -f --
  cd ../festival-2.1
  # install binarys
- install -D bin/text2wave $RPM_BUILD_ROOT${prefix}/bin/text2wave
- install -m 755 src/main/festival $RPM_BUILD_ROOT${prefix}/bin/
- install -m 755 src/main/festival_client $RPM_BUILD_ROOT${prefix}/bin/
- install -m 755 bin/festival_server* $RPM_BUILD_ROOT${prefix}/bin/
- install -m 755 examples/saytime $RPM_BUILD_ROOT${prefix}/bin/
+ install -D bin/text2wave ${D}${prefix}/bin/text2wave
+ install -m 755 src/main/festival ${D}${prefix}/bin/
+ install -m 755 src/main/festival_client ${D}${prefix}/bin/
+ install -m 755 bin/festival_server* ${D}${prefix}/bin/
+ install -m 755 examples/saytime ${D}${prefix}/bin/
  # install manpages
- install -D -m 644 doc/festival.1 $RPM_BUILD_ROOT${mandir}/man1/festival.1
- install -m 644 doc/festival_client.1 $RPM_BUILD_ROOT${mandir}/man1/
- install -m 644 doc/text2wave.1 $RPM_BUILD_ROOT${mandir}/man1/
+ install -D -m 644 doc/festival.1 ${D}${mandir}/man1/festival.1
+ install -m 644 doc/festival_client.1 ${D}${mandir}/man1/
+ install -m 644 doc/text2wave.1 ${D}${mandir}/man1/
  # install configs
- install -D lib/festival.scm $RPM_BUILD_ROOT${sysconfdir}/festival.scm
+ install -D lib/festival.scm ${D}${sysconfdir}/festival.scm
  # install dictionarys
- install -D lib/dicts/cmu/cmudict-0.4.out $RPM_BUILD_ROOT${prefix}/share/festival/dicts/cmu/cmudict-0.4.out
- install -m 644 lib/dicts/cmu/*.scm $RPM_BUILD_ROOT${prefix}/share/festival/dicts/cmu/
- install -m 644 lib/dicts/wsj.wp39.poslexR $RPM_BUILD_ROOT${prefix}/share/festival/dicts/
- install -m 644 lib/dicts/wsj.wp39.tri.ngrambin $RPM_BUILD_ROOT${prefix}/share/festival/dicts/
+ install -D lib/dicts/cmu/cmudict-0.4.out ${D}${prefix}/share/festival/dicts/cmu/cmudict-0.4.out
+ install -m 644 lib/dicts/cmu/*.scm ${D}${prefix}/share/festival/dicts/cmu/
+ install -m 644 lib/dicts/wsj.wp39.poslexR ${D}${prefix}/share/festival/dicts/
+ install -m 644 lib/dicts/wsj.wp39.tri.ngrambin ${D}${prefix}/share/festival/dicts/
  # install voices
- mkdir -p $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/festvox
- mkdir -p $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/group
- cp lib/voices/english/kal_diphone/group/* $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/group/
- cp lib/voices/english/kal_diphone/festvox/*.scm $RPM_BUILD_ROOT/usr/share/festival/voices/english/kal_diphone/festvox
+ mkdir -p ${D}${prefix}/share/festival/voices/english/kal_diphone/festvox
+ mkdir -p ${D}${prefix}/share/festival/voices/english/kal_diphone/group
+ cp lib/voices/english/kal_diphone/group/* ${D}${prefix}/share/festival/voices/english/kal_diphone/group/
+ cp lib/voices/english/kal_diphone/festvox/*.scm ${D}${prefix}/share/festival/voices/english/kal_diphone/festvox
  # install data
- cp lib/*.scm $RPM_BUILD_ROOT/usr/share/festival/
- cp lib/*.ngrambin $RPM_BUILD_ROOT/usr/share/festival/
- cp lib/*.gram $RPM_BUILD_ROOT/usr/share/festival/
- cp lib/*.el $RPM_BUILD_ROOT/usr/share/festival/
- install -D lib/etc/unknown_Linux/audsp $RPM_BUILD_ROOT/usr/lib/festival/audsp
+ cp lib/*.scm ${D}${prefix}/share/festival/
+ cp lib/*.ngrambin ${D}${prefix}/share/festival/
+ cp lib/*.gram ${D}${prefix}/share/festival/
+ cp lib/*.el ${D}${prefix}/share/festival/
+ install -D lib/etc/unknown_Linux/audsp ${D}${prefix}/lib/festival/audsp
  # install libs
- install -D src/lib/libFestival.so  $RPM_BUILD_ROOT/${prefix}/lib/libFestival.so
+ install -D src/lib/libFestival.so  ${D}/${prefix}/lib/libFestival.so
  # install includes
- mkdir -p $RPM_BUILD_ROOT${prefix}/include/
- install -m 644 src/include/*.h $RPM_BUILD_ROOT${prefix}/include/
+ mkdir -p ${D}${prefix}/include/
+ install -m 644 src/include/*.h ${D}${prefix}/include/
  cd ../speech_tools
  # install includes
- mkdir -p $RPM_BUILD_ROOT${prefix}/include/instantiate
- mkdir -p $RPM_BUILD_ROOT${prefix}/include/ling_class
- mkdir -p $RPM_BUILD_ROOT${prefix}/include/rxp
- mkdir -p $RPM_BUILD_ROOT${prefix}/include/sigpr
- mkdir -p $RPM_BUILD_ROOT${prefix}/include/unix
- install -m 644 include/*h $RPM_BUILD_ROOT${prefix}/include
- install -m 644 include/instantiate/*h $RPM_BUILD_ROOT${prefix}/include/instantiate
- install -m 644 include/ling_class/*h $RPM_BUILD_ROOT${prefix}/include/ling_class
- install -m 644 include/rxp/*h $RPM_BUILD_ROOT${prefix}/include/rxp
- install -m 644 include/sigpr/*h $RPM_BUILD_ROOT${prefix}/include/sigpr
- install -m 644 include/unix/*h $RPM_BUILD_ROOT${prefix}/include/unix
+ mkdir -p ${D}${prefix}/include/instantiate
+ mkdir -p ${D}${prefix}/include/ling_class
+ mkdir -p ${D}${prefix}/include/rxp
+ mkdir -p ${D}${prefix}/include/sigpr
+ mkdir -p ${D}${prefix}/include/unix
+ install -m 644 include/*h ${D}${prefix}/include
+ install -m 644 include/instantiate/*h ${D}${prefix}/include/instantiate
+ install -m 644 include/ling_class/*h ${D}${prefix}/include/ling_class
+ install -m 644 include/rxp/*h ${D}${prefix}/include/rxp
+ install -m 644 include/sigpr/*h ${D}${prefix}/include/sigpr
+ install -m 644 include/unix/*h ${D}${prefix}/include/unix
  # make sure we have no static libs, install shared ones
- install -m 644 lib/lib*.so* $RPM_BUILD_ROOT${prefix}/lib
- rm -f $RPM_BUILD_ROOT${prefix}/lib/*.a
+ install -m 644 lib/lib*.so* ${D}${prefix}/lib
+ rm -f ${D}${prefix}/lib/*.a
  
  # install init script
- # install -m 755 -D %SOURCE6 $RPM_BUILD_ROOT/etc/init.d/festival
- # install -d $RPM_BUILD_ROOT${prefix}/sbin
- # ln -sf ../../etc/init.d/festival $RPM_BUILD_ROOT/usr/sbin/rcfestival
+ # install -m 755 -D %{S:6} %{buildroot}/etc/init.d/%name
+ # install -d %{buildroot}%_sbindir
+ # ln -sf ../../etc/init.d/%name %{buildroot}/usr/sbin/rc%name
  # installl sysconfig file
- #install -m 644 -D %SOURCE5 $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.festival
+ #install -m 644 -D %{S:5} %{buildroot}/var/adm/fillup-templates/sysconfig.%name
  
  
 }
@@ -222,7 +220,8 @@ PACKAGES += " festival "
 PACKAGES += " festival-dev "
 
 festival_files = ""
-festival_files += "COPYING README INSTALL examples/*.text examples/ex1.* examples/*.scm examples/*.dtd"
+festival_files += "MIT COPYING"
+festival_files += "README INSTALL examples/*.text examples/ex1.* examples/*.scm examples/*.dtd"
 festival_files += "${sysconfdir}/festival.scm"
 festival_files += "${prefix}/bin/festival"
 festival_files += "${prefix}/bin/festival_client"
index fda5f90..73119bc 100644 (file)
@@ -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/festival;tag=46c12f13085720f0758c2f205acf9768e22a3f47;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/festival;tag=c9840b58b4d651d6c040f783a9d1bb555e6819a8;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 4cdb141..49b3fe7 100644 (file)
@@ -24,7 +24,6 @@ cmake_do_install_append() {
     rm $RPM_BUILD_ROOT${prefix}/lib/audioManager/routing/libPluginRoutingInterfaceAsync.so*
 }
 
-FILES_${PN}-dbg += "${prefix}/lib/audioManager/command/.debug/libPluginCommandInterfaceDbus.so.2.0"
-FILES_${PN}-dbg += "${prefix}/lib/audioManager/control/.debug/libPluginControlInterfaceDbus.so.2.0"
-FILES_${PN}-dbg += "${prefix}/lib/audioManager/control/.debug/libPluginControlInterface.so.2.0"
-FILES_${PN}-dbg += "${prefix}/lib/audioManager/routing/.debug/libPluginRoutingInterfaceDbus.so.2.0"
+FILES_${PN}-dbg += "${prefix}/lib/audioManager/command/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/audioManager/control/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/audioManager/routing/.debug"
\ No newline at end of file
index 0f6c422..6cfb863 100644 (file)
@@ -29,6 +29,7 @@ RDEPENDS_${PN} += "eglibc"
 
 DEPENDS = ""
 #DEPENDS of genivi-audio-manager
+DEPENDS += "flex"
 DEPENDS += "systemd"
 DEPENDS += "dlt-daemon"
 DEPENDS_append_class-native = " cmake-native"
@@ -36,6 +37,9 @@ DEPENDS_append_class-target = " cmake-native"
 inherit pythonnative
 DEPENDS += "dbus"
 DEPENDS += "zlib"
+DEPENDS += "murphy"
+DEPENDS_append_class-native = " bison-native"
+DEPENDS_append_class-target = " bison-native"
 DEPENDS += "sqlite3"
 
 do_prep() {
@@ -62,7 +66,18 @@ do_compile() {
  mkdir -p build
  cd build
  
- cmake -DUSE_BUILD_LIBS=OFF -DWITH_TESTS=OFF -DWITH_DBUS_WRAPPER=ON -DWITH_NSM=OFF -DCMAKE_INSTALL_PREFIX=/usr ..
+   cmake \
+         -DCMAKE_VERBOSE_MAKEFILE=ON \
+         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+         -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
+         -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
+         -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
+         -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
+         -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
+         -DCMAKE_SKIP_RPATH:BOOL=ON \
+         -DBUILD_SHARED_LIBS:BOOL=ON \
+         ${EXTRA_OECMAKE} -DUSE_BUILD_LIBS=OFF -DWITH_TESTS=OFF -DWITH_DBUS_WRAPPER=ON -DWITH_NSM=OFF -DWITH_DLT=OFF -DCMAKE_INSTALL_PREFIX=/usr ..
  #make VERBOSE=1
  oe_runmake -j16
  
@@ -107,10 +122,12 @@ genivi-audio-manager-dev_files += "${prefix}/include/genivi-audio-manager/*"
 genivi-audio-manager_files = ""
 genivi-audio-manager_files += "LICENCE README.html"
 genivi-audio-manager_files += "${prefix}/bin/AudioManager"
+genivi-audio-manager_files += "${prefix}/bin/domain-manager"
 genivi-audio-manager_files += "${prefix}/lib/audioManager/command/libPluginCommandInterfaceDbus.so*"
 genivi-audio-manager_files += "${prefix}/lib/audioManager/routing/libPluginRoutingInterfaceDbus.so*"
 genivi-audio-manager_files += "${prefix}/lib/audioManager/control/libPluginControlInterface.so*"
 genivi-audio-manager_files += "${prefix}/lib/audioManager/control/libPluginControlInterfaceDbus.so*"
+genivi-audio-manager_files += "${prefix}/lib/audioManager/control/libPluginControlInterfaceMurphy.so*"
 genivi-audio-manager_files += "${prefix}/share/audiomanager/*xml"
 
 FILES_${PN}-dev = "${genivi-audio-manager-dev_files}"
index e508d5a..9d234ea 100644 (file)
@@ -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/genivi/genivi-audio-manager;tag=ecbfb15600353a7191cdeca2e0148832bf79e1e2;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/genivi/genivi-audio-manager;tag=31b92358be419b8e3127a2d78e7ba08721f03439;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 1566cd4..e7a8364 100644 (file)
@@ -72,6 +72,7 @@ do_compile() {
   unset DISPLAY
   LD_AS_NEEDED=1; export LD_AS_NEEDED ;
   
+  autoreconf -fi
   # build PIEs (position independent executables) for address space randomisation:
   PIE="-fpie"
   export CFLAGS="$CFLAGS ${PIE}"
@@ -81,6 +82,13 @@ do_compile() {
   
   make -j16
   
+  exit 0
+  make check
+  ${D}${prefix}/bin/gpgsplit -v -p pubsplit-                    --uncompress <tests/openpgp/pubring.gpg
+  ${D}${prefix}/bin/gpgsplit -v -p secsplit- --secret-to-public --uncompress <tests/openpgp/secring.gpg
+  
+  
+  
 }
 EXTRA_OECONF += " --libexecdir=${prefix}/lib --docdir=${prefix}/share/doc/packages/gpg2 --with-agent-pgm=${prefix}/bin/gpg-agent --with-scdaemon-pgm=${prefix}/bin/scdaemon --enable-gpgsm=yes --enable-gpg --with-gnu-ld"
 
@@ -110,6 +118,8 @@ do_install() {
  
  ln -sf gpg2 ${D}${prefix}/bin/gpg
  ln -sf gpgv2 ${D}${prefix}/bin/gpgv
+ ln -sf gpg2.1 ${D}${mandir}/man1/gpg.1
+ ln -sf gpgv2.1 ${D}${mandir}/man1/gpgv.1
  
  rm -rf ${D}/${prefix}/share/locale/en@{bold,}quot
  
@@ -147,6 +157,7 @@ PACKAGES += " gpg2 "
 gpg2_files = ""
 gpg2_files += "${infodir}/gnupg*"
 gpg2_files += "${prefix}/share/doc/packages/gpg2"
+gpg2_files += "${mandir}/man*/*"
 gpg2_files += "${prefix}/bin/*"
 gpg2_files += "${prefix}/lib/[^d]*"
 gpg2_files += "${prefix}/sbin/addgnupghome"
index 6743a4f..3c22c94 100644 (file)
@@ -1,6 +1,6 @@
 DESCRIPTION = "HomeScreen sample application"
 HOMEPAGE = "http://nohomepage.org"
-SECTION = "System/Utilities"
+SECTION = "Automotive/ICO Homescreen"
 LICENSE = "Apache-2.0"
 
 SRC_URI = ""
@@ -26,6 +26,7 @@ RDEPENDS_${PN} += "capi-appfw-application"
 RDEPENDS_${PN} += "weston-ivi-shell"
 RDEPENDS_${PN} += "weston"
 RDEPENDS_${PN} += "ico-vic-amb-plugin"
+RDEPENDS_${PN} += "wayland-ivi-extension"
 RDEPENDS_${PN} += "automotive-message-broker"
 RDEPENDS_${PN} += "elementary"
 RDEPENDS_${PN} += "ecore"
@@ -111,7 +112,7 @@ do_install() {
  mkdir -p ${D}/usr/apps/org.tizen.ico.app-soundsample/res/images/
  install -m 0644 ico-app-soundsample/soundsample_config.txt ${D}/usr/apps/org.tizen.ico.app-soundsample/res/
  install -m 0644 ico-app-soundsample/sound_bg.png ${D}/usr/apps/org.tizen.ico.app-soundsample/res/images/
- install -m 0644 ico-app-soundsample/org.tizen.ico.app-soundsample.png ${D}/usr/apps/org.tizen.ico.app-soundsample/res/icons/default/small/
+ install -m 0644 ico-app-soundsample/org.tizen.ico.app-soundsample.png ${D}${prefix}/share/icons/default/small/
  install -m 0644 ico-app-soundsample/musicbox.wav ${D}/usr/apps/org.tizen.ico.app-soundsample/sounds/
  install -m 0644 ico-app-soundsample/org.tizen.ico.app-soundsample.xml ${D}${prefix}/share/packages/
  
@@ -122,7 +123,7 @@ do_install() {
  mkdir -p ${D}/usr/apps/org.tizen.ico.app-vicsample/res/images/
  install -m 0644 ico-app-vicsample/vicsample_config.txt ${D}/usr/apps/org.tizen.ico.app-vicsample/res/
  install -m 0644 ico-app-vicsample/vicinfo_bg.png ${D}/usr/apps/org.tizen.ico.app-vicsample/res/images/
- install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.png ${D}/usr/apps/org.tizen.ico.app-vicsample/res/icons/default/small/
+ install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.png ${D}${prefix}/share/icons/default/small/
  install -m 0644 ico-app-vicsample/org.tizen.ico.app-vicsample.xml ${D}${prefix}/share/packages/
  
  # configurations(ico-app-miscellaneous)
@@ -138,6 +139,12 @@ do_install() {
  # install tizen package metadata for weekeyboard
  install -m 0644 ico-app-miscellaneous/weekeyboard.xml ${D}${prefix}/share/packages/
  
+ # install tizen package metadata for mock navigator
+ install -m 0644 ico-app-miscellaneous/navigator.xml ${D}${prefix}/share/packages/
+ install -m 0644 ico-app-miscellaneous/navigator.png ${D}${prefix}/share/icons/default/small/
  
 }
 
@@ -145,7 +152,7 @@ pkg_postinst_${PN}() {
     #!/bin/sh -e
 
     [ "x\$D" == "x" ] && ldconfig
-    # This icon exists in main weston package so we don't package it in.
+    # This icons exists in main weston package so we don't package it in.
     # Create a symbolic link to it instead.
     ln -sf $D${prefix}/share/weston/terminal.png $D${prefix}/share/icons/default/small/
     # Update the app database.
@@ -153,6 +160,7 @@ pkg_postinst_${PN}() {
     $D${prefix}/bin/pkginfo --imd /usr/share/packages/org.tizen.ico.app-vicsample.xml
     $D${prefix}/bin/pkginfo --imd /usr/share/packages/browser.xml
     $D${prefix}/bin/pkginfo --imd /usr/share/packages/terminal.xml
+    $D${prefix}/bin/pkginfo --imd /usr/share/packages/navigator.xml
 
 }
 
@@ -164,6 +172,7 @@ pkg_prerm_${PN}() {
     $D${prefix}/bin/pkginfo --rmd /usr/share/packages/org.tizen.ico.app-vicsample.xml
     $D${prefix}/bin/pkginfo --rmd /usr/share/packages/browser.xml
     $D${prefix}/bin/pkginfo --rmd /usr/share/packages/terminal.xml
+    $D${prefix}/bin/pkginfo --rmd /usr/share/packages/navigator.xml
 
 }
 
@@ -186,19 +195,21 @@ ico-uxf-homescreen-sample-apps_files = ""
 ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-soundsample/bin/ico-app-soundsample"
 ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-soundsample/res/soundsample_config.txt"
 ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-soundsample/res/images/sound_bg.png"
-ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-soundsample/res/icons/default/small/org.tizen.ico.app-soundsample.png"
 ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-soundsample/sounds/musicbox.wav"
+ico-uxf-homescreen-sample-apps_files += "${prefix}/share/icons/default/small/org.tizen.ico.app-soundsample.png"
 ico-uxf-homescreen-sample-apps_files += "${prefix}/share/packages/org.tizen.ico.app-soundsample.xml"
 ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-vicsample/bin/ico-app-vicsample"
 ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-vicsample/res/vicsample_config.txt"
 ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-vicsample/res/images/vicinfo_bg.png"
-ico-uxf-homescreen-sample-apps_files += "/usr/apps/org.tizen.ico.app-vicsample/res/icons/default/small/org.tizen.ico.app-vicsample.png"
-ico-uxf-homescreen-sample-apps_files += "/usr/share/packages/org.tizen.ico.app-vicsample.xml"
+ico-uxf-homescreen-sample-apps_files += "${prefix}/share/icons/default/small/org.tizen.ico.app-vicsample.png"
+ico-uxf-homescreen-sample-apps_files += "${prefix}/share/packages/org.tizen.ico.app-vicsample.xml"
 ico-uxf-homescreen-sample-apps_files += "${prefix}/bin/browser"
 ico-uxf-homescreen-sample-apps_files += "${prefix}/share/packages/browser.xml"
 ico-uxf-homescreen-sample-apps_files += "${prefix}/share/packages/terminal.xml"
+ico-uxf-homescreen-sample-apps_files += "${prefix}/share/packages/navigator.xml"
 ico-uxf-homescreen-sample-apps_files += "${prefix}/share/packages/weekeyboard.xml"
 ico-uxf-homescreen-sample-apps_files += "${prefix}/share/icons/default/small/browser.png"
+ico-uxf-homescreen-sample-apps_files += "${prefix}/share/icons/default/small/navigator.png"
 MANIFESTFILES_${PN} = "ico-uxf-homescreen-sample-apps.manifest"
 
 FILES_${PN} = "${ico-uxf-homescreen-sample-apps_files}"
index 904ec75..0885917 100644 (file)
@@ -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-sample-apps;tag=2f4bf10ace3ed6fb66de4651be410ecca0d20b22;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/ico-uxf-homescreen-sample-apps;tag=26e72adc94c2b56d46b912a4ad4a105afca2ab31;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 30dfd29..265f06d 100644 (file)
@@ -16,6 +16,13 @@ PROVIDES = ""
 PROVIDES += "ico-uxf-homescreen-system-controller-dev"
 
 
+#PROVIDES by ico-uxf-homescreen-system-controller
+PROVIDES += "ico-uxf-homescreen-system-controller"
+# the PROVIDES rules is ignore "system-controller  "
+PROVIDES += "system-controller"
+RPROVIDES_ico-uxf-homescreen-system-controller += "system-controller"
+
+
 #PROVIDES by ico-uxf-homescreen
 
 
@@ -30,11 +37,20 @@ RDEPENDS_${PN}-system-controller-dev += "eina"
 RDEPENDS_${PN}-system-controller-dev += "capi-base-common-dev"
 RDEPENDS_${PN}-system-controller-dev += "ecore"
 
+#RDEPENDS of ico-uxf-homescreen-system-controller (${PN}-system-controller)
+RDEPENDS_${PN}-system-controller += "ico-uxf-utilities"
+RDEPENDS_${PN}-system-controller += "ico-uxf-homescreen"
+RDEPENDS_${PN}-system-controller += "weston-ivi-shell"
+RDEPENDS_${PN}-system-controller += "weston"
+RDEPENDS_${PN}-system-controller += "wayland-ivi-extension"
+RDEPENDS_${PN}-system-controller += "ico-uxf-weston-plugin"
+
 #RDEPENDS of ico-uxf-homescreen (${PN})
-RDEPENDS_${PN} += "weston"
 RDEPENDS_${PN} += "ico-uxf-utilities"
-RDEPENDS_${PN} += "wayland-ivi-extension"
 RDEPENDS_${PN} += "weston-ivi-shell"
+RDEPENDS_${PN} += "weston"
+RDEPENDS_${PN} += "wayland-ivi-extension"
+RDEPENDS_${PN} += "system-controller"
 RDEPENDS_${PN} += "ico-uxf-weston-plugin"
 
 
@@ -54,7 +70,7 @@ DEPENDS += "boost"
 DEPENDS += "ico-uxf-weston-plugin"
 DEPENDS += "ico-uxf-utilities"
 DEPENDS += "evas"
-DEPENDS += "libtzplatform-config-dev"
+DEPENDS += "tizen-platform-config"
 DEPENDS += "murphy"
 DEPENDS += "bundle"
 DEPENDS += "weston-ivi-shell"
@@ -140,16 +156,26 @@ do_install() {
  
 }
 
+pkg_postinst_${PN}() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+    # Update the app database.
+    $D${prefix}/bin/pkginfo --imd $D${prefix}/share/packages/org.tizen.ico.homescreen.xml
+    $D${prefix}/bin/pkginfo --imd $D${prefix}/share/packages/org.tizen.ico.statusbar.xml
+    $D${prefix}/bin/pkginfo --imd $D${prefix}/share/packages/org.tizen.ico.system-controller.xml
+    $D${prefix}/bin/pkginfo --imd $D${prefix}/share/packages/org.tizen.ico.onscreen.xml
 
+}
 
 pkg_prerm_${PN}() {
     #!/bin/sh -e
 
     # Update the app database.
-    $D${prefix}/bin/pkginfo --rmd /usr/share/packages/org.tizen.ico.homescreen.xml
-    $D${prefix}/bin/pkginfo --rmd /usr/share/packages/org.tizen.ico.statusbar.xml
-    $D${prefix}/bin/pkginfo --rmd /usr/share/packages/org.tizen.ico.system-controller.xml
-    $D${prefix}/bin/pkginfo --rmd /usr/share/packages/org.tizen.ico.onscreen.xml
+    $D${prefix}/bin/pkginfo --rmd $D${prefix}/share/packages/org.tizen.ico.homescreen.xml
+    $D${prefix}/bin/pkginfo --rmd $D${prefix}/share/packages/org.tizen.ico.statusbar.xml
+    $D${prefix}/bin/pkginfo --rmd $D${prefix}/share/packages/org.tizen.ico.system-controller.xml
+    $D${prefix}/bin/pkginfo --rmd $D${prefix}/share/packages/org.tizen.ico.onscreen.xml
 
 }
 
@@ -166,6 +192,7 @@ pkg_postrm_${PN}() {
 
 PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
 PACKAGES += " ico-uxf-homescreen-system-controller-dev "
+PACKAGES += " ico-uxf-homescreen-system-controller "
 PACKAGES += " ico-uxf-homescreen "
 
 ico-uxf-homescreen-system-controller-dev_files = ""
@@ -191,6 +218,16 @@ ico-uxf-homescreen-system-controller-dev_files += "${prefix}/include/ico-state-m
 ico-uxf-homescreen-system-controller-dev_files += "${prefix}/include/ico-state-machine/CicoStateMachineCreator.h"
 MANIFESTFILES_${PN}-system-controller-dev = "ico-uxf-homescreen.manifest"
 
+ico-uxf-homescreen-system-controller_files = ""
+ico-uxf-homescreen-system-controller_files += "/usr/share/packages/org.tizen.ico.system-controller.xml"
+ico-uxf-homescreen-system-controller_files += "/usr/lib/systemd/user/ico-uxf-wait-launchpad-ready.path"
+ico-uxf-homescreen-system-controller_files += "/usr/lib/systemd/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path"
+ico-uxf-homescreen-system-controller_files += "/usr/lib/systemd/user/ico-system-controller.service"
+ico-uxf-homescreen-system-controller_files += "/usr/apps/org.tizen.ico.system-controller/bin"
+ico-uxf-homescreen-system-controller_files += "/home/app/ico/defaultApps.info"
+ico-uxf-homescreen-system-controller_files += "/home/app/ico"
+MANIFESTFILES_${PN}-system-controller = "ico-uxf-homescreen.manifest"
+
 ico-uxf-homescreen_files = ""
 ico-uxf-homescreen_files += "${prefix}/apps/org.tizen.ico.homescreen"
 ico-uxf-homescreen_files += "${prefix}/apps/org.tizen.ico.statusbar"
@@ -200,25 +237,24 @@ ico-uxf-homescreen_files += "${prefix}/share/packages/org.tizen.ico.statusbar.xm
 ico-uxf-homescreen_files += "${prefix}/share/packages/org.tizen.ico.onscreen.xml"
 ico-uxf-homescreen_files += "${prefix}/lib/libico-appfw.*"
 ico-uxf-homescreen_files += "${prefix}/lib/libico-state-machine.*"
-ico-uxf-homescreen_files += "${prefix}/apps/org.tizen.ico.system-controller"
-ico-uxf-homescreen_files += "${prefix}/share/packages/org.tizen.ico.system-controller.xml"
-ico-uxf-homescreen_files += "${prefix}/lib/systemd/user/ico-system-controller.service"
-ico-uxf-homescreen_files += "${prefix}/lib/systemd/user/ico-uxf-wait-launchpad-ready.path"
-ico-uxf-homescreen_files += "${prefix}/lib/systemd/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path"
 ico-uxf-homescreen_files += "${prefix}/bin/ico_clear_screen"
 ico-uxf-homescreen_files += "${prefix}/bin/ico_change_loginuser"
 ico-uxf-homescreen_files += "${prefix}/bin/ico_del_notification"
 ico-uxf-homescreen_files += "${prefix}/bin/ico_dump_notification"
 ico-uxf-homescreen_files += "${prefix}/bin/ico_send_notification"
 ico-uxf-homescreen_files += "${prefix}/bin/ico_send_notification2"
-ico-uxf-homescreen_files += "/home/app/ico/defaultApps.info"
-ico-uxf-homescreen_files += "/home/app/ico"
+ico-uxf-homescreen_files += "${prefix}/share/icons/default/small/org.tizen.ico.homescreen.png"
+ico-uxf-homescreen_files += "${prefix}/share/icons/default/small/org.tizen.ico.statusbar.png"
+ico-uxf-homescreen_files += "${prefix}/share/icons/default/small/org.tizen.ico.onscreen.png"
+ico-uxf-homescreen_files += "/usr/apps/org.tizen.ico.system-controller/res/config"
 MANIFESTFILES_${PN} = "ico-uxf-homescreen.manifest"
 
 FILES_${PN}-system-controller-dev = "${ico-uxf-homescreen-system-controller-dev_files}"
+FILES_${PN}-system-controller = "${ico-uxf-homescreen-system-controller_files}"
 FILES_${PN} = "${ico-uxf-homescreen_files}"
 
 PKG_ico-uxf-homescreen-system-controller-dev= "ico-uxf-homescreen-system-controller-dev"
+PKG_ico-uxf-homescreen-system-controller= "ico-uxf-homescreen-system-controller"
 PKG_ico-uxf-homescreen= "ico-uxf-homescreen"
 
 require ico-uxf-homescreen-extraconf.inc
index 36a0dac..fb29409 100644 (file)
@@ -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=bd1720857784580d8f86427aa94b31c9027b7b44;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/ico-uxf-homescreen;tag=0917be365d275b9aaccf8d14b180ffa063fdc044;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 5c2732c..8fc006a 100644 (file)
@@ -90,6 +90,9 @@ do_install() {
  cp -f include/ico_uws.h ${D}/${prefix}/include/ico-util/
  cp -f include/ico_log.h ${D}/${prefix}/include/ico-util/
  cp -f include/ico_dbus_amb_efl.h ${D}/${prefix}/include/ico-util/
+ # log output
+ mkdir -p ${D}/${localstatedir}/log/ico/
+ chmod 0777 ${D}/${localstatedir}/log/ico/
  
  
 }
index 36192aa..fec54c7 100644 (file)
@@ -124,6 +124,7 @@ ico-uxf-weston-plugin-dev_files += "${prefix}/lib/libico-uxf-weston-plugin.so"
 MANIFESTFILES_${PN}-dev = "ico-uxf-weston-plugin.manifest"
 
 ico-uxf-weston-plugin_files = ""
+ico-uxf-weston-plugin_files += "${prefix}/lib/weston/"
 ico-uxf-weston-plugin_files += "${prefix}/lib/weston/*.so"
 ico-uxf-weston-plugin_files += "${prefix}/lib/libico-uxf-weston-plugin.so.*"
 ico-uxf-weston-plugin_files += "${prefix}/bin/ico_send_inputevent"
index 6eeb231..f1b72f4 100644 (file)
@@ -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-vic-amb-plugin;tag=e4130dfc7c8b75aa2e8a81bb90b03dd3c3aba0a1;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/ico-vic-amb-plugin;tag=743db049cbd153971aff0bcf1f002683cc7aebd3;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 40f69b4..faad033 100644 (file)
@@ -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-vic-carsimulator;tag=190114204368bc5a7449b575c1710c7cd8620b16;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/ico-vic-carsimulator;tag=292dd5f55444764ad1e3243cf9d90d63e752ef64;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 4527cb4..f1feebd 100644 (file)
@@ -29,8 +29,10 @@ RDEPENDS_${PN}-dev += "libgsignon-glib"
 
 #RDEPENDS of libgsignon-glib (${PN})
 RDEPENDS_${PN} += "gsignon"
+RDEPENDS_${PN} += "gsignond-plugin-oauth"
 RDEPENDS_${PN} += "dbus"
 RDEPENDS_${PN} += "eglibc"
+RDEPENDS_${PN} += "gsignond-plugin-sasl"
 
 
 DEPENDS = ""
@@ -116,7 +118,7 @@ libgsignon-glib-dev_files += "${prefix}/bin/gsso-example"
 MANIFESTFILES_${PN}-dev = "libgsignon-glib.manifest"
 
 libgsignon-glib_files = ""
-libgsignon-glib_files += "AUTHORS ChangeLog INSTALL NEWS README"
+libgsignon-glib_files += "AUTHORS ChangeLog NEWS README"
 libgsignon-glib_files += "${prefix}/lib/libgsignon-glib.so.*"
 MANIFESTFILES_${PN} = "libgsignon-glib.manifest"
 
index ff1be62..4225a03 100644 (file)
@@ -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/libgsignon-glib;tag=07d46495bfd93e1e725816b2b7c84bb08cdefc12;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/libgsignon-glib;tag=4c38ceaa060430023737564f510fb307f2515cf0;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index ef99af3..c1a06b9 100644 (file)
@@ -51,7 +51,8 @@ do_compile() {
   unset DISPLAY
   LD_AS_NEEDED=1; export LD_AS_NEEDED ;
   
-  [ ! -x autogen.sh ] || rm -f configure
+  [ ! -x autogen.sh ] ||  rm -f configure 
+  touch ChangeLog
   
   autotools_do_configure
   oe_runmake -j16
@@ -74,6 +75,7 @@ do_install() {
  rm -f ${D}${prefix}/lib/*.la
  
  
 }
 
 pkg_postinst_${PN}() {
@@ -101,7 +103,7 @@ libhangul-dev_files += "${prefix}/lib/pkgconfig/libhangul.pc"
 MANIFESTFILES_${PN}-dev = "libhangul.manifest"
 
 libhangul_files = ""
-libhangul_files += "AUTHORS NEWS README ChangeLog"
+libhangul_files += "AUTHORS NEWS README"
 libhangul_files += "${prefix}/lib/lib*.so.*"
 libhangul_files += "${prefix}/share/libhangul/hanja/"
 libhangul_files += "${prefix}/share/libhangul/hanja/hanja.txt"
index eb6eda4..f49aadd 100644 (file)
@@ -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/uifw/libhangul;tag=baabd61475fc93629b69dc03de4ffe3a1a42f460;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/uifw/libhangul;tag=35a2329d67aeee91547184adc9e78384a85e73c5;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
diff --git a/meta-tizen/recipes-tizen/libhaptic/libhaptic-extraconf.inc b/meta-tizen/recipes-tizen/libhaptic/libhaptic-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen/recipes-tizen/libhaptic/libhaptic.inc b/meta-tizen/recipes-tizen/libhaptic/libhaptic.inc
deleted file mode 100644 (file)
index 83aa3ab..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-DESCRIPTION = "Haptic library"
-HOMEPAGE = "http://nohomepage.org"
-SECTION = "System/Libraries"
-LICENSE = "Apache-2.0"
-
-SRC_URI = ""
-
-S = "${WORKDIR}/git"
-
-inherit autotools-brokensep
-
-BBCLASSEXTEND = ""
-PROVIDES = ""
-
-#PROVIDES by libhaptic
-
-
-#PROVIDES by libhaptic-dev
-PROVIDES += "libhaptic-dev"
-
-
-#PROVIDES by libhaptic-plugin-dev
-PROVIDES += "libhaptic-plugin-dev"
-
-
-RDEPENDS = ""
-#RDEPENDS of libhaptic-dev (${PN}-dev)
-RDEPENDS_${PN}-dev += "libhaptic"
-
-
-DEPENDS = ""
-#DEPENDS of libhaptic
-DEPENDS_append_class-native = " cmake-native"
-DEPENDS_append_class-target = " cmake-native"
-DEPENDS += "vconf"
-DEPENDS += "dlog"
-DEPENDS += "common"
-
-do_prep() {
- cd ${S}
- chmod -Rf a+rX,u+w,g-w,o-w ${S}
- #setup -q
-}
-do_patch_append() {
-    bb.build.exec_func('do_prep', d)
-}
-
-do_configure() {
-}
-
-do_compile() {
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- LD_AS_NEEDED=1; export LD_AS_NEEDED ;
- cp ${S}/packaging/libhaptic.manifest .
-   cmake \
-         -DCMAKE_VERBOSE_MAKEFILE=ON \
-         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-         -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
-         -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
-         -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
-         -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
-         -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
-         -DCMAKE_SKIP_RPATH:BOOL=ON \
-         -DBUILD_SHARED_LIBS:BOOL=ON \
-         ${EXTRA_OECMAKE} .
- make -j16
-}
-
-do_install() {
- export RPM_BUILD_ROOT=${D}
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- rm -rf ${D}
- mkdir -p ${D}
-   oe_runmake \
-         DESTDIR=${D} \
-         INSTALL_ROOT=${D} \
-         BINDIR=${prefix}/bin \
-   install  
-   rm -f ${D}${infodir}/dir 
-   find ${D} -regex ".*\.la$" | xargs rm -f -- 
-   find ${D} -regex ".*\.a$" | xargs rm -f --
- mkdir -p ${D}${prefix}/share/license
-}
-
-pkg_postinst_${PN}() {
-    #!/bin/sh -e
-
-    [ "x\$D" == "x" ] && ldconfig
-}
-
-pkg_postrm_${PN}() {
-    #!/bin/sh -e
-
-    [ "x\$D" == "x" ] && ldconfig
-}
-
-PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
-PACKAGES += " libhaptic "
-PACKAGES += " libhaptic-dev "
-PACKAGES += " libhaptic-plugin-dev "
-
-libhaptic_files = ""
-libhaptic_files += "${prefix}/lib/libhaptic.so.*"
-libhaptic_files += "${prefix}/share/license/haptic"
-MANIFESTFILES_${PN} = "libhaptic.manifest"
-
-libhaptic-dev_files = ""
-libhaptic-dev_files += "${prefix}/include/haptic/haptic.h"
-libhaptic-dev_files += "${prefix}/include/haptic/SLP_HAPTIC_PG.h"
-libhaptic-dev_files += "${prefix}/lib/libhaptic.so"
-libhaptic-dev_files += "${prefix}/lib/pkgconfig/haptic.pc"
-MANIFESTFILES_${PN}-dev = "libhaptic.manifest"
-
-libhaptic-plugin-dev_files = ""
-libhaptic-plugin-dev_files += "${prefix}/include/haptic/haptic_module.h"
-libhaptic-plugin-dev_files += "${prefix}/include/haptic/haptic_plugin_intf.h"
-libhaptic-plugin-dev_files += "${prefix}/lib/pkgconfig/haptic-plugin.pc"
-MANIFESTFILES_${PN}-plugin-dev = "libhaptic.manifest"
-
-FILES_${PN} = "${libhaptic_files}"
-FILES_${PN}-dev = "${libhaptic-dev_files}"
-FILES_${PN}-plugin-dev = "${libhaptic-plugin-dev_files}"
-
-PKG_libhaptic= "libhaptic"
-PKG_libhaptic-dev= "libhaptic-dev"
-PKG_libhaptic-plugin-dev= "libhaptic-plugin-dev"
-
-require libhaptic-extraconf.inc
-
diff --git a/meta-tizen/recipes-tizen/libhaptic/libhaptic_git.bb b/meta-tizen/recipes-tizen/libhaptic/libhaptic_git.bb
deleted file mode 100644 (file)
index 847f8d3..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-require libhaptic.inc
-
-PRIORITY = "10"
-
-LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI += "git://review.tizen.org/platform/core/system/libhaptic;tag=f231283973654cf74742eb4f27e9baca5cb575ac;nobranch=1"
-
-BBCLASSEXTEND += " native "
-
index 1256b17..e462bbe 100644 (file)
@@ -51,7 +51,9 @@ do_compile() {
   unset DISPLAY
   LD_AS_NEEDED=1; export LD_AS_NEEDED ;
   
-  CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" " 
+  
+  CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "
+  
   autotools_do_configure
   oe_runmake -j16
   
index a1e2a0b..288d815 100644 (file)
@@ -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/libmm-common;tag=507959cbf4f293fb3477d4900e2d4b37b0d9f096;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-common;tag=8e74a5450dab4e987c2864e469597f26333ca63d;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index acce31a..a5ac988 100644 (file)
@@ -84,9 +84,6 @@ do_install() {
    rm -f ${D}${infodir}/dir 
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
- mkdir -p ${D}/${prefix}/share/license
- cp -rf ${WORKDIR}/libmm-fileinfo-0.6.0/LICENSE.APLv2.0 ${D}/${prefix}/share/license/libmm-fileinfo
  
  
 }
@@ -118,7 +115,6 @@ libmm-fileinfo_files += "${prefix}/lib/libmmffile.so"
 libmm-fileinfo_files += "${prefix}/lib/libmmfile_codecs.so"
 libmm-fileinfo_files += "${prefix}/lib/libmmfile_formats.so"
 libmm-fileinfo_files += "${prefix}/lib/libmmfile_utils.so"
-libmm-fileinfo_files += "${prefix}/share/license/libmm-fileinfo"
 MANIFESTFILES_${PN} = "libmm-fileinfo.manifest"
 
 libmm-fileinfo-dev_files = ""
index 589ed00..16b8b6c 100644 (file)
@@ -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/libmm-fileinfo;tag=09fb4f4fdfb61889d60bed9c06aaa2beb7e7c72d;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-fileinfo;tag=cfe7dfeb6d8c084ad54dd9734e6cb23b61f9b0d1;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 01e9236..4c87aa8 100644 (file)
@@ -50,8 +50,8 @@ DEPENDS += "audio-session-manager"
 DEPENDS += "libmm-log"
 DEPENDS += "security-server"
 DEPENDS += "glib-2.0"
+DEPENDS += "system-server"
 DEPENDS += "vconf"
-DEPENDS += "libslp-sysman"
 DEPENDS += "heynoti"
 DEPENDS += "libmm-session"
 
@@ -83,7 +83,8 @@ do_compile() {
   CFLAGS="$CFLAGS -DMURPHY"; export CFLAGS
   
   autotools_do_configure
-  make -j16
+  oe_runmake -j16
+  
   
   
   
@@ -108,18 +109,17 @@ do_install() {
    rm -f ${D}${infodir}/dir 
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
- install -d ${D}/usr/lib/systemd/system/multi-user.target.wants
- install -m0644 ${S}/packaging/sound-server.service ${D}/usr/lib/systemd/system/
- install -m0644 ${S}/packaging/sound-server.path ${D}/usr/lib/systemd/system/
- ln -sf ../sound-server.path ${D}/usr/lib/systemd/system/multi-user.target.wants/sound-server.path
+ install -d ${D}${prefix}/lib/systemd/system/multi-user.target.wants
+ install -m0644 ${S}/packaging/sound-server.service ${D}${prefix}/lib/systemd/system/
+ install -m0644 ${S}/packaging/sound-server.path ${D}${prefix}/lib/systemd/system/
+ ln -sf ../sound-server.path ${D}${prefix}/lib/systemd/system/multi-user.target.wants/sound-server.path
  
  # FIXME: remove after systemd is in
  mkdir -p ${D}${sysconfdir}/rc.d/rc3.d
  mkdir -p ${D}${sysconfdir}/rc.d/rc4.d
  mkdir -p ${D}${sysconfdir}/rc.d/rc5.d
- ln -s ${sysconfdir}/rc.d/init.d/soundserver ${D}${sysconfdir}/rc.d/rc3.d/S23soundserver
- ln -s ${sysconfdir}/rc.d/init.d/soundserver ${D}${sysconfdir}/rc.d/rc4.d/S23soundserver
+ ln -sf ${sysconfdir}/rc.d/init.d/soundserver ${D}${sysconfdir}/rc.d/rc3.d/S23soundserver
+ ln -sf ${sysconfdir}/rc.d/init.d/soundserver ${D}${sysconfdir}/rc.d/rc4.d/S23soundserver
  
  
  
@@ -177,10 +177,10 @@ libmm-sound_files += "${prefix}/lib/soundplugins/libsoundpluginkeytone.so"
 libmm-sound_files += "${sysconfdir}/rc.d/init.d/soundserver"
 libmm-sound_files += "${sysconfdir}/rc.d/rc3.d/S23soundserver"
 libmm-sound_files += "${sysconfdir}/rc.d/rc4.d/S23soundserver"
-libmm-sound_files += "/usr/share/sounds/sound-server/*"
-libmm-sound_files += "/usr/lib/systemd/system/multi-user.target.wants/sound-server.path"
-libmm-sound_files += "/usr/lib/systemd/system/sound-server.service"
-libmm-sound_files += "/usr/lib/systemd/system/sound-server.path"
+libmm-sound_files += "${prefix}/share/sounds/sound-server/*"
+libmm-sound_files += "${prefix}/lib/systemd/system/multi-user.target.wants/sound-server.path"
+libmm-sound_files += "${prefix}/lib/systemd/system/sound-server.service"
+libmm-sound_files += "${prefix}/lib/systemd/system/sound-server.path"
 MANIFESTFILES_${PN} = "libmm-sound.manifest"
 
 libmm-sound-tool_files = ""
index 2ad0301..817e38a 100644 (file)
@@ -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/libmm-sound;tag=99bffa1e41ae7cb369865ccfd8e6475d00bd04c6;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-sound;tag=4192934b34ade9d554a37df5a8fe46ebcee4befd;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 01f6162..06d85a3 100644 (file)
@@ -38,6 +38,7 @@ DEPENDS = ""
 #DEPENDS of libmm-utility
 DEPENDS += "libmm-common"
 DEPENDS += "libjpeg-turbo"
+DEPENDS += "tizen-platform-config"
 DEPENDS += "libmm-log"
 DEPENDS += "glib-2.0"
 DEPENDS += "libmm-ta"
index 79d840d..cfe5539 100644 (file)
@@ -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/libmm-utility;tag=5770fdcbb009493c3d8981d316f527db30db4aed;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-utility;tag=ca7b89f7f083c83383236e80d9121d6b27f3a5d1;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 1ccdf2a..918aa33 100644 (file)
@@ -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/connectivity/libnet-client;tag=40fca8c3bf88877ec93c7e191064f94ca68c365c;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/connectivity/libnet-client;tag=792489ba4fb299c6f4bf7b54dae415afe3cdf8ae;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 8ce72aa..6b48f59 100644 (file)
@@ -81,7 +81,8 @@ do_compile() {
           -DCMAKE_VERBOSE_MAKEFILE=ON \
           -DTZ_SYS_DB=${prefix}/dbspace \
           -DTZ_SYS_HOME=/home \
-          -DTZ_SYS_ETC=${sysconfdir}
+          -DTZ_SYS_ETC=${sysconfdir} \
+          -DSYSTEMD_UNIT_DIR=/lib/systemd/system
  
  VERBOSE=1 oe_runmake -j16
  
@@ -108,8 +109,8 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  mkdir -p ${D}${prefix}/share/privilege-control/
- mkdir -p ${D}${prefix}/lib/systemd/system/multi-user.target.wants
- ln -sf ${prefix}/lib/systemd/system/smack-rules.service ${D}${prefix}/lib/systemd/system/multi-user.target.wants/smack-rules.service
+ mkdir -p ${D}/lib/systemd/system/multi-user.target.wants
+ ln -sf /lib/systemd/system/smack-rules.service ${D}/lib/systemd/system/multi-user.target.wants/smack-rules.service
  mkdir -p ${D}${prefix}/dbspace
  sed -i 's|TZ_SYS_DB|${prefix}/dbspace|g' ${S}/packaging/libprivilege-control.manifest
  
@@ -139,9 +140,9 @@ PACKAGES += " libprivilege-control-dev "
 libprivilege-control_files = ""
 libprivilege-control_files += "${prefix}/lib/*.so.*"
 libprivilege-control_files += "${prefix}/lib/librules-db-sql-udf.so"
-libprivilege-control_files += "${prefix}/lib/systemd/system/smack-rules.service"
+libprivilege-control_files += "/lib/systemd/system/smack-rules.service"
 libprivilege-control_files += "${prefix}/bin/api_feature_loader"
-libprivilege-control_files += "${prefix}/lib/systemd/system/multi-user.target.wants/smack-rules.service"
+libprivilege-control_files += "/lib/systemd/system/multi-user.target.wants/smack-rules.service"
 libprivilege-control_files += "${prefix}/share/privilege-control/db/rules-db.sql"
 libprivilege-control_files += "${prefix}/share/privilege-control/db/rules-db-data.sql"
 libprivilege-control_files += "${prefix}/share/privilege-control/db/updater.sh"
index 309e9df..73a611c 100644 (file)
@@ -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/security/libprivilege-control;tag=b76cc5fc08162679937b85889992e85f95c6881d;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/security/libprivilege-control;tag=e613fc4d3632b7cc79187ade3186d1e07ec79170;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
diff --git a/meta-tizen/recipes-tizen/libslp-pm/libslp-pm-extraconf.inc b/meta-tizen/recipes-tizen/libslp-pm/libslp-pm-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/meta-tizen/recipes-tizen/libslp-pm/libslp-pm.inc b/meta-tizen/recipes-tizen/libslp-pm/libslp-pm.inc
deleted file mode 100644 (file)
index 250b538..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-DESCRIPTION = "Power manager library"
-HOMEPAGE = "http://nohomepage.org"
-SECTION = "System/Libraries"
-LICENSE = "Apache-2.0"
-
-SRC_URI = ""
-
-S = "${WORKDIR}/git"
-
-inherit autotools-brokensep
-
-BBCLASSEXTEND = ""
-PROVIDES = ""
-
-#PROVIDES by libslp-pm
-
-
-#PROVIDES by libslp-pm-dev
-PROVIDES += "libslp-pm-dev"
-
-
-RDEPENDS = ""
-#RDEPENDS of libslp-pm-dev (${PN}-dev)
-RDEPENDS_${PN}-dev += "libslp-pm"
-
-
-DEPENDS = ""
-#DEPENDS of libslp-pm
-DEPENDS_append_class-native = " cmake-native"
-DEPENDS_append_class-target = " cmake-native"
-
-do_prep() {
- cd ${S}
- chmod -Rf a+rX,u+w,g-w,o-w ${S}
- #setup -q 
- cp ${S}/packaging/libslp-pm.manifest .
-}
-do_patch_append() {
-    bb.build.exec_func('do_prep', d)
-}
-
-do_configure() {
-}
-
-do_compile() {
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- LD_AS_NEEDED=1; export LD_AS_NEEDED ;
-   cmake \
-         -DCMAKE_VERBOSE_MAKEFILE=ON \
-         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-         -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
-         -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
-         -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
-         -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
-         -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
-         -DCMAKE_SKIP_RPATH:BOOL=ON \
-         -DBUILD_SHARED_LIBS:BOOL=ON \
-         ${EXTRA_OECMAKE} .
- oe_runmake -j16
-}
-
-do_install() {
- export RPM_BUILD_ROOT=${D}
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- rm -rf ${D}
- mkdir -p ${D}
- rm -rf ${D}
-   oe_runmake \
-         DESTDIR=${D} \
-         INSTALL_ROOT=${D} \
-         BINDIR=${prefix}/bin \
-   install  
-   rm -f ${D}${infodir}/dir 
-   find ${D} -regex ".*\.la$" | xargs rm -f -- 
-   find ${D} -regex ".*\.a$" | xargs rm -f --
-}
-
-pkg_postinst_${PN}() {
-    #!/bin/sh -e
-
-    [ "x\$D" == "x" ] && ldconfig
-}
-
-pkg_postrm_${PN}() {
-    #!/bin/sh -e
-
-    [ "x\$D" == "x" ] && ldconfig
-}
-
-PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
-PACKAGES += " libslp-pm "
-PACKAGES += " libslp-pm-dev "
-
-libslp-pm_files = ""
-libslp-pm_files += "${prefix}/lib/libpmapi.so.1.2"
-MANIFESTFILES_${PN} = "libslp-pm.manifest"
-
-libslp-pm-dev_files = ""
-libslp-pm-dev_files += "${prefix}/include/pmapi.h"
-libslp-pm-dev_files += "${prefix}/include/pmapi_managed.h"
-libslp-pm-dev_files += "${prefix}/include/SLP_pm_PG.h"
-libslp-pm-dev_files += "${prefix}/lib/pkgconfig/pmapi.pc"
-libslp-pm-dev_files += "${prefix}/lib/libpmapi.so"
-MANIFESTFILES_${PN}-dev = "libslp-pm.manifest"
-
-FILES_${PN} = "${libslp-pm_files}"
-FILES_${PN}-dev = "${libslp-pm-dev_files}"
-
-PKG_libslp-pm= "libslp-pm"
-PKG_libslp-pm-dev= "libslp-pm-dev"
-
-require libslp-pm-extraconf.inc
-
diff --git a/meta-tizen/recipes-tizen/libslp-pm/libslp-pm_git.bb b/meta-tizen/recipes-tizen/libslp-pm/libslp-pm_git.bb
deleted file mode 100644 (file)
index 8de8f34..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-require libslp-pm.inc
-
-PRIORITY = "10"
-
-LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI += "git://review.tizen.org/platform/core/system/libslp-pm;tag=2ee02d3b0050b1a0d37fc0d2d3990d9823916c61;nobranch=1"
-
-BBCLASSEXTEND += " native "
-
diff --git a/meta-tizen/recipes-tizen/libslp-sysman/libslp-sysman_git.bb b/meta-tizen/recipes-tizen/libslp-sysman/libslp-sysman_git.bb
deleted file mode 100644 (file)
index 7debc2e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-require libslp-sysman.inc
-
-PRIORITY = "10"
-
-LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI += "git://review.tizen.org/platform/core/system/libslp-sysman;tag=377c4ba43340e0258b5bbb44ebfc9837930bc63f;nobranch=1"
-
-BBCLASSEXTEND += " native "
-
index bf70abb..9551f27 100644 (file)
@@ -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/uifw/libtbm;tag=2ebf5095f20bfbe63a2c9e8cf79c804612dae110;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/uifw/libtbm;tag=75deaae6c2bbb793cf77186f3034caf3b1e62e77;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 852c359..bd88b09 100644 (file)
@@ -25,7 +25,7 @@ PROVIDES += "libmedia-utils"
 
 RDEPENDS = ""
 #RDEPENDS of libmedia-utils-dev (libmedia-utils-dev)
-RDEPENDS_libmedia-utils-dev += "libtzplatform-config-dev"
+RDEPENDS_libmedia-utils-dev += "tizen-platform-config"
 RDEPENDS_libmedia-utils-dev += "libmedia-utils"
 
 #RDEPENDS of media-server (${PN})
index f1fcfff..f594ee9 100644 (file)
@@ -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/meta-generic;tag=10f735f6159c4c1a5fb09b9d1da00b6a286f454c;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/meta-generic;tag=794a8331cb577438beb9b5b6a9dd7cb9ba87c07a;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index da5f29b..c0c986d 100644 (file)
@@ -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/common/meta;tag=b135c154bf0f82a07c2610bffe01fd705fed6c17;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/common/meta;tag=df560728a3b76c857a12500bca1a701ad917b460;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index c1e3bf8..6455bd9 100644 (file)
@@ -172,7 +172,7 @@ do_compile() {
   
   
 }
-EXTRA_OECONF += " $CONFIG_OPTIONS --with-dynamic-plugins=$DYNAMIC_PLUGINS "
+EXTRA_OECONF += " $CONFIG_OPTIONS --with-dynamic-plugins=$DYNAMIC_PLUGINS && make clean && make -j$(($NUM_CPUS + 1)) $V"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
index 5643f04..16f5ef7 100644 (file)
@@ -60,7 +60,7 @@ do_compile() {
  unset DISPLAY
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
  
- MAJORVER=`echo 0.0.29 | awk 'BEGIN {FS="."}{print $1}'`
+ MAJORVER=`echo 0.0.30 | awk 'BEGIN {FS="."}{print $1}'`
  
    cmake \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -72,7 +72,7 @@ do_compile() {
          -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
          -DCMAKE_SKIP_RPATH:BOOL=ON \
          -DBUILD_SHARED_LIBS:BOOL=ON \
-         ${EXTRA_OECMAKE} . -DFULLVER=0.0.29 -DMAJORVER=${MAJORVER}
+         ${EXTRA_OECMAKE} . -DFULLVER=0.0.30 -DMAJORVER=${MAJORVER}
  
  make -j16
  
index 9784fa0..c4fdec0 100644 (file)
@@ -53,7 +53,18 @@ do_compile() {
  
  export LDFLAGS+="-Wl,--rpath="${prefix}/lib/wrt-plugins" -Wl,--as-needed"
  
- cmake . -DCMAKE_INSTALL_PREFIX=${prefix} -DENABLE_TIME_TRACER="OFF"
+   cmake \
+         -DCMAKE_VERBOSE_MAKEFILE=ON \
+         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+         -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
+         -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
+         -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
+         -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
+         -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
+         -DCMAKE_SKIP_RPATH:BOOL=ON \
+         -DBUILD_SHARED_LIBS:BOOL=ON \
+         ${EXTRA_OECMAKE} . -DCMAKE_INSTALL_PREFIX=${prefix} -DENABLE_TIME_TRACER="OFF"
  
  make -j16 VERBOSE=1
  
@@ -82,6 +93,10 @@ do_install() {
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
  
+ mkdir -p ${D}//lib/systemd/system/../user/weston.target.wants 
+ ln -s ../phoned.service  ${D}//lib/systemd/system/../user/weston.target.wants/phoned.service  
 }
 
 PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
@@ -89,9 +104,10 @@ PACKAGES += " phoned "
 
 phoned_files = ""
 phoned_files += "${prefix}/lib/pkgconfig/phoned.pc"
-phoned_files += "${prefix}/sbin/phoned"
+phoned_files += "${prefix}/bin/phoned"
 phoned_files += "${prefix}/share/dbus-1/services/org.tizen.phone.service"
-phoned_files += "${prefix}/lib/systemd/user/phoned.service"
+phoned_files += "/lib/systemd/user/phoned.service"
+phoned_files += "/lib/systemd/user/weston.target.wants/phoned.service"
 
 FILES_${PN} = "${phoned_files}"
 
index f9187c5..03efae0 100644 (file)
@@ -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/phoned;tag=ba27231c6ce2a674db5be654ae1d4d9bc269e1d8;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/phoned;tag=11632547d96d1b02b8ece75789e420a3d1ca95d3;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 395247c..10e66dc 100644 (file)
@@ -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/appfw/pkgmgr-info;tag=924179f7a9b9e8b9145faca1ff54fb545836b784;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/pkgmgr-info;tag=002f54b12718519eee98a24d58aee547566f5a65;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 4f6d6f1..616cd72 100644 (file)
@@ -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=1b2c68de083f39b0078f5529e4f92530e1eed9b0;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/pulseaudio-module-murphy-ivi;tag=1d515e19a11c4eb61324141e026ced7bf02ce89a;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index ca94fa9..ad6eba2 100644 (file)
@@ -152,7 +152,7 @@ do_compile() {
   
   
 }
-EXTRA_OECONF += " --disable-dependency-tracking --with-lua --with-acl --with-cap --enable-shared --enable-python --with-msm "
+EXTRA_OECONF += " --disable-dependency-tracking --with-lua --with-acl --with-cap --enable-shared --enable-python --with-vendor=tizen --with-msm "
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
@@ -289,8 +289,8 @@ rpm-security-plugin_files += "${sysconfdir}/device-sec-policy"
 MANIFESTFILES_${PN}-security-plugin = "rpm.manifest"
 
 python-rpm_files = ""
-python-rpm_files += "${prefix}/lib/python*/site-packages/rpm"
-python-rpm_files += "${prefix}/lib/python*/site-packages/rpm/transaction.py"
+python-rpm_files += "${prefix}/lib/python2.7/site-packages/rpm"
+python-rpm_files += "${prefix}/lib/python2.7/site-packages/rpm/transaction.py"
 
 rpm-build_files = ""
 rpm-build_files += "${prefix}/bin/rpmbuild"
index 03b9492..3fd363e 100644 (file)
@@ -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/rpm;tag=f72b54db157c1292382236bbd3f4ff5d5028082e;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/rpm;tag=f89638679bc72541591f4cf32241fffae19f54ea;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index d8b8cb0..c9671fd 100644 (file)
@@ -221,8 +221,6 @@ pkgmgr_files += "${sysconfdir}/package-manager/backendlib"
 pkgmgr_files += "${sysconfdir}/opt/upgrade"
 pkgmgr_files += "${sysconfdir}/opt/upgrade/pkgmgr.patch.sh"
 pkgmgr_files += "${prefix}/bin/pkgcmd"
-pkgmgr_files += "${prefix}/bin/pkgcmd.real"
-pkgmgr_files += "${prefix}/bin/pkgcmd.wrapper"
 pkgmgr_files += "${prefix}/bin/pkg_initdb"
 pkgmgr_files += "${prefix}/bin/pkg_getsize"
 pkgmgr_files += "${prefix}/bin/pkginfo"
index 4839f6d..7f7f454 100644 (file)
@@ -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/appfw/slp-pkgmgr;tag=3816771a0d93fdd9ec9c7be9751ace9df7d315af;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/slp-pkgmgr;tag=a6682303fab5c118ec82dc80c9a96643342a2263;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 207aa98..9321fae 100644 (file)
@@ -1,7 +1,7 @@
 DESCRIPTION = "Speech Recognition Engine"
 HOMEPAGE = "http://nohomepage.org"
 SECTION = "System/Libraries"
-LICENSE = "BSD"
+LICENSE = "BSD-2-Clause"
 
 SRC_URI = ""
 
@@ -65,8 +65,7 @@ do_compile() {
   
   
   autotools_do_configure
-  
-  make -j16
+  oe_runmake -j16
   
   
   
@@ -82,14 +81,22 @@ do_install() {
  rm -rf ${D}
  mkdir -p ${D}
  
- rm -rf $RPM_BUILD_ROOT
- mkdir -p $RPM_BUILD_ROOT${prefix}/lib/python2.7/site-packages
- make install DESTDIR=$RPM_BUILD_ROOT
- rm -f $RPM_BUILD_ROOT${prefix}/lib/*.la
+ rm -rf ${D}
+ mkdir -p ${D}${prefix}/lib/python2.7/site-packages
+   oe_runmake \
+         DESTDIR=${D} \
+         INSTALL_ROOT=${D} \
+         BINDIR=${prefix}/bin \
+   install  
+   rm -f ${D}${infodir}/dir 
+   find ${D} -regex ".*\.la$" | xargs rm -f -- 
+   find ${D} -regex ".*\.a$" | xargs rm -f -- DESTDIR=${D}
+ rm -f ${D}${prefix}/lib/*.la
  
  # Install the man pages
- mkdir -p $RPM_BUILD_ROOT${mandir}/man1
- cp -p doc/*.1 $RPM_BUILD_ROOT${mandir}/man1
+ mkdir -p ${D}${mandir}/man1
+ cp -p doc/*.1 ${D}${mandir}/man1
  
  
 }
@@ -123,7 +130,7 @@ sphinxbase_files += "${prefix}/bin/*"
 sphinxbase_files += "${mandir}/man1/*"
 
 sphinxbase-libs_files = ""
-sphinxbase-libs_files += "AUTHORS ChangeLog COPYING NEWS README"
+sphinxbase-libs_files += "AUTHORS ChangeLog NEWS README"
 sphinxbase-libs_files += "${prefix}/lib/libsphinxad.so.*"
 sphinxbase-libs_files += "${prefix}/lib/libsphinxbase.so.*"
 
index 690a6d8..6552597 100644 (file)
@@ -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/sphinxbase;tag=dfd0999be40186cbf473dc9d41b6196df06861a8;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/sphinxbase;tag=0404a5e1800547ab86ee18bd41414877f4596fa2;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index 04873be..4542450 100644 (file)
@@ -34,7 +34,6 @@ DEPENDS += "libxml2"
 DEPENDS += "iniparser"
 DEPENDS += "common"
 DEPENDS += "ecore"
-DEPENDS += "sound-manager"
 DEPENDS += "vconf"
 
 do_prep() {
index c68763a..2b315d7 100644 (file)
@@ -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/api/system-info;tag=4d1b9d0d38f512265b8c6126fbd2e7928bc08cf3;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/api/system-info;tag=53ef242e5153d199d6e73cc4e82d883e79aa1a70;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
diff --git a/meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc b/meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc
new file mode 100644 (file)
index 0000000..b0af99b
--- /dev/null
@@ -0,0 +1,4 @@
+FILES_${PN} += "/usr/lib/systemd/system/system-server.service"
+FILES_${PN} += "/usr/lib/systemd/system/system-server.socket" 
+
+DEPENDS += "heynoti-native"
\ No newline at end of file
diff --git a/meta-tizen/recipes-tizen/system-server/system-server.inc b/meta-tizen/recipes-tizen/system-server/system-server.inc
new file mode 100644 (file)
index 0000000..390bde8
--- /dev/null
@@ -0,0 +1,533 @@
+DESCRIPTION = "System server"
+HOMEPAGE = "http://nohomepage.org"
+SECTION = "System/Service"
+LICENSE = "Apache-2.0"
+
+SRC_URI = ""
+
+S = "${WORKDIR}/git"
+
+inherit autotools-brokensep
+
+BBCLASSEXTEND = ""
+PROVIDES = ""
+
+#PROVIDES by libdevman-dev
+PROVIDES += "libdevman-dev"
+
+
+#PROVIDES by libdeviced-dev
+PROVIDES += "libdeviced-dev"
+
+
+#PROVIDES by libdeviced
+PROVIDES += "libdeviced"
+
+
+#PROVIDES by sysman-dev
+PROVIDES += "sysman-dev"
+
+
+#PROVIDES by libhaptic
+PROVIDES += "libhaptic"
+
+
+#PROVIDES by libslp-pm-dev
+PROVIDES += "libslp-pm-dev"
+
+
+#PROVIDES by libslp-pm
+PROVIDES += "libslp-pm"
+
+
+#PROVIDES by system-server
+
+
+#PROVIDES by sysman-internal-dev
+PROVIDES += "sysman-internal-dev"
+
+
+#PROVIDES by libhaptic-dev
+PROVIDES += "libhaptic-dev"
+
+
+#PROVIDES by libhaptic-plugin-dev
+PROVIDES += "libhaptic-plugin-dev"
+
+
+#PROVIDES by libdevman-haptic-dev
+PROVIDES += "libdevman-haptic-dev"
+
+
+#PROVIDES by sysman
+PROVIDES += "sysman"
+
+
+#PROVIDES by libdevman
+PROVIDES += "libdevman"
+
+
+RDEPENDS = ""
+#RDEPENDS of libdevman-dev (libdevman-dev)
+RDEPENDS_libdevman-dev += "libdevman"
+
+#RDEPENDS of libhaptic (libhaptic)
+RDEPENDS_libhaptic += "system-server"
+
+#RDEPENDS of system-server (${PN})
+RDEPENDS_${PN} += "systemd"
+RDEPENDS_${PN} += "vconf"
+
+#RDEPENDS of libdeviced (libdeviced)
+RDEPENDS_libdeviced += "system-server"
+
+#RDEPENDS of sysman-dev (sysman-dev)
+RDEPENDS_sysman-dev += "sysman"
+
+#RDEPENDS of libslp-pm-dev (libslp-pm-dev)
+RDEPENDS_libslp-pm-dev += "libslp-pm"
+
+#RDEPENDS of libslp-pm (libslp-pm)
+RDEPENDS_libslp-pm += "system-server"
+
+#RDEPENDS of libdeviced-dev (libdeviced-dev)
+RDEPENDS_libdeviced-dev += "libdeviced"
+
+#RDEPENDS of sysman-internal-dev (sysman-internal-dev)
+RDEPENDS_sysman-internal-dev += "sysman"
+
+#RDEPENDS of libhaptic-dev (libhaptic-dev)
+RDEPENDS_libhaptic-dev += "libhaptic"
+
+#RDEPENDS of libhaptic-plugin-dev (libhaptic-plugin-dev)
+RDEPENDS_libhaptic-plugin-dev += "libhaptic"
+
+#RDEPENDS of libdevman-haptic-dev (libdevman-haptic-dev)
+RDEPENDS_libdevman-haptic-dev += "libdevman-dev"
+
+#RDEPENDS of sysman (sysman)
+RDEPENDS_sysman += "system-server"
+
+#RDEPENDS of libdevman (libdevman)
+RDEPENDS_libdevman += "system-server"
+
+
+DEPENDS = ""
+#DEPENDS of system-server
+DEPENDS += "smack"
+DEPENDS += "edbus"
+DEPENDS_append_class-native = " cmake-native"
+DEPENDS_append_class-target = " cmake-native"
+DEPENDS += "attr"
+DEPENDS += "notification"
+DEPENDS += "tizen-platform-config"
+DEPENDS += "syspopup"
+DEPENDS += "libtapi-legacy"
+DEPENDS += "dlog"
+DEPENDS += "usbutils"
+DEPENDS += "libdevice-node"
+DEPENDS += "systemd"
+#Replace "DEPENDS" on gettext by "inherit gettext"
+inherit gettext
+DEPENDS += "libslp-sensor"
+DEPENDS += "heynoti"
+DEPENDS += "ecore"
+DEPENDS += "vconf"
+DEPENDS += "common"
+
+do_prep() {
+ cd ${S}
+ chmod -Rf a+rX,u+w,g-w,o-w ${S}
+ #setup -q
+   cmake \
+         -DCMAKE_VERBOSE_MAKEFILE=ON \
+         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+         -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
+         -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
+         -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
+         -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
+         -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
+         -DCMAKE_SKIP_RPATH:BOOL=ON \
+         -DBUILD_SHARED_LIBS:BOOL=ON \
+         ${EXTRA_OECMAKE} . \
+     -DCMAKE_INSTALL_PREFIX=${prefix} \
+     -DX11_SUPPORT=Off \
+     #eol
+}
+do_patch_append() {
+    bb.build.exec_func('do_prep', d)
+}
+
+do_configure() {
+}
+
+do_compile() {
+ cd ${S}
+ LANG=C
+ export LANG
+ unset DISPLAY
+ LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+ cp ${S}/packaging/system-server.manifest .
+ cp ${S}/packaging/deviced.manifest .
+ cp ${S}/packaging/sysman.manifest .
+ cp ${S}/packaging/libslp-pm.manifest .
+ cp ${S}/packaging/haptic.manifest .
+ cp ${S}/packaging/devman.manifest .
+   cmake \
+         -DCMAKE_VERBOSE_MAKEFILE=ON \
+         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+         -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
+         -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
+         -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
+         -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
+         -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
+         -DCMAKE_SKIP_RPATH:BOOL=ON \
+         -DBUILD_SHARED_LIBS:BOOL=ON \
+         ${EXTRA_OECMAKE} . -DTZ_SYS_ETC=${sysconfdir}
+}
+
+do_install() {
+ export RPM_BUILD_ROOT=${D}
+ cd ${S}
+ LANG=C
+ export LANG
+ unset DISPLAY
+ rm -rf ${D}
+ mkdir -p ${D}
+   oe_runmake \
+         DESTDIR=${D} \
+         INSTALL_ROOT=${D} \
+         BINDIR=${prefix}/bin \
+   install  
+   rm -f ${D}${infodir}/dir 
+   find ${D} -regex ".*\.la$" | xargs rm -f -- 
+   find ${D} -regex ".*\.a$" | xargs rm -f --
+ mkdir -p ${D}//lib/systemd/system/multi-user.target.wants 
+ ln -s ../system-server.service  ${D}//lib/systemd/system/multi-user.target.wants/system-server.service  
+ mkdir -p ${D}//lib/systemd/system/sockets.target.wants 
+ ln -s ../system-server.socket  ${D}//lib/systemd/system/sockets.target.wants/system-server.socket  
+ mkdir -p ${D}//lib/systemd/system/graphical.target.wants 
+ ln -s ../regpmon.service  ${D}//lib/systemd/system/graphical.target.wants/regpmon.service  
+ install -m 0644 ${S}/packaging/regpmon.service ${D}/lib/systemd/system/regpmon.service
+ mkdir -p ${D}//lib/systemd/system/graphical.target.wants 
+ ln -s ../zbooting-done.service  ${D}//lib/systemd/system/graphical.target.wants/zbooting-done.service  
+ install -m 0644 ${S}/packaging/zbooting-done.service ${D}/lib/systemd/system/zbooting-done.service
+}
+
+pkg_postinst_${PN}() {
+    #!/bin/sh -e
+
+    #memory type vconf key init
+    users_gid=$(getent group $TZ_SYS_USER_GROUP | cut -f3 -d':')
+    vconftool set -t int memory/sysman/usbhost_status -1 -i
+    vconftool set -t int memory/sysman/mmc 0 -i
+    vconftool set -t int memory/sysman/earjack_key 0 -i
+    vconftool set -t int memory/sysman/added_usb_storage 0 -i
+    vconftool set -t int memory/sysman/removed_usb_storage 0 -i
+    vconftool set -t int memory/sysman/charger_status -1 -i
+    vconftool set -t int memory/sysman/charge_now -1 -i
+    vconftool set -t int memory/sysman/battery_status_low -1 -i
+    vconftool set -t int memory/sysman/battery_capacity -1 -i
+    vconftool set -t int memory/sysman/usb_status -1 -i
+    vconftool set -t int memory/sysman/earjack -1 -i
+    vconftool set -t int memory/sysman/low_memory 1 -i
+    vconftool set -t int memory/sysman/sliding_keyboard -1 -i
+    vconftool set -t int memory/sysman/mmc_mount -1 -i
+    vconftool set -t int memory/sysman/mmc_unmount -1 -i
+    vconftool set -t int memory/sysman/mmc_format -1 -i
+    vconftool set -t int memory/sysman/mmc_format_progress 0 -i
+    vconftool set -t int memory/sysman/mmc_err_status 0 -i
+    vconftool set -t int memory/sysman/power_off 0 -g $users_gid -i -f
+    vconftool set -t int memory/sysman/battery_level_status -1 -i
+    vconftool set -t string memory/private/sysman/added_storage_uevent "" -i
+    vconftool set -t string memory/private/sysman/removed_storage_uevent "" -g $users_gid -i
+    vconftool set -t int memory/sysman/hdmi 0 -i
+    vconftool set -t int memory/sysman/stime_changed 0 -i
+    #db type vconf key init
+    vconftool set -t int db/sysman/mmc_dev_changed 0 -i
+    vconftool set -t int memory/pm/state 0 -i -g $users_gid
+    vconftool set -t int memory/pm/battery_timetofull -1 -i
+    vconftool set -t int memory/pm/battery_timetoempty -1 -i
+    vconftool set -t int memory/pm/sip_status 0 -i -g $users_gid
+    vconftool set -t int memory/pm/custom_brightness_status 0 -i -g $users_gid
+    vconftool set -t bool memory/pm/brt_changed_lpm 0 -i
+    vconftool set -t int memory/pm/current_brt 60 -i -g $users_gid
+    heynotitool set system_wakeup
+    heynotitool set pm_event
+    heynotitool set power_off_start
+    heynotitool set mmcblk_add
+    heynotitool set mmcblk_remove
+    heynotitool set device_charge_chgdet
+    heynotitool set device_usb_host_add
+    heynotitool set device_usb_host_remove
+    heynotitool set device_pci_keyboard_add
+    heynotitool set device_pci_keyboard_remove
+    heynotitool set device_usb_chgdet
+    heynotitool set device_ta_chgdet
+    heynotitool set device_earjack_chgdet
+    heynotitool set device_earkey_chgdet
+    heynotitool set device_tvout_chgdet
+    heynotitool set device_hdmi_chgdet
+    heynotitool set device_keyboard_chgdet
+    systemctl daemon-reload
+    if [ "$1" = "1" ]; then
+        systemctl restart system-server.service
+        systemctl restart regpmon.service
+       systemctl restart zbooting-done.service
+    fi
+    [ "x\$D" == "x" ] && ldconfig
+
+}
+
+pkg_postinst_libslp-pm() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+}
+
+pkg_postinst_libhaptic() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+}
+
+pkg_postinst_sysman() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+}
+
+pkg_postinst_libdevman() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+}
+
+pkg_postinst_libdeviced() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+}
+
+pkg_prerm_${PN}() {
+    #!/bin/sh -e
+
+    if [ "$1" = "0" ]; then
+        systemctl stop system-server.service
+        systemctl stop regpmon.service
+       systemctl stop zbooting-done.service
+    fi
+
+}
+
+pkg_postrm_libhaptic() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+}
+
+pkg_postrm_${PN}() {
+    #!/bin/sh -e
+
+    systemctl daemon-reload
+    [ "x\$D" == "x" ] && ldconfig
+
+}
+
+pkg_postrm_libslp-pm() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+}
+
+pkg_postrm_libdeviced() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+}
+
+pkg_postrm_libdevman() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+}
+
+pkg_postrm_sysman() {
+    #!/bin/sh -e
+
+    [ "x\$D" == "x" ] && ldconfig
+}
+
+PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
+PACKAGES += " libdevman-dev "
+PACKAGES += " libhaptic "
+PACKAGES += " sysman-dev "
+PACKAGES += " libdeviced-dev "
+PACKAGES += " libslp-pm-dev "
+PACKAGES += " libdevman "
+PACKAGES += " libslp-pm "
+PACKAGES += " system-server "
+PACKAGES += " sysman-internal-dev "
+PACKAGES += " libhaptic-dev "
+PACKAGES += " libhaptic-plugin-dev "
+PACKAGES += " libdevman-haptic-dev "
+PACKAGES += " libdeviced "
+PACKAGES += " sysman "
+
+libdevman-dev_files = ""
+libdevman-dev_files += "${prefix}/include/devman/devman.h"
+libdevman-dev_files += "${prefix}/include/devman/devman_image.h"
+libdevman-dev_files += "${prefix}/include/devman/devman_managed.h"
+libdevman-dev_files += "${prefix}/include/devman/devman_haptic.h"
+libdevman-dev_files += "${prefix}/include/devman/devman_PG.h"
+libdevman-dev_files += "${prefix}/lib/pkgconfig/devman.pc"
+libdevman-dev_files += "${prefix}/lib/libdevman.so"
+
+libhaptic_files = ""
+libhaptic_files += "${prefix}/lib/libhaptic.so.*"
+MANIFESTFILES_libhaptic = "haptic.manifest"
+
+sysman-dev_files = ""
+sysman-dev_files += "${prefix}/include/sysman/sysman.h"
+sysman-dev_files += "${prefix}/include/sysman/sysman_managed.h"
+sysman-dev_files += "${prefix}/include/sysman/sysman_PG.h"
+sysman-dev_files += "${prefix}/lib/pkgconfig/sysman.pc"
+sysman-dev_files += "${prefix}/lib/libsysman.so"
+
+libdeviced-dev_files = ""
+libdeviced-dev_files += "${prefix}/include/deviced/dd-battery.h"
+libdeviced-dev_files += "${prefix}/include/deviced/dd-control.h"
+libdeviced-dev_files += "${prefix}/include/deviced/dd-deviced.h"
+libdeviced-dev_files += "${prefix}/include/deviced/dd-deviced-managed.h"
+libdeviced-dev_files += "${prefix}/include/deviced/dd-display.h"
+libdeviced-dev_files += "${prefix}/include/deviced/dd-haptic.h"
+libdeviced-dev_files += "${prefix}/include/deviced/dd-led.h"
+libdeviced-dev_files += "${prefix}/include/deviced/haptic-module.h"
+libdeviced-dev_files += "${prefix}/include/deviced/haptic-plugin-intf.h"
+libdeviced-dev_files += "${prefix}/lib/libdeviced.so"
+libdeviced-dev_files += "${prefix}/lib/pkgconfig/deviced.pc"
+
+libslp-pm-dev_files = ""
+libslp-pm-dev_files += "${prefix}/include/pmapi/pmapi.h"
+libslp-pm-dev_files += "${prefix}/include/pmapi/pmapi_managed.h"
+libslp-pm-dev_files += "${prefix}/include/pmapi/pm_PG.h"
+libslp-pm-dev_files += "${prefix}/lib/pkgconfig/pmapi.pc"
+libslp-pm-dev_files += "${prefix}/lib/libpmapi.so"
+
+libdevman_files = ""
+libdevman_files += "${prefix}/bin/display_wd"
+libdevman_files += "${prefix}/lib/libdevman.so.*"
+MANIFESTFILES_libdevman = "devman.manifest"
+
+libslp-pm_files = ""
+libslp-pm_files += "${prefix}/lib/libpmapi.so.*"
+MANIFESTFILES_libslp-pm = "libslp-pm.manifest"
+
+system-server_files = ""
+system-server_files += "${sysconfdir}/dbus-1/system.d/deviced.conf"
+system-server_files += "${prefix}/bin/system_server"
+system-server_files += "${prefix}/lib/system-server/shutdown.sh"
+system-server_files += "${prefix}/bin/restart"
+system-server_files += "${prefix}/bin/movi_format.sh"
+system-server_files += "${prefix}/bin/sys_event"
+system-server_files += "${prefix}/bin/pm_event"
+system-server_files += "${prefix}/bin/regpmon"
+system-server_files += "${prefix}/bin/set_pmon"
+system-server_files += "${prefix}/bin/sys_pci_noti"
+system-server_files += "${prefix}/bin/mmc-smack-label"
+system-server_files += "${prefix}/bin/device-daemon"
+system-server_files += "${prefix}/bin/fsck_msdosfs"
+system-server_files += "/lib/systemd/system/multi-user.target.wants/system-server.service"
+system-server_files += "/lib/systemd/system/graphical.target.wants/regpmon.service"
+system-server_files += "/lib/systemd/system/sockets.target.wants/system-server.socket"
+system-server_files += "/lib/systemd/system/system-server.service"
+system-server_files += "/lib/systemd/system/system-server.socket"
+system-server_files += "/lib/systemd/system/regpmon.service"
+system-server_files += "/lib/systemd/system/graphical.target.wants/zbooting-done.service"
+system-server_files += "/lib/systemd/system/zbooting-done.service"
+system-server_files += "${prefix}/share/system-server/sys_pci_noti/res/locale/*/LC_MESSAGES/*.mo"
+system-server_files += "${prefix}/share/license/fsck_msdosfs"
+CONFFILES_${PN} = ""
+CONFFILES_${PN} += "${sysconfdir}/dbus-1/system.d/deviced.conf"
+MANIFESTFILES_${PN} = "system-server.manifest"
+
+sysman-internal-dev_files = ""
+sysman-internal-dev_files += "${prefix}/include/sysman/sysman-internal.h"
+
+libhaptic-dev_files = ""
+libhaptic-dev_files += "${prefix}/include/haptic/haptic.h"
+libhaptic-dev_files += "${prefix}/lib/libhaptic.so"
+libhaptic-dev_files += "${prefix}/lib/pkgconfig/haptic.pc"
+
+libhaptic-plugin-dev_files = ""
+libhaptic-plugin-dev_files += "${prefix}/include/haptic/haptic_module.h"
+libhaptic-plugin-dev_files += "${prefix}/include/haptic/haptic_plugin_intf.h"
+libhaptic-plugin-dev_files += "${prefix}/include/haptic/haptic_PG.h"
+libhaptic-plugin-dev_files += "${prefix}/lib/pkgconfig/haptic-plugin.pc"
+
+libdevman-haptic-dev_files = ""
+libdevman-haptic-dev_files += "${prefix}/include/devman/devman_haptic_ext.h"
+libdevman-haptic-dev_files += "${prefix}/include/devman/devman_haptic_ext_core.h"
+libdevman-haptic-dev_files += "${prefix}/lib/pkgconfig/devman_haptic.pc"
+
+libdeviced_files = ""
+libdeviced_files += "${prefix}/lib/libdeviced.so.*"
+MANIFESTFILES_libdeviced = "deviced.manifest"
+
+sysman_files = ""
+sysman_files += "${prefix}/lib/libsysman.so.*"
+MANIFESTFILES_sysman = "sysman.manifest"
+
+FILES_libdevman-dev = "${libdevman-dev_files}"
+FILES_libhaptic = "${libhaptic_files}"
+FILES_sysman-dev = "${sysman-dev_files}"
+FILES_libdeviced-dev = "${libdeviced-dev_files}"
+FILES_libslp-pm-dev = "${libslp-pm-dev_files}"
+FILES_libdevman = "${libdevman_files}"
+FILES_libslp-pm = "${libslp-pm_files}"
+FILES_${PN} = "${system-server_files}"
+FILES_sysman-internal-dev = "${sysman-internal-dev_files}"
+FILES_libhaptic-dev = "${libhaptic-dev_files}"
+FILES_libhaptic-plugin-dev = "${libhaptic-plugin-dev_files}"
+FILES_libdevman-haptic-dev = "${libdevman-haptic-dev_files}"
+FILES_libdeviced = "${libdeviced_files}"
+FILES_sysman = "${sysman_files}"
+
+PKG_libdevman-dev= "libdevman-dev"
+PKG_libhaptic= "libhaptic"
+PKG_sysman-dev= "sysman-dev"
+PKG_libdeviced-dev= "libdeviced-dev"
+PKG_libslp-pm-dev= "libslp-pm-dev"
+PKG_libdevman= "libdevman"
+PKG_libslp-pm= "libslp-pm"
+PKG_system-server= "system-server"
+PKG_sysman-internal-dev= "sysman-internal-dev"
+PKG_libhaptic-dev= "libhaptic-dev"
+PKG_libhaptic-plugin-dev= "libhaptic-plugin-dev"
+PKG_libdevman-haptic-dev= "libdevman-haptic-dev"
+PKG_libdeviced= "libdeviced"
+PKG_sysman= "sysman"
+
+require system-server-extraconf.inc
+
diff --git a/meta-tizen/recipes-tizen/system-server/system-server_git.bb b/meta-tizen/recipes-tizen/system-server/system-server_git.bb
new file mode 100644 (file)
index 0000000..60506f5
--- /dev/null
@@ -0,0 +1,10 @@
+require system-server.inc
+
+PRIORITY = "10"
+
+LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI += "git://review.tizen.org/platform/core/system/system-server;tag=5635bde5ac3a9528eb253254fb090f93b6ecd000;nobranch=1"
+
+BBCLASSEXTEND += " native "
+
index 70000d4..d1d405f 100644 (file)
@@ -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/framework/web/tizen-extensions-crosswalk;tag=7a720425e78ebf8fd4d9bab845c80401f283f35f;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/tizen-extensions-crosswalk;tag=aa00f4ec8775557b83d4b7d869b56cb5a344a41e;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index b2ffb7f..281df45 100644 (file)
@@ -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/appfw/tizen-platform-config;tag=aee9dcf7f1a616f69fcf22b09373b9ae5f334c85;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/tizen-platform-config;tag=9cba854c38144774c16d1b01fa23fd882bb19dab;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index df53386..0dd33e2 100644 (file)
@@ -67,7 +67,7 @@ do_install() {
  mkdir -p ${D}/usr/share/spec2yocto/macro
  install -m0755 ${S}/packaging/tizen_update_desktop_file.sh ${S}/packaging/map-desktop-category.sh ${D}/usr/share/spec2yocto/macro
  install -m0644 -D ${S}/packaging/macro ${D}${sysconfdir}/rpm/macros.update-desktop-files
- install -m0755 -D ${S}/packaging/brp-trim-desktop.sh ${D}${prefix}/lib/rpm/brp-tizen.d/brp-70-trim-desktopfiles
+ install -m0755 -D ${S}/packaging/brp-trim-desktop.sh ${D}/usr/share/spec2yocto/macro/brp-tizen.d/brp-70-trim-desktopfiles
  
  
 }
index 7c7a931..7684128 100644 (file)
@@ -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/update-desktop-files;tag=ca1b55134e1f144f7d06d69e9edb8197a3cfc9e1;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/update-desktop-files;tag=41a39c9fe36dbbbc769ca391c32d5f8a3c0c0291;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
index c2aef79..79574e7 100644 (file)
@@ -22,6 +22,7 @@ PROVIDES += "genivi-shell-dev"
 
 RDEPENDS = ""
 #RDEPENDS of genivi-shell-dev (genivi-shell-dev)
+RDEPENDS_genivi-shell-dev += "weston"
 RDEPENDS_genivi-shell-dev += "wayland-ivi-extension"
 
 
@@ -31,6 +32,7 @@ DEPENDS_append_class-native = " cmake-native"
 DEPENDS_append_class-target = " cmake-native"
 DEPENDS += "libxkbcommon"
 DEPENDS += "cairo"
+DEPENDS += "weston-ivi-shell"
 DEPENDS += "weston"
 DEPENDS += "wayland"
 DEPENDS += "libffi"
@@ -44,6 +46,12 @@ do_prep() {
  /usr/bin/wayland-scanner code < protocol/ivi-controller.xml \
      > protocol/ivi-controller-protocol.c
  
+ cat ivi-extension-protocol.pc.in \
+     | sed s\#@libdir@\#${prefix}/lib\#g \
+     | sed s\#@includedir@\#${prefix}/include/genivi-shell\#g \
+     | sed s\#@name@\#genivi-shell\#g \
+     | sed s\#@package_version@\#0.2.3\#g \
+     > ivi-extension-protocol.pc
  
  
    cmake \
@@ -75,7 +83,7 @@ do_compile() {
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
  
  
- make -j16
+ make -j16 V=1
  
  
  
@@ -100,6 +108,8 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
+ install -d ${D}/${prefix}/include/genivi-shell/
+ install -d ${D}/${prefix}/lib/pkgconfig/
  install -d ${D}/${prefix}/share/genivi-shell/protocol/
  
  install -m 644 protocol/ivi-application.xml ${D}/${prefix}/share/genivi-shell/protocol/
@@ -111,12 +121,24 @@ do_install() {
  install -m 644 protocol/ivi-application-protocol.c \
      ${D}/${prefix}/share/genivi-shell/protocol/
  
+ install -m 644 protocol/ivi-application-client-protocol.h \
+     ${D}/${prefix}/include/genivi-shell/
  install -m 644 protocol/ivi-controller-server-protocol.h \
      ${D}/${prefix}/share/genivi-shell/protocol/
  
  install -m 644 protocol/ivi-controller-protocol.c \
      ${D}/${prefix}/share/genivi-shell/protocol/
  
+ install -m 644 protocol/ivi-controller-client-protocol.h \
+     ${D}/${prefix}/include/genivi-shell/
+ install -m 644 protocol/libivi-extension-protocol.a \
+     ${D}/${prefix}/lib/
+ install -m 644  ivi-extension-protocol.pc \
+     ${D}/${prefix}/lib/pkgconfig/
  
 }
 
@@ -137,6 +159,7 @@ PACKAGES += " genivi-shell "
 PACKAGES += " genivi-shell-dev "
 
 genivi-shell_files = ""
+genivi-shell_files += "${prefix}/bin/IVISurfaceCreator"
 genivi-shell_files += "${prefix}/bin/LayerManagerControl"
 genivi-shell_files += "${prefix}/bin/EGLWLMockNavigation"
 genivi-shell_files += "${prefix}/lib/libilmClient.so.*"
@@ -151,9 +174,12 @@ genivi-shell-dev_files += "${prefix}/include/ilm/ilm_common.h"
 genivi-shell-dev_files += "${prefix}/include/ilm/ilm_control.h"
 genivi-shell-dev_files += "${prefix}/include/ilm/ilm_platform.h"
 genivi-shell-dev_files += "${prefix}/include/ilm/ilm_types.h"
+genivi-shell-dev_files += "${prefix}/include/genivi-shell/*.h"
 genivi-shell-dev_files += "${prefix}/lib/libilmClient.so"
 genivi-shell-dev_files += "${prefix}/lib/libilmCommon.so"
 genivi-shell-dev_files += "${prefix}/lib/libilmControl.so"
+genivi-shell-dev_files += "${prefix}/lib/libivi-extension-protocol.a"
+genivi-shell-dev_files += "${prefix}/lib/pkgconfig/ivi-extension-protocol.pc"
 genivi-shell-dev_files += "${prefix}/share/genivi-shell/protocol/*.xml"
 genivi-shell-dev_files += "${prefix}/share/genivi-shell/protocol/*.h"
 genivi-shell-dev_files += "${prefix}/share/genivi-shell/protocol/*.c"
index edcbebb..7855e68 100644 (file)
@@ -4,8 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/profile/ivi/wayland-ivi-extension;tag=3b85503152f78b98a1edb0381984966638156482;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/wayland-ivi-extension;tag=acce51eebfa69c51d2a7f6cc739ec4899055350b;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
-B="${S}"
\ No newline at end of file
index b39fc61..607562b 100644 (file)
@@ -32,10 +32,16 @@ do_install_append() {
     rm -fr ${D}/usr/lib/weston/gl-renderer.so
     rm -fr ${D}/usr/lib/weston/.debug/gl-renderer.so
 
+
     # Enable a logind session for 'app' user on seat0 (the default seat for
     # graphical sessions)
     mkdir -p ${D}/lib/systemd/system/graphical.target.wants
     ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5000.service
+
+    
+    rm -fr ${D}${prefix}/bin/weston-scaler
+    rm -fr ${D}${prefix}/bin/weston-stacking
+    rm -fr ${D}${prefix}/bin/weston-multi-resource
 }
 
 pkg_postinst_${PN} () {
index f6a40f5..36e9b35 100644 (file)
@@ -87,12 +87,14 @@ do_compile() {
   
    
   autotools_do_configure
-  make -j16
+  
+  oe_runmake -j16
+  
   
   
   
 }
-EXTRA_OECONF += " --disable-static --disable-libunwind --disable-xwayland --disable-xwayland-test --disable-drm-compositor --disable-x11-compositor --disable-rpi-compositor --disable-fbdev-compositor --disable-wayland-compositor --disable-headless-compositor --disable-weston-launch --enable-simple-clients --enable-clients --disable-wcap-tools --disable-demo-clients-install --disable-libinput-backend --disable-fullscreen-shell"
+EXTRA_OECONF += " --disable-static --disable-libunwind --disable-xwayland --disable-xwayland-test --disable-drm-compositor --disable-x11-compositor --disable-rpi-compositor --disable-fbdev-compositor --disable-wayland-compositor --disable-headless-compositor --disable-weston-launch --enable-simple-clients --enable-clients --disable-wcap-tools --enable-demo-clients-install --disable-libinput-backend --disable-fullscreen-shell --disable-desktop-shell --disable-simple-clients --enable-ivi-shell"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
@@ -115,22 +117,23 @@ do_install() {
  
  # install example clients
  mkdir -p ${D}${prefix}/bin/ivi
- install -m 755 weston-calibrator ${D}${prefix}/bin/ivi
- install -m 755 weston-simple-touch ${D}${prefix}/bin/ivi
- install -m 755 weston-simple-shm ${D}${prefix}/bin/ivi
- install -m 755 weston-simple-egl ${D}${prefix}/bin/ivi
- install -m 755 weston-flower ${D}${prefix}/bin/ivi
- install -m 755 weston-image ${D}${prefix}/bin/ivi
- install -m 755 weston-cliptest ${D}${prefix}/bin/ivi
- install -m 755 weston-dnd ${D}${prefix}/bin/ivi
- install -m 755 weston-editor ${D}${prefix}/bin/ivi
- install -m 755 weston-smoke ${D}${prefix}/bin/ivi
- install -m 755 weston-resizor ${D}${prefix}/bin/ivi
- install -m 755 weston-eventdemo ${D}${prefix}/bin/ivi
- install -m 755 weston-clickdot ${D}${prefix}/bin/ivi
- install -m 755 weston-subsurfaces ${D}${prefix}/bin/ivi
- install -m 755 weston-transformed ${D}${prefix}/bin/ivi
- install -m 755 weston-fullscreen ${D}${prefix}/bin/ivi
+ #mv ${D}${prefix}/bin/weston-calibrator ${D}${prefix}/bin/ivi
+ #mv ${D}${prefix}/bin/weston-simple-touch ${D}${prefix}/bin/ivi
+ #mv ${D}${prefix}/bin/weston-simple-shm ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-simple-egl ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-flower ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-image ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-cliptest ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-dnd ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-editor ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-smoke ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-resizor ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-eventdemo ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-clickdot ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-subsurfaces ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-transformed ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-fullscreen ${D}${prefix}/bin/ivi
+ mv ${D}${prefix}/bin/weston-terminal ${D}${prefix}/bin/ivi
  
  install -d ${D}/${prefix}/share/weston-ivi-shell/protocol/
  
@@ -163,6 +166,7 @@ weston-ivi-shell-dev_files = ""
 weston-ivi-shell-dev_files += "${prefix}/include/weston/ivi-layout-export.h"
 weston-ivi-shell-dev_files += "${prefix}/include/weston/ivi-layout.h"
 weston-ivi-shell-dev_files += "${prefix}/include/weston/ivi-shell.h"
+weston-ivi-shell-dev_files += "${prefix}/include/weston/ivi-shell-ext.h"
 weston-ivi-shell-dev_files += "${prefix}/include/weston/ivi-layout-transition.h"
 weston-ivi-shell-dev_files += "${prefix}/share/weston-ivi-shell/protocol/*"
 MANIFESTFILES_${PN}-dev = "weston-ivi-shell.manifest"
@@ -174,8 +178,6 @@ CONFFILES_${PN}-config += "${sysconfdir}/xdg/weston/weston.ini"
 MANIFESTFILES_${PN}-config = "weston-ivi-shell.manifest"
 
 weston-ivi-shell-clients_files = ""
-weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-simple-touch"
-weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-simple-shm"
 weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-simple-egl"
 weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-flower"
 weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-image"
@@ -189,7 +191,7 @@ weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-clickdot"
 weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-subsurfaces"
 weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-transformed"
 weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-fullscreen"
-weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-calibrator"
+weston-ivi-shell-clients_files += "${prefix}/bin/ivi/weston-terminal"
 MANIFESTFILES_${PN}-clients = "weston-ivi-shell.manifest"
 
 weston-ivi-shell_files = ""
index 1cffbf3..ece3b11 100644 (file)
@@ -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/weston-ivi-shell;tag=b4696d8207bfbf028fef696d7dc4c6a69b2270f0;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/weston-ivi-shell;tag=03ba0c96cfb2e7a32d92a1c5a833d05922dfee34;nobranch=1"
 
 BBCLASSEXTEND += " native "