From 2a1e82805bb4e50ef9a17d3061611ddd365f5dbf Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 26 Sep 2014 14:43:30 +0200 Subject: [PATCH] meta-tizen: update recipes Change-Id: I0215288c3973a5b2ca4653b543144a13e53868e5 (From meta-tizen rev: c5bb0b5209ec079a455ce446ad2312fa3c11bdd8) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../Modello-Dashboard/Modello-Dashboard.inc | 28 ++++++++---------- .../Modello-Dashboard/Modello-Dashboard_git.bb | 2 +- .../Modello-Multimediaplayer.inc | 28 ++++++++---------- .../Modello-Multimediaplayer_git.bb | 2 +- .../recipes-tizen/Modello-Nav/Modello-Nav.inc | 28 ++++++++---------- .../recipes-tizen/Modello-Nav/Modello-Nav_git.bb | 2 +- .../recipes-tizen/Modello-Phone/Modello-Phone.inc | 28 ++++++++---------- .../Modello-Phone/Modello-Phone_git.bb | 2 +- .../recipes-tizen/Modello-SDL/Modello-SDL.inc | 28 ++++++++---------- .../recipes-tizen/Modello-SDL/Modello-SDL_git.bb | 2 +- .../alsa-scenario-0.2/alsa-scenario-0.2.inc | 20 +++++-------- meta-tizen/recipes-tizen/libhangul/libhangul.inc | 3 +- .../recipes-tizen/libhangul/libhangul_git.bb | 2 +- .../recipes-tizen/libmm-player/libmm-player.inc | 17 +++++++++++ meta-tizen/recipes-tizen/phoned/phoned.inc | 1 + .../tizen-platform-config.inc | 5 ++-- .../wayland-ivi-extension.inc | 34 +++++++++++----------- .../wayland-ivi-extension_git.bb | 2 +- meta-tizen/recipes-tizen/xmlsec1/xmlsec1.inc | 29 ++++++++++++++++-- meta-tizen/recipes-tizen/xmlsec1/xmlsec1_git.bb | 2 +- 20 files changed, 142 insertions(+), 123 deletions(-) diff --git a/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc b/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc index 916939f..aa9db42 100644 --- a/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc +++ b/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard.inc @@ -1,7 +1,7 @@ -DESCRIPTION = "A proof of concept pure html5 UI" +DESCRIPTION = "Pure html5 UI" HOMEPAGE = "http://nohomepage.org" -SECTION = "Applications/System" -LICENSE = "Apache 2.0" +SECTION = "Automotive/Modello" +LICENSE = "Apache-2.0" SRC_URI = "" @@ -23,12 +23,14 @@ RDEPENDS_Modello_Dashboard += "Modello_Common" DEPENDS = "" #DEPENDS of Modello_Dashboard +DEPENDS += "tizen-platform-config" DEPENDS += "zip" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q -n Modello_Dashboard-0.0.2 + cp ${S}/packaging/Modello_Dashboard.manifest . } @@ -46,8 +48,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - make wgtPkg + #empty @@ -63,15 +64,10 @@ do_install() { 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}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}${prefix}/share/Modello/Common/icons + zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello_Dashboard.wgt components config.xml css Dashboard_icon.png index.html js + install -m 0644 Dashboard_icon.png ${D}${prefix}/share/Modello/Common/icons } @@ -80,8 +76,8 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello_Dashboard " Modello_Dashboard_files = "" -Modello_Dashboard_files += "/opt/usr/apps/.preinstallWidgets/Modello_Dashboard.wgt" -Modello_Dashboard_files += "/opt/usr/apps/_common/icons/Dashboard_icon.png" +Modello_Dashboard_files += "${prefix}/share/Modello/Common/icons/Dashboard_icon.png" +MANIFESTFILES_Modello_Dashboard = "Modello_Dashboard.manifest" FILES_Modello_Dashboard = "${Modello_Dashboard_files}" diff --git a/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb b/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb index 58d848e..6f9ca11 100644 --- a/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Dashboard;tag=8422877a0bc43f97743cd99e960a707b87625cfd;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Dashboard;tag=2d8265562bcbfe66220a4fba7c34c599255377a7;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc b/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc index 21f84f3..580b30b 100644 --- a/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc +++ b/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer.inc @@ -1,7 +1,7 @@ -DESCRIPTION = "A proof of concept pure html5 UI" +DESCRIPTION = "Pure html5 UI" HOMEPAGE = "http://nohomepage.org" -SECTION = "Applications/System" -LICENSE = "Apache 2.0" +SECTION = "Automotive/Modello" +LICENSE = "Apache-2.0" SRC_URI = "" @@ -23,12 +23,14 @@ RDEPENDS_Modello_Multimediaplayer += "Modello_Common" DEPENDS = "" #DEPENDS of Modello_Multimediaplayer +DEPENDS += "tizen-platform-config" DEPENDS += "zip" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q -n Modello_Multimediaplayer-0.0.2 + cp ${S}/packaging/Modello_Multimediaplayer.manifest . } @@ -46,8 +48,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - make wgtPkg + #empty @@ -63,15 +64,10 @@ do_install() { 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}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}${prefix}/share/Modello/Common/icons + zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello_Multimediaplayer.wgt components config.xml css MultimediaPlayer_icon.png images index.html js + install -m 0644 MultimediaPlayer_icon.png ${D}${prefix}/share/Modello/Common/icons } @@ -80,8 +76,8 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello_Multimediaplayer " Modello_Multimediaplayer_files = "" -Modello_Multimediaplayer_files += "/opt/usr/apps/.preinstallWidgets/Modello_Multimediaplayer.wgt" -Modello_Multimediaplayer_files += "/opt/usr/apps/_common/icons/Multimedia_Player_icon.png" +Modello_Multimediaplayer_files += "${prefix}/share/Modello/Common/icons/MultimediaPlayer_icon.png" +MANIFESTFILES_Modello_Multimediaplayer = "Modello_Multimediaplayer.manifest" FILES_Modello_Multimediaplayer = "${Modello_Multimediaplayer_files}" diff --git a/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb b/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb index 35837b3..eb7ab0d 100644 --- a/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Multimediaplayer;tag=75e18c4aaa730a5e5de933c978edabfc9591497b;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Multimediaplayer;tag=0ec7168712a008ba2d2e828baf2e1e3645bc2be4;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav.inc b/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav.inc index 1e69b37..66dd7b5 100644 --- a/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav.inc +++ b/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav.inc @@ -1,7 +1,7 @@ -DESCRIPTION = "A proof of concept pure html5 UI" +DESCRIPTION = "Pure html5 UI" HOMEPAGE = "http://nohomepage.org" -SECTION = "Applications/System" -LICENSE = "Apache 2.0" +SECTION = "Automotive/Modello" +LICENSE = "Apache-2.0" SRC_URI = "" @@ -23,12 +23,14 @@ RDEPENDS_Modello_Nav += "Modello_Common" DEPENDS = "" #DEPENDS of Modello_Nav +DEPENDS += "tizen-platform-config" DEPENDS += "zip" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q -n Modello_Nav-0.0.2 + cp ${S}/packaging/Modello_Nav.manifest . } @@ -46,8 +48,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - make wgtPkg + #empty @@ -63,15 +64,10 @@ do_install() { 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}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}${prefix}/share/Modello/Common/icons + zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello_Nav.wgt config.xml css Navigation_icon.png images index.html js templates + install -m 0644 Navigation_icon.png ${D}${prefix}/share/Modello/Common/icons } @@ -80,8 +76,8 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello_Nav " Modello_Nav_files = "" -Modello_Nav_files += "/opt/usr/apps/.preinstallWidgets/Modello_Nav.wgt" -Modello_Nav_files += "/opt/usr/apps/_common/icons/Navigation_icon.png" +Modello_Nav_files += "${prefix}/share/Modello/Common/icons/Navigation_icon.png" +MANIFESTFILES_Modello_Nav = "Modello_Nav.manifest" FILES_Modello_Nav = "${Modello_Nav_files}" diff --git a/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav_git.bb b/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav_git.bb index 4cbe456..4d62932 100644 --- a/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Nav/Modello-Nav_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Nav;tag=bfaedf923c5f3b9997033419ccb8021173d4c728;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Nav;tag=4e79aa3f0cf8381ab3157a9145c12b0385651140;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone.inc b/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone.inc index 0fe3959..1203cb9 100644 --- a/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone.inc +++ b/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone.inc @@ -1,7 +1,7 @@ -DESCRIPTION = "A proof of concept pure html5 UI" +DESCRIPTION = "Pure html5 UI" HOMEPAGE = "http://nohomepage.org" -SECTION = "Applications/System" -LICENSE = "Apache 2.0" +SECTION = "Automotive/Modello" +LICENSE = "Apache-2.0" SRC_URI = "" @@ -24,12 +24,14 @@ RDEPENDS_Modello_Phone += "Modello_Common" DEPENDS = "" #DEPENDS of Modello_Phone +DEPENDS += "tizen-platform-config" DEPENDS += "zip" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q -n Modello_Phone-0.0.2 + cp ${S}/packaging/Modello_Phone.manifest . } @@ -47,8 +49,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - make wgtPkg + #empty @@ -64,15 +65,10 @@ do_install() { 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}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}${prefix}/share/Modello/Common/icons + zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello_Phone.wgt config.xml css data Phone_icon.png index.html js templates + install -m 0644 Phone_icon.png ${D}${prefix}/share/Modello/Common/icons } @@ -81,8 +77,8 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello_Phone " Modello_Phone_files = "" -Modello_Phone_files += "/opt/usr/apps/.preinstallWidgets/Modello_Phone.wgt" -Modello_Phone_files += "/opt/usr/apps/_common/icons/Phone_icon.png" +Modello_Phone_files += "${prefix}/share/Modello/Common/icons/Phone_icon.png" +MANIFESTFILES_Modello_Phone = "Modello_Phone.manifest" FILES_Modello_Phone = "${Modello_Phone_files}" diff --git a/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone_git.bb b/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone_git.bb index 7a6a6d8..74dad9d 100644 --- a/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone_git.bb +++ b/meta-tizen/recipes-tizen/Modello-Phone/Modello-Phone_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Phone;tag=c0506d3ef282ce32e2aeff1b00887ca2ff1a7feb;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Phone;tag=4eb3acbbb8423fa5ea06e7576def8bc6cb3ab67a;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL.inc b/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL.inc index 8b0d1ea..f6c5c89 100644 --- a/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL.inc +++ b/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL.inc @@ -1,7 +1,7 @@ -DESCRIPTION = "A proof of concept pure html5 UI" +DESCRIPTION = "Pure html5 UI" HOMEPAGE = "http://nohomepage.org" -SECTION = "Applications/System" -LICENSE = "Apache 2.0" +SECTION = "Automotive/Modello" +LICENSE = "Apache-2.0" SRC_URI = "" @@ -23,12 +23,14 @@ RDEPENDS_Modello_SDL += "Modello_Common" DEPENDS = "" #DEPENDS of Modello_SDL +DEPENDS += "tizen-platform-config" DEPENDS += "zip" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q -n Modello_SDL-0.0.2 + cp ${S}/packaging/Modello_SDL.manifest . } @@ -46,8 +48,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - make wgtPkg + #empty @@ -63,15 +64,10 @@ do_install() { 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}%{TZ_SYS_APP_PREINSTALL} + mkdir -p ${D}${prefix}/share/Modello/Common/icons + zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello_SDL.wgt app audio config.xml css ffw SmartDeviceLink_icon.png images index.html js lib locale + install -m 0644 SmartDeviceLink_icon.png ${D}${prefix}/share/Modello/Common/icons } @@ -80,8 +76,8 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " Modello_SDL " Modello_SDL_files = "" -Modello_SDL_files += "/opt/usr/apps/.preinstallWidgets/Modello_SDL.wgt" -Modello_SDL_files += "/opt/usr/apps/_common/icons/SmartDeviceLink_icon.png" +Modello_SDL_files += "${prefix}/share/Modello/Common/icons/SmartDeviceLink_icon.png" +MANIFESTFILES_Modello_SDL = "Modello_SDL.manifest" FILES_Modello_SDL = "${Modello_SDL_files}" diff --git a/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL_git.bb b/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL_git.bb index 5fd570b..a2bccb2 100644 --- a/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL_git.bb +++ b/meta-tizen/recipes-tizen/Modello-SDL/Modello-SDL_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/Modello_SDL;tag=8c233b3ab7d8d27fa20777594ba05b6ff433ebcd;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_SDL;tag=2c883eb27a32bee3cc6459a3bb93f2ed5ba8ead6;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2.inc b/meta-tizen/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2.inc index f25bfea..84bbf2e 100644 --- a/meta-tizen/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2.inc +++ b/meta-tizen/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2.inc @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Scenario pkg" HOMEPAGE = "http://nohomepage.org" -SECTION = "Multimedia/Audio FW" -LICENSE = "LGPL-2.0+" +SECTION = "Multimedia/Audio" +LICENSE = "LGPLv2+" SRC_URI = "" @@ -24,19 +24,16 @@ RDEPENDS = "" #RDEPENDS of alsa-scenario-dev (alsa-scenario-dev) RDEPENDS_alsa-scenario-dev += "alsa-scenario" -#RDEPENDS of alsa-scenario (alsa-scenario) -RDEPENDS_alsa-scenario += "eglibc" - DEPENDS = "" #DEPENDS of alsa-scenario DEPENDS += "alsa-lib" -inherit pkgconfig do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q + cp ${S}/packaging/alsa-scenario.manifest . @@ -55,12 +52,11 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - cp ${S}/packaging/alsa-scenario.manifest . - cp -f ${prefix}/share/libtool/config/config.guess ${WORKDIR}/alsa-scenario-0.2.1/ - cp -f ${prefix}/share/libtool/config/config.sub ${WORKDIR}/alsa-scenario-0.2.1/ + cp -f /usr/share/libtool/config/config.guess ${WORKDIR}/alsa-scenario-0.2.1/ + cp -f /usr/share/libtool/config/config.sub ${WORKDIR}/alsa-scenario-0.2.1/ autotools_do_configure - oe_runmake -j16 + make -j16 @@ -76,7 +72,6 @@ do_install() { rm -rf ${D} mkdir -p ${D} - rm -rf ${D} oe_runmake \ DESTDIR=${D} \ @@ -88,7 +83,6 @@ do_install() { find ${D} -regex ".*\.a$" | xargs rm -f -- - } pkg_postinst_${PN}() { @@ -111,9 +105,11 @@ alsa-scenario-dev_files = "" alsa-scenario-dev_files += "${prefix}/include/alsa/*.h" alsa-scenario-dev_files += "${prefix}/lib/libascenario.so" alsa-scenario-dev_files += "${prefix}/lib/pkgconfig/libascenario.pc" +MANIFESTFILES_alsa-scenario-dev = "alsa-scenario.manifest" alsa-scenario_files = "" alsa-scenario_files += "${prefix}/lib/libascenario-0.2.so.*" +MANIFESTFILES_alsa-scenario = "alsa-scenario.manifest" FILES_alsa-scenario-dev = "${alsa-scenario-dev_files}" FILES_alsa-scenario = "${alsa-scenario_files}" diff --git a/meta-tizen/recipes-tizen/libhangul/libhangul.inc b/meta-tizen/recipes-tizen/libhangul/libhangul.inc index f5b8ea3..c15392a 100644 --- a/meta-tizen/recipes-tizen/libhangul/libhangul.inc +++ b/meta-tizen/recipes-tizen/libhangul/libhangul.inc @@ -28,6 +28,7 @@ DEPENDS = "" #DEPENDS of libhangul #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext +inherit pkgconfig do_prep() { cd ${S} @@ -51,7 +52,7 @@ 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 diff --git a/meta-tizen/recipes-tizen/libhangul/libhangul_git.bb b/meta-tizen/recipes-tizen/libhangul/libhangul_git.bb index a63f0b1..9f572e8 100644 --- a/meta-tizen/recipes-tizen/libhangul/libhangul_git.bb +++ b/meta-tizen/recipes-tizen/libhangul/libhangul_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/uifw/libhangul;tag=1f08e8e287b8409e363fe9588fd52de9530a506c;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/uifw/libhangul;tag=2fe339978867090f76ae0ebb1b1863e374b63ee2;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/libmm-player/libmm-player.inc b/meta-tizen/recipes-tizen/libmm-player/libmm-player.inc index c69e517..cb4bedb 100644 --- a/meta-tizen/recipes-tizen/libmm-player/libmm-player.inc +++ b/meta-tizen/recipes-tizen/libmm-player/libmm-player.inc @@ -54,7 +54,24 @@ do_configure() { } do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + CFLAGS="${CFLAGS} -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" $GSTREAMER_API" ; export CFLAGS + LDFLAGS="${LDFLAGS=} -Wl,--rpath=${prefix}/lib -lgstvideo-1.0 -Wl,--hash-style=both -Wl,--as-needed"; export LDFLAGS + + ./autogen.sh + + autotools_do_configure + oe_runmake -j16 + + + } +EXTRA_OECONF += " --disable-static" do_install() { export RPM_BUILD_ROOT=${D} diff --git a/meta-tizen/recipes-tizen/phoned/phoned.inc b/meta-tizen/recipes-tizen/phoned/phoned.inc index ab37fdf..74d79a1 100644 --- a/meta-tizen/recipes-tizen/phoned/phoned.inc +++ b/meta-tizen/recipes-tizen/phoned/phoned.inc @@ -23,6 +23,7 @@ inherit tizen_cmake DEPENDS += "evolution-data-server" DEPENDS += "dbus" DEPENDS += "expat" +DEPENDS += "aul" #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "json-glib" diff --git a/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config.inc b/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config.inc index ba2b080..49d5cfb 100644 --- a/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config.inc +++ b/meta-tizen/recipes-tizen/tizen-platform-config/tizen-platform-config.inc @@ -74,7 +74,7 @@ do_compile() { } -EXTRA_OECONF += " --disable-static" +EXTRA_OECONF += " --enable-static" do_install() { export RPM_BUILD_ROOT=${D} @@ -93,7 +93,7 @@ do_install() { install rm -f ${D}${infodir}/dir find ${D} -regex ".*\.la$" | xargs rm -f -- - find ${D} -regex ".*\.a$" | xargs rm -f -- + } @@ -122,6 +122,7 @@ libtzplatform-config-dev_files += "${prefix}/lib/*.so" libtzplatform-config-dev_files += "${prefix}/lib/pkgconfig/*.pc" libtzplatform-config-dev_files += "${prefix}/include/*.h" libtzplatform-config-dev_files += "${sysconfdir}/rpm/macros.tizen-platform" +libtzplatform-config-dev_files += "${prefix}/lib/*.a" CONFFILES_libtzplatform-config-dev = "" CONFFILES_libtzplatform-config-dev += "${sysconfdir}/rpm/macros.tizen-platform" MANIFESTFILES_libtzplatform-config-dev = "tizen-platform-config.manifest" diff --git a/meta-tizen/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc b/meta-tizen/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc index d8e357d..1e8288c 100644 --- a/meta-tizen/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc +++ b/meta-tizen/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc @@ -46,23 +46,6 @@ do_prep() { /usr/bin/wayland-scanner code < protocol/ivi-controller.xml \ > protocol/ivi-controller-protocol.c - -} -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 ; - - cat ivi-extension-protocol.pc.in \ | sed s\#@libdir@\#${prefix}/lib\#g \ | sed s\#@includedir@\#${prefix}/include/genivi-shell\#g \ @@ -84,6 +67,23 @@ do_compile() { -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . + +} +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 ; + + oe_runmake -j16 V=1 diff --git a/meta-tizen/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension_git.bb b/meta-tizen/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension_git.bb index b97c42c..c3d6baf 100644 --- a/meta-tizen/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension_git.bb +++ b/meta-tizen/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/wayland-ivi-extension;tag=38accb3b08d2e4c0f4669aaca658470d56a97bd2;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/wayland-ivi-extension;tag=fd633eb0761da7a0be4bc1f920f62b5bb6dfe639;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/xmlsec1/xmlsec1.inc b/meta-tizen/recipes-tizen/xmlsec1/xmlsec1.inc index 861310c..f5051da 100644 --- a/meta-tizen/recipes-tizen/xmlsec1/xmlsec1.inc +++ b/meta-tizen/recipes-tizen/xmlsec1/xmlsec1.inc @@ -47,8 +47,11 @@ RDEPENDS_${PN}-dev += "xmlsec1" DEPENDS = "" #DEPENDS of xmlsec1 -DEPENDS += "libxml2" DEPENDS += "openssl" +DEPENDS += "libxml2" +DEPENDS_append_class-native = " fdupes-native" +DEPENDS_append_class-target = " fdupes-native" +inherit pkgconfig DEPENDS += "libxslt" do_prep() { @@ -78,7 +81,7 @@ do_compile() { autotools_do_configure - make -j16 + oe_runmake -j16 @@ -105,7 +108,6 @@ do_install() { - rm -rf ${D}${infodir} rm -rf ${D}${prefix}/share/doc/packages rm -rf ${D}${prefix}/share/doc/xmlsec1 @@ -118,6 +120,27 @@ do_install() { find ${D} -regex ".*/man/man./.*.[0-9]pm" | xargs rm -f -- + _target=""; + _symlinks=0; + + fdupes -q -n -r ${D} | + while read _file; do + if test -z "$_target" ; then + _target="$_file"; + else + if test -z "$_file" ; then + _target=""; + continue ; + fi ; + if test "$_symlinks" = 1; then + ln -sf "${_target#${D}}" "$_file"; + else + ln -f "$_target" "$_file"; + fi ; + fi ; + done + + } pkg_postinst_${PN}() { diff --git a/meta-tizen/recipes-tizen/xmlsec1/xmlsec1_git.bb b/meta-tizen/recipes-tizen/xmlsec1/xmlsec1_git.bb index cde2805..6ee3296 100644 --- a/meta-tizen/recipes-tizen/xmlsec1/xmlsec1_git.bb +++ b/meta-tizen/recipes-tizen/xmlsec1/xmlsec1_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/upstream/xmlsec1;tag=839015fd0f40e78c6afc13daebb093a22d9d5d61;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/xmlsec1;tag=fe8ea3dba5971ab3f47090ba52d7f824c3d23545;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4