Commit acfe3506 authored by Ghislain MARY's avatar Ghislain MARY

Use bzrtp instead of zrtpcpp + update belle-sip, ortp, ms2, msopenh264 and linphone.

parent 462bc472
......@@ -25,7 +25,12 @@ include(cmake/LinphoneBuilderOptions.cmake)
# List of the projects to build. The order is important and must follow the dependencies.
set(LINPHONE_BUILDER_BUILDERS )
set(LINPHONE_BUILDER_BUILDERS
antlr3c
polarssl
xml2
)
if(${ENABLE_UNIT_TESTS})
list(APPEND LINPHONE_BUILDER_BUILDERS cunit)
endif(${ENABLE_UNIT_TESTS})
......@@ -33,7 +38,7 @@ if(${ENABLE_SRTP})
list(APPEND LINPHONE_BUILDER_BUILDERS srtp)
endif(${ENABLE_SRTP})
if(${ENABLE_ZRTP})
list(APPEND LINPHONE_BUILDER_BUILDERS zrtp)
list(APPEND LINPHONE_BUILDER_BUILDERS bzrtp)
endif(${ENABLE_ZRTP})
if(${ENABLE_GSM})
list(APPEND LINPHONE_BUILDER_BUILDERS gsm)
......@@ -55,9 +60,6 @@ if("${BUILD_V4L}" STREQUAL "yes")
endif("${BUILD_V4L}" STREQUAL "yes")
list(APPEND LINPHONE_BUILDER_BUILDERS
xml2
antlr3c
polarssl
ortp
ms2
)
......
......@@ -21,7 +21,7 @@
############################################################################
set(EP_bellesip_GIT_REPOSITORY "git://git.linphone.org/belle-sip.git")
set(EP_bellesip_GIT_TAG "6d0a3031a8ee5c53a9dc4e126b54a3f82ccf56b9") # Branch 'master'
set(EP_bellesip_GIT_TAG "e4616ba4eba8e590175dd85cc872257b92aa52f4") # Branch 'master'
set(EP_bellesip_CMAKE_OPTIONS )
set(EP_bellesip_LINKING_TYPE "-DENABLE_STATIC=0")
set(EP_bellesip_DEPENDENCIES EP_antlr3c EP_polarssl)
......
############################################################################
# zrtp.cmake
# bzrtp.cmake
# Copyright (C) 2014 Belledonne Communications, Grenoble France
#
############################################################################
......@@ -20,11 +20,19 @@
#
############################################################################
set(EP_zrtp_GIT_REPOSITORY "https://github.com/wernerd/ZRTPCPP.git")
set(EP_zrtp_GIT_TAG "761339643ee278e1f532713b959c6bb212040206") # Branch 'master'
set(EP_zrtp_CMAKE_OPTIONS "-DCORE_LIB=1 -DSDES=0")
set(EP_zrtp_LINKING_TYPE "-DENABLE_STATIC=0")
if(MSVC)
set(EP_zrtp_EXTRA_LDFLAGS "/SAFESEH:NO")
endif(MSVC)
set(EP_bzrtp_GIT_REPOSITORY "git://git.linphone.org/bzrtp.git")
set(EP_bzrtp_GIT_TAG "1983008781bba8c001795948c1462be2670f45e0") # Branch 'master'
set(EP_bzrtp_BUILD_METHOD "autotools")
set(EP_bzrtp_USE_AUTOGEN "yes")
set(EP_bzrtp_CROSS_COMPILATION_OPTIONS
"--prefix=${CMAKE_INSTALL_PREFIX}"
"--host=${LINPHONE_BUILDER_HOST}"
)
set(EP_bzrtp_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_bzrtp_DEPENDENCIES EP_polarssl EP_xml2)
if(${ENABLE_UNIT_TESTS})
list(APPEND EP_bzrtp_DEPENDENCIES EP_cunit)
else()
list(APPEND EP_bzrtp_CONFIGURE_OPTIONS "--disable-tests")
endif()
......@@ -21,7 +21,7 @@
############################################################################
set(EP_linphone_GIT_REPOSITORY "git://git.linphone.org/linphone.git")
set(EP_linphone_GIT_TAG "3013fd8ae240ffafc4ec25e7d375bc4ea9d8b737") # Branch 'master'
set(EP_linphone_GIT_TAG "0c68cdcfbae933c0d6895f05733069cf37f2c547") # Branch 'master'
if(WIN32)
# Use temporary CMake build scripts for Windows. TODO: Port fully to CMake.
......
......@@ -21,7 +21,7 @@
############################################################################
set(EP_ms2_GIT_REPOSITORY "git://git.linphone.org/mediastreamer2.git")
set(EP_ms2_GIT_TAG "6530cce9c2062bdbbfdd0e01feac32243c3310f2") # Branch 'master'
set(EP_ms2_GIT_TAG "e51c106c7e48cfc961fbd74b5c8d5a0588a21080") # Branch 'master'
if(WIN32)
# Use temporary CMake build scripts for Windows. TODO: Port fully to CMake.
......
......@@ -21,7 +21,7 @@
############################################################################
set(EP_msopenh264_GIT_REPOSITORY "git://git.linphone.org/msopenh264.git")
set(EP_msopenh264_GIT_TAG "d7c97675f6dd727c79f75bd807f69a8ad8946146") # Branch 'master'
set(EP_msopenh264_GIT_TAG "60d2f94333a43a9aeb7448fb703d3e5cd046dced") # Branch 'master'
set(EP_msopenh264_BUILD_METHOD "autotools")
set(EP_msopenh264_USE_AUTOGEN "yes")
set(EP_msopenh264_CROSS_COMPILATION_OPTIONS
......
......@@ -21,7 +21,7 @@
############################################################################
set(EP_ortp_GIT_REPOSITORY "git://git.linphone.org/ortp.git")
set(EP_ortp_GIT_TAG "c0418933b7ce4765993b7304809e43df6ed392dd") # Branch 'master'
set(EP_ortp_GIT_TAG "393857c0e8e5cab10a8d647cc89c8390355745a7") # Branch 'master'
if(WIN32)
# Use temporary CMake build scripts for Windows. TODO: Port fully to CMake.
......@@ -47,7 +47,7 @@ else(WIN32)
endif(${ENABLE_SRTP})
if(${ENABLE_ZRTP})
list(APPEND EP_ortp_DEPENDENCIES EP_zrtp)
list(APPEND EP_ortp_DEPENDENCIES EP_bzrtp)
list(APPEND EP_ortp_CONFIGURE_OPTIONS "--enable-zrtp")
else(${ENABLE_ZRTP})
list(APPEND EP_ortp_CONFIGURE_OPTIONS "--disable-zrtp")
......
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