From 849972804180f6d2d95ccb8f79368c64bc5d7afb Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Sat, 14 Feb 2015 12:58:49 +0100 Subject: [PATCH] Fix build in capi related package Note : some of the capi packages have been downgrade temporaly to reach the image build point. Change-Id: I8d1f343b2b81f4e82889f997614c2e1e029920c4 Signed-off-by: Xavier Roche --- .../capi-content-media-content_git.bb | 2 +- .../capi-media-sound-manager.inc | 20 +- .../capi-media-sound-manager_git.bb | 2 +- .../capi-media-wav-player.inc | 4 +- .../capi-media-wav-player_git.bb | 2 +- .../capi-network-tethering.inc | 5 +- .../capi-network-tethering_git.bb | 2 +- .../capi-network-wifi/capi-network-wifi.inc | 6 +- .../capi-network-wifi/capi-network-wifi_git.bb | 2 +- .../capi-system-device/capi-system-device.inc | 2 +- .../capi-system-device/capi-system-device_git.bb | 2 +- .../deviced/deviced-extraconf.inc | 0 .../deviced/deviced.inc | 487 +++++++++++++++++++++ .../deviced/deviced_git.bb | 10 + .../libmedia-thumbnail/libmedia-thumbnail.inc | 2 +- .../libmm-common/libmm-common.inc | 15 +- .../libmm-common/libmm-common_git.bb | 2 +- 17 files changed, 519 insertions(+), 46 deletions(-) create mode 100644 meta-tizen-common-base/recipes-application-framework/deviced/deviced-extraconf.inc create mode 100644 meta-tizen-common-base/recipes-application-framework/deviced/deviced.inc create mode 100644 meta-tizen-common-base/recipes-application-framework/deviced/deviced_git.bb diff --git a/meta-tizen-common-base/recipes-application-framework/capi-content-media-content/capi-content-media-content_git.bb b/meta-tizen-common-base/recipes-application-framework/capi-content-media-content/capi-content-media-content_git.bb index 4d64b66..ac972a6 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-content-media-content/capi-content-media-content_git.bb +++ b/meta-tizen-common-base/recipes-application-framework/capi-content-media-content/capi-content-media-content_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/api/media-content;tag=f8e097736df02e1686da42f2d56ea31ad4a7bac2;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/api/media-content;tag=af69336d70625b89d376c9b1fa90225eb2deed95;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-application-framework/capi-media-sound-manager/capi-media-sound-manager.inc b/meta-tizen-common-base/recipes-application-framework/capi-media-sound-manager/capi-media-sound-manager.inc index 03003c9..bc1380f 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-media-sound-manager/capi-media-sound-manager.inc +++ b/meta-tizen-common-base/recipes-application-framework/capi-media-sound-manager/capi-media-sound-manager.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Sound Manager library" HOMEPAGE = "http://nohomepage.org" SECTION = "Multimedia/API" LICENSE = "Apache-2.0" -PV = "0.2.27" +PV = "0.1.1" SRC_URI = "" @@ -24,10 +24,6 @@ RDEPENDS = "" #RDEPENDS of capi-media-sound-manager-dev (${PN}-dev) RDEPENDS_${PN}-dev += "capi-media-sound-manager" -#RDEPENDS of capi-media-sound-manager (${PN}) -RDEPENDS_${PN} += "glibc" -RDEPENDS_${PN} += "libprivilege-control" - DEPENDS = "" #DEPENDS of capi-media-sound-manager @@ -35,7 +31,6 @@ DEPENDS += "libmm-sound" inherit tizen_cmake inherit pkgconfig DEPENDS += "dlog" -DEPENDS += "vconf" DEPENDS += "capi-base-common" DEPENDS += "libmm-session" @@ -61,7 +56,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - MAJORVER=`echo 0.2.27 | awk 'BEGIN {FS="."}{print $1}'` + MAJORVER=`echo 0.1.1 | awk 'BEGIN {FS="."}{print $1}'` cmake \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -90,12 +85,6 @@ do_install() { rm -rf ${D} mkdir -p ${D} - rm -rf ${D} - mkdir -p ${D}/usr/share/license - mkdir -p ${D}/opt/usr/devel - cp LICENSE ${D}/usr/share/license/capi-media-sound-manager - cp test/sound_manager_test ${D}/opt/usr/devel - oe_runmake \ DESTDIR=${D} \ @@ -113,8 +102,6 @@ pkg_postinst_${PN}() { #!/bin/sh -e [ "x$D" == "x" ] && ldconfig - /usr/bin/api_feature_loader --verbose --dir=/usr/share/privilege-control - } pkg_postrm_${PN}() { @@ -129,15 +116,12 @@ PACKAGES += " capi-media-sound-manager " capi-media-sound-manager-dev_files = "" capi-media-sound-manager-dev_files += "${prefix}/include/media/sound_manager.h" -capi-media-sound-manager-dev_files += "${prefix}/include/media/sound_manager_internal.h" capi-media-sound-manager-dev_files += "${prefix}/lib/pkgconfig/*.pc" capi-media-sound-manager-dev_files += "${prefix}/lib/libcapi-media-sound-manager.so" MANIFESTFILES_${PN}-dev = "capi-media-sound-manager.manifest" capi-media-sound-manager_files = "" capi-media-sound-manager_files += "${prefix}/lib/libcapi-media-sound-manager.so.*" -capi-media-sound-manager_files += "${prefix}/share/license/capi-media-sound-manager" -capi-media-sound-manager_files += "/opt/usr/devel/*" MANIFESTFILES_${PN} = "capi-media-sound-manager.manifest" FILES_${PN}-dev = "${capi-media-sound-manager-dev_files}" diff --git a/meta-tizen-common-base/recipes-application-framework/capi-media-sound-manager/capi-media-sound-manager_git.bb b/meta-tizen-common-base/recipes-application-framework/capi-media-sound-manager/capi-media-sound-manager_git.bb index 2f8a167..e0a6f5c 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-media-sound-manager/capi-media-sound-manager_git.bb +++ b/meta-tizen-common-base/recipes-application-framework/capi-media-sound-manager/capi-media-sound-manager_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/api/sound-manager;tag=4232dc89238c674ae1fcc240cb19547e2a92bae0;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/api/sound-manager;tag=941540c35dff234708b34bc90384728f1aa6f614;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-application-framework/capi-media-wav-player/capi-media-wav-player.inc b/meta-tizen-common-base/recipes-application-framework/capi-media-wav-player/capi-media-wav-player.inc index 5d6b31f..d4eb89c 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-media-wav-player/capi-media-wav-player.inc +++ b/meta-tizen-common-base/recipes-application-framework/capi-media-wav-player/capi-media-wav-player.inc @@ -2,7 +2,7 @@ DESCRIPTION = "A wav player library in Tizen C API" HOMEPAGE = "http://nohomepage.org" SECTION = "Multimedia/API" LICENSE = "Apache-2.0" -PV = "0.1.1" +PV = "0.1.0" SRC_URI = "" @@ -56,7 +56,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - MAJORVER=`echo 0.1.1 | awk 'BEGIN {FS="."}{print $1}'` + MAJORVER=`echo 0.1.0 | awk 'BEGIN {FS="."}{print $1}'` cmake \ -DCMAKE_VERBOSE_MAKEFILE=ON \ diff --git a/meta-tizen-common-base/recipes-application-framework/capi-media-wav-player/capi-media-wav-player_git.bb b/meta-tizen-common-base/recipes-application-framework/capi-media-wav-player/capi-media-wav-player_git.bb index 463e8f8..44c45d5 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-media-wav-player/capi-media-wav-player_git.bb +++ b/meta-tizen-common-base/recipes-application-framework/capi-media-wav-player/capi-media-wav-player_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/api/wav-player;tag=e12356a988051f36a2b69dfc6ce0a067117c72d8;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/api/wav-player;tag=1607cdbbb1fa3f0d1c1bc47b14a7d16d94ca815c;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-application-framework/capi-network-tethering/capi-network-tethering.inc b/meta-tizen-common-base/recipes-application-framework/capi-network-tethering/capi-network-tethering.inc index 37c41c6..9e7cd6a 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-network-tethering/capi-network-tethering.inc +++ b/meta-tizen-common-base/recipes-application-framework/capi-network-tethering/capi-network-tethering.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Tethering Framework" HOMEPAGE = "http://nohomepage.org" SECTION = "Connectivity/API" LICENSE = "Apache-2.0" -PV = "0.0.16" +PV = "0.0.15" SRC_URI = "" @@ -94,8 +94,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}/usr/share/license - cp LICENSE.APLv2.0 ${D}/usr/share/license/capi-network-tethering } @@ -124,7 +122,6 @@ MANIFESTFILES_${PN}-dev = "capi-network-tethering.manifest" capi-network-tethering_files = "" capi-network-tethering_files += "${prefix}/lib/*.so.*" -capi-network-tethering_files += "/usr/share/license/capi-network-tethering" capi-network-tethering_files += "/etc/config/connectivity/sysinfo-tethering.xml" MANIFESTFILES_${PN} = "capi-network-tethering.manifest" diff --git a/meta-tizen-common-base/recipes-application-framework/capi-network-tethering/capi-network-tethering_git.bb b/meta-tizen-common-base/recipes-application-framework/capi-network-tethering/capi-network-tethering_git.bb index fd7b046..3224c32 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-network-tethering/capi-network-tethering_git.bb +++ b/meta-tizen-common-base/recipes-application-framework/capi-network-tethering/capi-network-tethering_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/api/tethering;tag=64e19e65e8ea1085b281af93aa25e40aba9145df;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/api/tethering;tag=d9c4a9752d0c8be29faa847511f5aac088e13dc3;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-application-framework/capi-network-wifi/capi-network-wifi.inc b/meta-tizen-common-base/recipes-application-framework/capi-network-wifi/capi-network-wifi.inc index 350b591..2a032f1 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-network-wifi/capi-network-wifi.inc +++ b/meta-tizen-common-base/recipes-application-framework/capi-network-wifi/capi-network-wifi.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Network Wi-Fi library in TIZEN C API" HOMEPAGE = "http://nohomepage.org" SECTION = "System/Network" LICENSE = "Apache-2.0" -PV = "0.1.2_25" +PV = "0.1.2_18" SRC_URI = "" @@ -58,7 +58,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - MAJORVER=`echo 0.1.2_25 | awk 'BEGIN {FS="."}{print $1}'` + MAJORVER=`echo 0.1.2_18 | awk 'BEGIN {FS="."}{print $1}'` cmake \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -71,7 +71,7 @@ do_compile() { -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ - ${EXTRA_OECMAKE} . -DFULLVER=0.1.2_25 -DMAJORVER=${MAJORVER} + ${EXTRA_OECMAKE} . -DFULLVER=0.1.2_18 -DMAJORVER=${MAJORVER} oe_runmake diff --git a/meta-tizen-common-base/recipes-application-framework/capi-network-wifi/capi-network-wifi_git.bb b/meta-tizen-common-base/recipes-application-framework/capi-network-wifi/capi-network-wifi_git.bb index 3743124..8a509aa 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-network-wifi/capi-network-wifi_git.bb +++ b/meta-tizen-common-base/recipes-application-framework/capi-network-wifi/capi-network-wifi_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/api/wifi;tag=e4f3757407a3f24d8b1d182c43b880e867788fd7;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/api/wifi;tag=391e3b9f55f1dc7339c6aba23738c6bdf116eb77;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-application-framework/capi-system-device/capi-system-device.inc b/meta-tizen-common-base/recipes-application-framework/capi-system-device/capi-system-device.inc index d31ca34..ab1386c 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-system-device/capi-system-device.inc +++ b/meta-tizen-common-base/recipes-application-framework/capi-system-device/capi-system-device.inc @@ -32,7 +32,7 @@ DEPENDS += "capi-system-info" DEPENDS += "dbus" inherit pkgconfig DEPENDS += "dlog" -DEPENDS += "pkgconfig(deviced)" +DEPENDS += "system-server" DEPENDS += "capi-base-common" DEPENDS += "vconf" DEPENDS += "dbus-glib" diff --git a/meta-tizen-common-base/recipes-application-framework/capi-system-device/capi-system-device_git.bb b/meta-tizen-common-base/recipes-application-framework/capi-system-device/capi-system-device_git.bb index 48b0781..e3bc02e 100644 --- a/meta-tizen-common-base/recipes-application-framework/capi-system-device/capi-system-device_git.bb +++ b/meta-tizen-common-base/recipes-application-framework/capi-system-device/capi-system-device_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/api/device;tag=b3d72a64ca39fef39127aeb040f370c9e2798c2e;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/api/device;tag=5269dd43219b58e326d5a12f89ec3b106d1deb4c;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen-common-base/recipes-application-framework/deviced/deviced-extraconf.inc b/meta-tizen-common-base/recipes-application-framework/deviced/deviced-extraconf.inc new file mode 100644 index 0000000..e69de29 diff --git a/meta-tizen-common-base/recipes-application-framework/deviced/deviced.inc b/meta-tizen-common-base/recipes-application-framework/deviced/deviced.inc new file mode 100644 index 0000000..628c00f --- /dev/null +++ b/meta-tizen-common-base/recipes-application-framework/deviced/deviced.inc @@ -0,0 +1,487 @@ +DESCRIPTION = "Deviced" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Framework/system" +LICENSE = "Apache-2.0" +PV = "1.0.0" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit manifest autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by libdevman-dev +PROVIDES += "libdevman-dev" + + +#PROVIDES by libhaptic +PROVIDES += "libhaptic" + + +#PROVIDES by libdeviced +PROVIDES += "libdeviced" + + +#PROVIDES by sysman-dev +PROVIDES += "sysman-dev" + + +#PROVIDES by deviced-deviced +PROVIDES += "deviced-deviced" + + +#PROVIDES by libslp-pm-dev +PROVIDES += "libslp-pm-dev" + + +#PROVIDES by libhaptic-plugin-dev +PROVIDES += "libhaptic-plugin-dev" + + +#PROVIDES by libslp-pm +PROVIDES += "libslp-pm" + + +#PROVIDES by libdeviced-dev +PROVIDES += "libdeviced-dev" + + +#PROVIDES by sysman-internal-dev +PROVIDES += "sysman-internal-dev" + + +#PROVIDES by libhaptic-dev +PROVIDES += "libhaptic-dev" + + +#PROVIDES by libdevman-haptic-dev +PROVIDES += "libdevman-haptic-dev" + + +#PROVIDES by deviced + + +#PROVIDES by sysman +PROVIDES += "sysman" + + +#PROVIDES by libdevman +PROVIDES += "libdevman" + + +RDEPENDS = "" +#RDEPENDS of libdevman-dev (libdevman-dev) +RDEPENDS_libdevman-dev += "libdevman" + +#RDEPENDS of libdeviced (lib${PN}) +RDEPENDS_lib${PN} += "deviced" + +#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 libhaptic-plugin-dev (libhaptic-plugin-dev) +RDEPENDS_libhaptic-plugin-dev += "libhaptic" + +#RDEPENDS of libslp-pm (libslp-pm) +RDEPENDS_libslp-pm += "libdeviced" + +#RDEPENDS of libdeviced-dev (lib${PN}-dev) +RDEPENDS_lib${PN}-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 deviced (${PN}) +RDEPENDS_${PN} += "systemd" +RDEPENDS_${PN} += "vconf" + +#RDEPENDS of libdevman-haptic-dev (libdevman-haptic-dev) +RDEPENDS_libdevman-haptic-dev += "libdevman-dev" + +#RDEPENDS of sysman (sysman) +RDEPENDS_sysman += "libdeviced" + +#RDEPENDS of libdevman (libdevman) +RDEPENDS_libdevman += "libdeviced" + + +DEPENDS = "" +#DEPENDS of deviced +DEPENDS += "smack" +DEPENDS += "edbus" +inherit tizen_cmake +DEPENDS += "attr" +#Replace "DEPENDS" on gettext by "inherit gettext" +inherit gettext +DEPENDS += "notification" +DEPENDS += "tizen-platform-config" +DEPENDS += "syspopup" +inherit pkgconfig +DEPENDS += "libtapi" +DEPENDS += "libdevice-node" +DEPENDS += "systemd" +DEPENDS += "dlog" +DEPENDS += "ecore" +DEPENDS += "sensor" +DEPENDS += "vconf" +DEPENDS += "dbus-glib" +DEPENDS += "capi-base-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 \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ + ${EXTRA_OECMAKE} . \ + -DTZ_SYS_ETC=${sysconfdir} \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DARCH=emulator \ + -DTIZEN_DISPLAY:BOOL=ON \ + #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/deviced.manifest . + cp ${S}/packaging/libdeviced.manifest . + cp ${S}/packaging/sysman.manifest . + cp ${S}/packaging/libslp-pm.manifest . + cp ${S}/packaging/haptic.manifest . + cp ${S}/packaging/devman.manifest . + + oe_runmake + + + +} + +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 -- + + + mkdir -p ${D}/${systemd_unitdir}/system/multi-user.target.wants + ln -s ../deviced.service ${D}/${systemd_unitdir}/system/multi-user.target.wants/deviced.service + + mkdir -p ${D}/${systemd_unitdir}/system/sockets.target.wants + ln -s ../deviced.socket ${D}/${systemd_unitdir}/system/sockets.target.wants/deviced.socket + + mkdir -p ${D}/${systemd_unitdir}/system/graphical.target.wants + ln -s ../zbooting-done.service ${D}/${systemd_unitdir}/system/graphical.target.wants/zbooting-done.service + + mkdir -p ${D}/${systemd_unitdir}/system/graphical.target.wants + ln -s ../devicectl-stop@.service ${D}/${systemd_unitdir}/system/graphical.target.wants/devicectl-stop@.service + + +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + #memory type vconf key init + users_gid=$(getent group users | cut -f3 -d':') + vconftool set -t int memory/sysman/usbhost_status -1 -i + vconftool set -t int memory/sysman/mmc -1 -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" + systemctl daemon-reload + if [ "$1" == "1" ]; then + systemctl restart deviced.service + systemctl restart zbooting-done.service + fi + +} + +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 deviced.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 + +} + +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 += " libslp-pm-dev " +PACKAGES += " deviced " +PACKAGES += " libdevman " +PACKAGES += " libslp-pm " +PACKAGES += " libdeviced-dev " +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/SLP_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/SLP_sysman_PG.h" +sysman-dev_files += "${prefix}/lib/pkgconfig/sysman.pc" +sysman-dev_files += "${prefix}/lib/libsysman.so" + +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/SLP_pm_PG.h" +libslp-pm-dev_files += "${prefix}/lib/pkgconfig/pmapi.pc" +libslp-pm-dev_files += "${prefix}/lib/libpmapi.so" + +deviced_files = "" +deviced_files += "${sysconfdir}/dbus-1/system.d/deviced.conf" +deviced_files += "${prefix}/bin/deviced-pre.sh" +deviced_files += "${prefix}/bin/deviced" +deviced_files += "${prefix}/bin/devicectl" +deviced_files += "${prefix}/bin/movi_format.sh" +deviced_files += "${systemd_unitdir}/system/multi-user.target.wants/deviced.service" +deviced_files += "${systemd_unitdir}/system/sockets.target.wants/deviced.socket" +deviced_files += "${systemd_unitdir}/system/graphical.target.wants/zbooting-done.service" +deviced_files += "${systemd_unitdir}/system/graphical.target.wants/devicectl-stop@.service" +deviced_files += "${systemd_unitdir}/system/deviced.service" +deviced_files += "${systemd_unitdir}/system/deviced.socket" +deviced_files += "${systemd_unitdir}/system/deviced-pre.service" +deviced_files += "${systemd_unitdir}/system/zbooting-done.service" +deviced_files += "${systemd_unitdir}/system/devicectl-start@.service" +deviced_files += "${systemd_unitdir}/system/devicectl-stop@.service" +CONFFILES_${PN} = "" +CONFFILES_${PN} += "${sysconfdir}/dbus-1/system.d/deviced.conf" +MANIFESTFILES_${PN} = "deviced.manifest" + +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" + +libdeviced-dev_files = "" +libdeviced-dev_files += "${prefix}/include/deviced/*.h" +libdeviced-dev_files += "${prefix}/lib/libdeviced.so" +libdeviced-dev_files += "${prefix}/lib/pkgconfig/deviced.pc" + +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/SLP_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_lib${PN} = "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_libslp-pm-dev = "${libslp-pm-dev_files}" +FILES_${PN} = "${deviced_files}" +FILES_libdevman = "${libdevman_files}" +FILES_libslp-pm = "${libslp-pm_files}" +FILES_lib${PN}-dev = "${libdeviced-dev_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_lib${PN} = "${libdeviced_files}" +FILES_sysman = "${sysman_files}" + +PKG_libdevman-dev= "libdevman-dev" +PKG_libhaptic= "libhaptic" +PKG_sysman-dev= "sysman-dev" +PKG_libslp-pm-dev= "libslp-pm-dev" +PKG_deviced= "deviced" +PKG_libdevman= "libdevman" +PKG_libslp-pm= "libslp-pm" +PKG_libdeviced-dev= "libdeviced-dev" +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 deviced-extraconf.inc + diff --git a/meta-tizen-common-base/recipes-application-framework/deviced/deviced_git.bb b/meta-tizen-common-base/recipes-application-framework/deviced/deviced_git.bb new file mode 100644 index 0000000..e71aabe --- /dev/null +++ b/meta-tizen-common-base/recipes-application-framework/deviced/deviced_git.bb @@ -0,0 +1,10 @@ +require deviced.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/system/deviced;tag=a8523c4eab30ad4decd1972aa5dd0934ee42b1ae;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-tizen-common-base/recipes-multimedia/libmedia-thumbnail/libmedia-thumbnail.inc b/meta-tizen-common-base/recipes-multimedia/libmedia-thumbnail/libmedia-thumbnail.inc index 46ef91c..393b244 100644 --- a/meta-tizen-common-base/recipes-multimedia/libmedia-thumbnail/libmedia-thumbnail.inc +++ b/meta-tizen-common-base/recipes-multimedia/libmedia-thumbnail/libmedia-thumbnail.inc @@ -56,7 +56,7 @@ DEPENDS += "libmm-utility" DEPENDS += "media-server" DEPENDS += "heynoti" DEPENDS += "vconf" -DEPENDS += "pkgconfig(gdk-pixbuf-2.0)" +DEPENDS += "gdk-pixbuf" do_prep() { cd ${S} diff --git a/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc b/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc index 51e2498..e82e16a 100644 --- a/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc +++ b/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc @@ -1,8 +1,8 @@ -DESCRIPTION = "Multimedia Framework Common Lib" +DESCRIPTION = "Multimedia Framework Common Library" HOMEPAGE = "http://nohomepage.org" SECTION = "Multimedia/Libraries" LICENSE = "Apache-2.0" -PV = "0.2.85" +PV = "0.2.55" SRC_URI = "" @@ -24,9 +24,6 @@ RDEPENDS = "" #RDEPENDS of libmm-common-dev (${PN}-dev) RDEPENDS_${PN}-dev += "libmm-common" -#RDEPENDS of libmm-common (${PN}) -RDEPENDS_${PN} += "glibc" - DEPENDS = "" #DEPENDS of libmm-common @@ -38,7 +35,7 @@ do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q - + cp ${S}/packaging/libmm-common.manifest . } @@ -56,15 +53,14 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; + CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" " - export CFLAGS+=" -Wall -Wcast-align -Wcast-qual -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable" autotools_do_configure oe_runmake - } EXTRA_OECONF += "" @@ -77,7 +73,6 @@ do_install() { rm -rf ${D} mkdir -p ${D} - rm -rf ${D} oe_runmake \ DESTDIR=${D} \ @@ -89,7 +84,6 @@ do_install() { find ${D} -regex ".*\.a$" | xargs rm -f -- - } pkg_postinst_${PN}() { @@ -119,6 +113,7 @@ libmm-common-dev_files += "${prefix}/include/mmf/mm_debug.h" libmm-common-dev_files += "${prefix}/include/mmf/mm.h" libmm-common-dev_files += "${prefix}/lib/pkgconfig/mm-common.pc" libmm-common-dev_files += "${prefix}/lib/libmmfcommon.so" +MANIFESTFILES_${PN}-dev = "libmm-common.manifest" libmm-common_files = "" libmm-common_files += "${prefix}/lib/libmmfcommon.so.*" diff --git a/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common_git.bb b/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common_git.bb index 307c74b..69b1aeb 100644 --- a/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common_git.bb +++ b/meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-common;tag=b278ce78e1bdad66d46a051ec0258c13fbf85032;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-common;tag=c244cbbbb20aac7a2413d630b4c0e1b7a1a31f1f;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4