From d69a46f9522837c3dd03660296998c44d3887e09 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Mon, 29 Sep 2014 10:00:35 +0200 Subject: [PATCH] update recipes Change-Id: I0b01c34bb0a1226883867b1c09fdd875ff7134a7 Signed-off-by: Ronan Le Martret --- recipes-tizen/ail/ail.inc | 4 ++-- recipes-tizen/ail/ail_git.bb | 2 +- recipes-tizen/avsystem/avsystem.inc | 17 ++++++-------- recipes-tizen/avsystem/avsystem_git.bb | 2 +- recipes-tizen/ibus/ibus.inc | 26 +++++++++++++++++++++- recipes-tizen/ibus/ibus_git.bb | 2 +- recipes-tizen/libmm-common/libmm-common.inc | 1 + recipes-tizen/libmm-common/libmm-common_git.bb | 2 +- recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc | 1 + recipes-tizen/libmm-fileinfo/libmm-fileinfo_git.bb | 2 +- recipes-tizen/libmm-utility/libmm-utility.inc | 8 +++---- recipes-tizen/libmm-utility/libmm-utility_git.bb | 2 +- recipes-tizen/libnet-client/libnet-client.inc | 5 +++-- recipes-tizen/libnet-client/libnet-client_git.bb | 2 +- recipes-tizen/libslp-location/libslp-location.inc | 5 ++--- .../libslp-location/libslp-location_git.bb | 2 +- recipes-tizen/neardal/neardal.inc | 10 ++++----- recipes-tizen/neardal/neardal_git.bb | 2 +- recipes-tizen/vconf/vconf_git.bb | 2 +- 19 files changed, 58 insertions(+), 39 deletions(-) diff --git a/recipes-tizen/ail/ail.inc b/recipes-tizen/ail/ail.inc index 1e113ab..416117c 100644 --- a/recipes-tizen/ail/ail.inc +++ b/recipes-tizen/ail/ail.inc @@ -115,9 +115,9 @@ do_install() { pkg_postinst_${PN}() { #!/bin/sh -e - [ "x$D" == "x" ] && ldconfig + ldconfig # Create tizenglobalapp user needed for global installation - $D${prefix}/sbin/useradd -d $D${prefix}/apps -m %TZ_SYS_GLOBALAPP_USER -r -c "system user for common applications" -g root + useradd -d $D${prefix}/apps -m %TZ_SYS_GLOBALAPP_USER -r -c "system user for common applications" -g root #mkdir -p $D${prefix}/apps/.config/xwalk-service/applications #cd $D${prefix}/apps/ #ln -s .config/xwalk-service/applications/ diff --git a/recipes-tizen/ail/ail_git.bb b/recipes-tizen/ail/ail_git.bb index 6379845..11c36dd 100644 --- a/recipes-tizen/ail/ail_git.bb +++ b/recipes-tizen/ail/ail_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/appfw/ail;tag=4ff04e8da95abd6fd7c48fefdb32cab2f31a1b33;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/ail;tag=9a748929cdc4762f2957b3e80678754b400f9f28;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/avsystem/avsystem.inc b/recipes-tizen/avsystem/avsystem.inc index 594ffb8..489fb43 100644 --- a/recipes-tizen/avsystem/avsystem.inc +++ b/recipes-tizen/avsystem/avsystem.inc @@ -36,8 +36,9 @@ DEPENDS = "" #DEPENDS of avsystem DEPENDS += "alsa-lib" DEPENDS += "libmm-log" -DEPENDS += "pulseaudio" +inherit pkgconfig DEPENDS += "iniparser" +DEPENDS += "pulseaudio" DEPENDS += "libexif" DEPENDS += "alsa-scenario-0.2" DEPENDS += "libmm-ta" @@ -49,6 +50,7 @@ do_prep() { cp ${S}/packaging/avsystem.manifest . + } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -66,10 +68,12 @@ do_compile() { autotools_do_configure + oe_runmake -j16 + } EXTRA_OECONF += " --enable-audiotest" @@ -92,14 +96,10 @@ do_install() { find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - mkdir -m 755 -p ${D}/${sysconfdir}/rc.d/rc3.d/ - ln -s ../init.d/snd_init ${D}/${sysconfdir}/rc.d/rc3.d/S15snd_init - mkdir -m 755 -p ${D}/${sysconfdir}/rc.d/rc4.d/ - ln -s ../init.d/snd_init ${D}/${sysconfdir}/rc.d/rc4.d/S15snd_init - mkdir -m 755 -p ${D}${systemd_unitdir}/system/multi-user.target.wants install -m 0644 ${S}/packaging/avsystem.service ${D}${systemd_unitdir}/system/avsystem.service - ln -s ../avsystem.service ${D}${systemd_unitdir}/system/multi-user.target.wants/avsystem.service + ln -sf ../avsystem.service ${D}${systemd_unitdir}/system/multi-user.target.wants/avsystem.service + } @@ -150,9 +150,6 @@ PACKAGES += " avsystem-dev " PACKAGES += " libavsysaudio " avsystem_files = "" -avsystem_files += "${sysconfdir}/rc.d/init.d/snd_init" -avsystem_files += "${sysconfdir}/rc.d/rc3.d/S15snd_init" -avsystem_files += "${sysconfdir}/rc.d/rc4.d/S15snd_init" avsystem_files += "${prefix}/bin/*" avsystem_files += "${systemd_unitdir}/system/avsystem.service" avsystem_files += "${systemd_unitdir}/system/multi-user.target.wants/avsystem.service" diff --git a/recipes-tizen/avsystem/avsystem_git.bb b/recipes-tizen/avsystem/avsystem_git.bb index af6b883..339db3b 100644 --- a/recipes-tizen/avsystem/avsystem_git.bb +++ b/recipes-tizen/avsystem/avsystem_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/avsystem;tag=72435ebdb656183ee0b74c8232757498987fe34a;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/avsystem;tag=e2bc7b88d123b0ff997061e9a4998106f7f5c3f3;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/ibus/ibus.inc b/recipes-tizen/ibus/ibus.inc index bc41e20..eae7e8e 100644 --- a/recipes-tizen/ibus/ibus.inc +++ b/recipes-tizen/ibus/ibus.inc @@ -49,6 +49,7 @@ DEPENDS += "iso-codes" inherit pythonnative DEPENDS += "vala" DEPENDS += "libxkbcommon" +inherit pkgconfig #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "wayland" @@ -56,6 +57,8 @@ DEPENDS_append_class-native = " libtool" DEPENDS_append_class-target = " libtool-cross" DEPENDS += "gtk-doc-stub" DEPENDS += "dbus-python" +DEPENDS_append_class-native = " fdupes-native" +DEPENDS_append_class-target = " fdupes-native" DEPENDS += "dbus-glib" do_prep() { @@ -108,6 +111,27 @@ do_install() { #find_lang ibus10 + _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}() { @@ -172,7 +196,7 @@ ibus-libs_files += "${prefix}/lib/girepository-1.0/IBus-1.0.typelib" MANIFESTFILES_${PN}-libs = "ibus.manifest" ibus_files = "" -ibus_files += "AUTHORS COPYING README" +ibus_files += "AUTHORS README" ibus_files += "${prefix}/lib/python2.7/site-packages/ibus" ibus_files += "${prefix}/lib/python2.7/site-packages/ibus/*" ibus_files += "${prefix}/share/ibus/" diff --git a/recipes-tizen/ibus/ibus_git.bb b/recipes-tizen/ibus/ibus_git.bb index 532f34d..3090b84 100644 --- a/recipes-tizen/ibus/ibus_git.bb +++ b/recipes-tizen/ibus/ibus_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/ibus;tag=87fae7bdb68169124c816704ad91ccc94ab7b1d4;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/ibus;tag=d474a5c218f8630192ee2bea8d321c245e2c2b89;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libmm-common/libmm-common.inc b/recipes-tizen/libmm-common/libmm-common.inc index a297007..2b749e2 100644 --- a/recipes-tizen/libmm-common/libmm-common.inc +++ b/recipes-tizen/libmm-common/libmm-common.inc @@ -27,6 +27,7 @@ RDEPENDS_${PN}-dev += "libmm-common" DEPENDS = "" #DEPENDS of libmm-common DEPENDS += "libmm-log" +inherit pkgconfig DEPENDS += "glib-2.0" do_prep() { diff --git a/recipes-tizen/libmm-common/libmm-common_git.bb b/recipes-tizen/libmm-common/libmm-common_git.bb index 288d815..e450066 100644 --- a/recipes-tizen/libmm-common/libmm-common_git.bb +++ b/recipes-tizen/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=8e74a5450dab4e987c2864e469597f26333ca63d;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-common;tag=f5de4864de134462423a88fa214bb6a91a6c5bb3;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc b/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc index 1e1c020..f3cf3f2 100644 --- a/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc +++ b/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc @@ -29,6 +29,7 @@ DEPENDS = "" DEPENDS += "libmm-log" DEPENDS += "libav" DEPENDS += "libmm-common" +inherit pkgconfig DEPENDS += "glib-2.0" do_prep() { diff --git a/recipes-tizen/libmm-fileinfo/libmm-fileinfo_git.bb b/recipes-tizen/libmm-fileinfo/libmm-fileinfo_git.bb index 16b8b6c..c8ca20b 100644 --- a/recipes-tizen/libmm-fileinfo/libmm-fileinfo_git.bb +++ b/recipes-tizen/libmm-fileinfo/libmm-fileinfo_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-fileinfo;tag=cfe7dfeb6d8c084ad54dd9734e6cb23b61f9b0d1;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-fileinfo;tag=5343fa853d8a2ff711b35d8c26e735127d6b3a51;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libmm-utility/libmm-utility.inc b/recipes-tizen/libmm-utility/libmm-utility.inc index 3270443..e562884 100644 --- a/recipes-tizen/libmm-utility/libmm-utility.inc +++ b/recipes-tizen/libmm-utility/libmm-utility.inc @@ -38,8 +38,8 @@ DEPENDS = "" #DEPENDS of libmm-utility DEPENDS += "libmm-common" DEPENDS += "libjpeg-turbo" -DEPENDS += "tizen-platform-config" DEPENDS += "libmm-log" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "libmm-ta" @@ -65,7 +65,8 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - mkdir -p m4 + ./autogen.sh + CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" -D_MM_PROJECT_FLOATER" LDFLAGS+="-Wl,--rpath=${prefix}/lib -Wl,--hash-style=both -Wl,--as-needed" autotools_do_configure oe_runmake -j16 @@ -97,8 +98,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 LICENSE ${D}${prefix}/share/license/libmm-utility } @@ -121,7 +120,6 @@ PACKAGES += " libmm-utility-dev " PACKAGES += " libmm-utility-tool " libmm-utility_files = "" -libmm-utility_files += "${prefix}/share/license/libmm-utility" libmm-utility_files += "${prefix}/lib/*.so*" MANIFESTFILES_${PN} = "libmm-utility.manifest" diff --git a/recipes-tizen/libmm-utility/libmm-utility_git.bb b/recipes-tizen/libmm-utility/libmm-utility_git.bb index cfe5539..89e97a0 100644 --- a/recipes-tizen/libmm-utility/libmm-utility_git.bb +++ b/recipes-tizen/libmm-utility/libmm-utility_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-utility;tag=ca7b89f7f083c83383236e80d9121d6b27f3a5d1;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-utility;tag=2478d64176e02c32bdd12ba2ed58a57a4faeada0;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libnet-client/libnet-client.inc b/recipes-tizen/libnet-client/libnet-client.inc index b29855b..8bbc0a9 100644 --- a/recipes-tizen/libnet-client/libnet-client.inc +++ b/recipes-tizen/libnet-client/libnet-client.inc @@ -1,7 +1,7 @@ -DESCRIPTION = "Network Client library (Shared library)" +DESCRIPTION = "Network Client library" HOMEPAGE = "http://nohomepage.org" SECTION = "System/Network" -LICENSE = "Flora License" +LICENSE = "Flora" SRC_URI = "" @@ -30,6 +30,7 @@ RDEPENDS_${PN} += "eglibc" DEPENDS = "" #DEPENDS of libnet-client inherit tizen_cmake +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "vconf" diff --git a/recipes-tizen/libnet-client/libnet-client_git.bb b/recipes-tizen/libnet-client/libnet-client_git.bb index 918aa33..07d35db 100644 --- a/recipes-tizen/libnet-client/libnet-client_git.bb +++ b/recipes-tizen/libnet-client/libnet-client_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/connectivity/libnet-client;tag=792489ba4fb299c6f4bf7b54dae415afe3cdf8ae;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/connectivity/libnet-client;tag=92801f03fd813e8d635035977d35b6577ba19fe1;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libslp-location/libslp-location.inc b/recipes-tizen/libslp-location/libslp-location.inc index ef69f65..830bde6 100644 --- a/recipes-tizen/libslp-location/libslp-location.inc +++ b/recipes-tizen/libslp-location/libslp-location.inc @@ -30,6 +30,7 @@ RDEPENDS_${PN} += "vconf" DEPENDS = "" #DEPENDS of libslp-location +inherit pkgconfig DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "json-glib" @@ -59,12 +60,10 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - ./autogen.sh autotools_do_configure - - make -j16 + oe_runmake -j16 diff --git a/recipes-tizen/libslp-location/libslp-location_git.bb b/recipes-tizen/libslp-location/libslp-location_git.bb index 3afe798..f931f27 100644 --- a/recipes-tizen/libslp-location/libslp-location_git.bb +++ b/recipes-tizen/libslp-location/libslp-location_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/location/libslp-location;tag=165868e3ca2d034e4eec9d285e6531c1cc018738;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/location/libslp-location;tag=0d55b8e4b5b01019c6cfca14541563bd3c1b4f7f;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/neardal/neardal.inc b/recipes-tizen/neardal/neardal.inc index 49831ed..449edd1 100644 --- a/recipes-tizen/neardal/neardal.inc +++ b/recipes-tizen/neardal/neardal.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Neard Abstraction Library (for Neard v0.7)" HOMEPAGE = "http://nohomepage.org" -SECTION = "Connectivity/NFC" +SECTION = "Network & Connectivity/NFC" LICENSE = "LGPL-2.0" SRC_URI = "" @@ -34,6 +34,7 @@ inherit gettext DEPENDS_append_class-native = " intltool-native" DEPENDS_append_class-target = " intltool-native" inherit pythonnative +inherit pkgconfig DEPENDS += "dlog" DEPENDS_append_class-native = " automake-native" DEPENDS_append_class-target = " automake-native" @@ -66,11 +67,9 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - autoreconf --force --install - autotools_do_configure - make + oe_runmake } @@ -96,7 +95,6 @@ do_install() { find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - # executed after install } @@ -122,7 +120,7 @@ neardal-dev_files += "${prefix}/lib/pkgconfig/neardal.pc" neardal-dev_files += "${prefix}/lib/libneardal.so" neardal_files = "" -neardal_files += "README AUTHORS NEWS" +neardal_files += "README AUTHORS" neardal_files += "${prefix}/lib/libneardal.so.0" neardal_files += "${prefix}/lib/libneardal.so.0.0.1" diff --git a/recipes-tizen/neardal/neardal_git.bb b/recipes-tizen/neardal/neardal_git.bb index a0e1510..2fdd8b1 100644 --- a/recipes-tizen/neardal/neardal_git.bb +++ b/recipes-tizen/neardal/neardal_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/neardal;tag=fe9042e311dc29c76b7c4b618f28ea1a517b6d7d;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/neardal;tag=87f41a7bd3b4bcc1bb3c54ffaeda53f5e65dc8a7;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/vconf/vconf_git.bb b/recipes-tizen/vconf/vconf_git.bb index dfc7e95..bc66995 100644 --- a/recipes-tizen/vconf/vconf_git.bb +++ b/recipes-tizen/vconf/vconf_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/appfw/vconf;tag=bb4b1ca3dd523ca1b0ab9add555a01179de8b069;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/vconf;tag=4743f153c4f30c05e65c895ee03b689fafa29a43;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4