Commit c6466a55 authored by Matthieu Tanon's avatar Matthieu Tanon

Adapt recipes to Yocto Morty, update sub-modules revisions based on...

Adapt recipes to Yocto Morty, update sub-modules revisions based on linphone-desktop, fix typos and build errors
parent d1e234a4
......@@ -17,6 +17,6 @@ inherit cmake pkgconfig
#}
do_install_append() {
mkdir -p ${STAGING_DIR_HOST}/usr/share/java
cp ${S}/../../antlr-3.4-complete.jar ${STAGING_DIR_HOST}/usr/share/java/antlr.jar
}
\ No newline at end of file
mkdir -p ${STAGING_DIR_NATIVE}/usr/share/java
cp ${S}/../../antlr-3.4-complete.jar ${STAGING_DIR_NATIVE}/usr/share/java/antlr.jar
}
......@@ -17,7 +17,7 @@ inherit distutils-base cmake pkgconfig
#PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev "
#-DCMAKE_BUILD_TYPE=Release
EXTRA_OECMAKE += " -DENABLE_STATIC=NO -DENABLE_TESTS=OFF -DENABLE_TESTS_COMPONENT=OFF -DCMAKE_SKIP_INSTALL_RPATH=ON "
EXTRA_OECMAKE += " -DENABLE_STATIC=NO -DENABLE_TESTS=NO -DENABLE_TESTS_COMPONENT=ON -DCMAKE_SKIP_INSTALL_RPATH=ON "
EXTRA_OECMAKE += "-DCMAKE_INSTALL_DATAROOTDIR=share -DCMAKE_INSTALL_LIBDIR=lib"
......@@ -3,7 +3,8 @@ require bctoolbox.inc
inherit gitpkgv
PR = "${INC_PR}.0"
SRCREV = "74918554d02e66e2fb1df0bbedcf7f19a7266584"
SRCREV = "01285f4b49e4c06534058aa80dc6e9567cca9b16"
#SRCREV = "74918554d02e66e2fb1df0bbedcf7f19a7266584"
SRC_URI = "git://git.linphone.org/bctoolbox.git;commit=${SRCREV}"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
......
......@@ -2,8 +2,9 @@ require bcunit.inc
PR = "${INC_PR}.0"
SRCREV = "6ce00eae4ca20ab284e17a88d8c7089bddb84ef0"
SRC_URI = "git://git.linphone.org/cunit.git;nobranch=1"
SRCREV = "d8d2f4b40209e06b400f893cce58e4c6ba73341d"
#SRCREV = "6ce00eae4ca20ab284e17a88d8c7089bddb84ef0"
SRC_URI = "git://git.linphone.org/bcunit.git;nobranch=1"
PV = "git_${SRCREV}"
LIC_FILES_CHKSUM = "file://COPYING;md5=7734aa853b85d6f935466f081490ddbb"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbb9c6cedd181f6aff9467f29667a660"
DESCRIPTION = "Cunit library"
DESCRIPTION = "BCunit library"
LICENSE = "GPLv2"
HOMEPAGE = "https://tls.mbed.org/"
SECTION = "libs/"
......@@ -9,8 +9,9 @@ PN = "bcunit"
PROVIDES = "bcunit"
S = "${WORKDIR}/git"
EXTRA_OECMAKE += " -DENABLE_SHARED=ON"
FILES_${PN} += "${datadir}/CUnit \
EXTRA_OECMAKE += " -DENABLE_SHARED=ON "
FILES_${PN} += "${datadir}/BCUnit \
${datadir}/BCunit \
/usr/doc"
inherit cmake pkgconfig
......
......@@ -16,5 +16,11 @@ FILES_${PN}-dev = " \
${includedir} \
${libdir}/lib*.so \
${libdir}/*.a \
${prefix}/share/Belcard"
${prefix}/share/Belcard \
${prefix}/share/belcard_tester \
${prefix}/share/belcard_tester/vcards \
${prefix}/share/belcard_tester/vcards/foldtest.vcf \
${prefix}/share/belcard_tester/vcards/unfoldtest.vcf \
${prefix}/share/belcard_tester/vcards/vcard.vcf \
${prefix}/share/belcard_tester/vcards/vcards.vcf"
......@@ -5,6 +5,7 @@ inherit gitpkgv
PR = "${INC_PR}.0"
SRCREV = "b9e1951be4575c62e326d761a7f7c79c5cce9cb9"
SRC_URI = "git://git.linphone.org/belcard.git"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
......
......@@ -3,7 +3,8 @@ require belle-sip.inc
inherit gitpkgv
PR = "${INC_PR}.0"
SRCREV = "c840e2192b2d0151cc895b844e44bfe0d2103fcf"
SRCREV = "d8c5e9e08b3bd6640898e46850333f1ad900c8d2"
#SRCREV = "c840e2192b2d0151cc895b844e44bfe0d2103fcf"
SRC_URI = "git://git.linphone.org/belle-sip.git;commit=${SRCREV}"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
......
......@@ -4,7 +4,8 @@ inherit gitpkgv
PR = "${INC_PR}.0"
SRCREV = "4f32b9c29c4ab8c4ccfc1e0899019a811d495054"
SRCREV = "fdce52526089e88c98f19b0d36483cc3d31ef9bd"
#SRCREV = "4f32b9c29c4ab8c4ccfc1e0899019a811d495054"
SRC_URI = "git://git.linphone.org/belr.git"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
......
......@@ -4,7 +4,8 @@ inherit gitpkgv
PR = "${INC_PR}.0"
SRCREV = "37adaa0536432149a51332d8eb04973a3ba6bac9"
SRCREV = "1ab274fa74f889769a656a7650f7aca5ea48679c"
#SRCREV = "37adaa0536432149a51332d8eb04973a3ba6bac9"
SRC_URI = "git://git.linphone.org/bzrtp.git"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
......
......@@ -4,11 +4,10 @@ inherit gitpkgv
PR = "${INC_PR}.0"
SRCREV = "7e2a6a56fa6a70a6ec3875cea26f1f1e17910917"
SRCREV = "ce584992480cf7463e9d0b8be3870d62ee43baaf"
#SRCREV = "7e2a6a56fa6a70a6ec3875cea26f1f1e17910917"
SRC_URI = "git://git.linphone.org/linphone.git"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
LIC_FILES_CHKSUM = "file://COPYING;md5=d421c6fe1a13d8b1dc830e02bcd20fcd"
......@@ -6,7 +6,7 @@ SECTION_linphonec = "console/network"
INC_PR = "r0"
DEPENDS = "libbellesip libortp libmediastreamer2 libxml2 libmswebrtc opus-bc libbctoolbox belr"
DEPENDS = "libbellesip libortp libmediastreamer2 libxml2 libmswebrtc opus-bc libbctoolbox belr belcard"
RDEPENDS_${PN} = "opus-bc "
PROVIDES = "liblinphone linphonec"
......@@ -15,17 +15,22 @@ S = "${WORKDIR}/git"
inherit cmake gettext pythonnative
PACKAGECONFIG ??= "sqlite zlib video"
PACKAGECONFIG ??= "sqlite zlib video ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[sqlite] = "-DENABLE_SQLITE_STORAGE=yes, -DENABLE_SQLITE_STORAGE=no, sqlite3"
PACKAGECONFIG[zlib] = ", --disable-zlib, zlib"
PACKAGECONFIG[video]= ",-DENABLE_VIDEO=NO"
EXTRA_OECMAKE += " -DENABLE_CONSOLE_UI=NO -DENABLE_GTK_UI=NO -DCMAKE_SKIP_INSTALL_RPATH=ON -DENABLE_CXX_WRAPPER=NO -DENABLE_VCARD=NO"
EXTRA_OECMAKE += " -DENABLE_CONSOLE_UI=NO -DENABLE_GTK_UI=NO -DCMAKE_SKIP_INSTALL_RPATH=ON -DENABLE_CXX_WRAPPER=NO -DENABLE_VCARD=ON"
EXTRA_OECMAKE += "-DCMAKE_INSTALL_DATAROOTDIR=share -DCMAKE_INSTALL_LIBDIR=lib"
# Fix cross-compilation include directories cmake problem
# Check Yocto version with DISTRO_VERSION variable to add or not the two following lines
EXTRA_OECMAKE += "${@base_version_less_or_equal('DISTRO_VERSION', '2.0', '', ' -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES=${STAGING_DIR}/${MACHINE}/usr/include', d)}"
EXTRA_OECMAKE += "${@base_version_less_or_equal('DISTRO_VERSION', '2.0', '', ' -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=${STAGING_DIR}/${MACHINE}/usr/include', d)}"
INSANE_SKIP_${PN} += "dev-deps"
PACKAGES += " ${PN}c ${PN}-common ${PN}-utils ${PN}-tester ${PN}-rings"
PACKAGES += " ${PN}c ${PN}-common ${PN}-tester ${PN}-utils ${PN}-rings"
FILES_${PN} += "${bindir}/linphone-daemon \
${bindir}/linphone-daemon-pipetest "
......@@ -47,7 +52,7 @@ FILES_${PN}-common = "${bindir}/lp-gen-wrappers \
${datadir}/icons"
FILES_${PN}-utils = "${bindir}/lp-test-ecc \
${bindir}/lp-autoanswer \
${bindir}/lp-auto-answer \
${bindir}/xml2lpc_test \
${bindir}/lpc2xml_test \
${bindir}/lp-sendmsg \"
......@@ -125,7 +130,11 @@ FILES_${PN}-tester ="${bindir}/liblinphone_tester \
${datadir}/liblinphone_tester/sipp/call_with_video_mline_before_audio_in_sdp.xml \
${datadir}/liblinphone_tester/sipp/sip_update_within_icoming_reinvite_with_no_sdp.xml \
${datadir}/liblinphone_tester/sipp/call_with_multiple_audio_mline_in_sdp.xml \
${datadir}/liblinphone_tester/sipp/call_invite_200ok_without_contact_header.xml"
${datadir}/liblinphone_tester/sipp/call_invite_200ok_without_contact_header.xml \
${datadir}/liblinphone_tester/local_tester_hosts \
${datadir}/liblinphone_tester/vcards \
${datadir}/liblinphone_tester/vcards/thousand_vcards.vcf \
${datadir}/liblinphone_tester/vcards/vcards.vcf"
FILES_${PN}c = "${bindir}/linphonec \
${bindir}/linphonecsh \
......@@ -134,7 +143,6 @@ FILES_${PN}c = "${bindir}/linphonec \
FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
FILES_${PN}-dev += " \
${includedir} \
${libdir}/pkgconfig \
......
......@@ -34,7 +34,8 @@ FILES_${PN}-dev += " \
${libdir}/*.la \
${libdir}/*.a \
${libdir}/pkgconfig \
${prefix}/share/Mediastreamer2 "
${prefix}/share/Mediastreamer2 \
${prefix}/share/mediastreamer2_tester"
#inherit autotools pkgconfig gettext
......@@ -4,7 +4,8 @@ inherit gitpkgv
PR = "${INC_PR}.0"
SRCREV = "1afe5d921a30b8dc2dffb8838e600b4bf97e623d"
SRCREV = "eb2af04948a1a0e0f3384f0e46c3513b0aa51e95"
#SRCREV = "1afe5d921a30b8dc2dffb8838e600b4bf97e623d"
SRC_URI = "git://git.linphone.org/mediastreamer2.git"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
......
......@@ -23,13 +23,13 @@ EXTRA_OECONF = " \
"
python () {
if d.getVar('TARGET_FPU') in [ 'soft' ]:
if d.getVar('TARGET_FPU', True) in [ 'soft' ]:
d.appendVar('PACKAGECONFIG', ' fixed-point')
# Ne10 is only available for armv7 and aarch64
if any((t.startswith('armv7') or t.startswith('aarch64')) for t in d.getVar('TUNE_FEATURES').split()):
if any((t.startswith('armv7') or t.startswith('aarch64')) for t in d.getVar('TUNE_FEATURES', True).split()):
d.appendVar('DEPENDS', ' ne10')
}
ARM_INSTRUCTION_SET = "arm"
\ No newline at end of file
ARM_INSTRUCTION_SET = "arm"
......@@ -4,7 +4,8 @@ inherit gitpkgv
PR = "${INC_PR}.0"
SRCREV = "5f8fcddce392f1510768949a4691f9e8c170badb"
SRCREV = "4cea5e6e7b6da329030b4f34b66a6168b864bb1d"
#SRCREV = "5f8fcddce392f1510768949a4691f9e8c170badb"
SRC_URI = "git://git.linphone.org/ortp.git"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment