Commit 4348cd7b authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Update bellesip, ms2 and linphone + fix CMake options definitions.

parent 2c1a6c95
......@@ -48,26 +48,26 @@ set(CMAKE_SHARED_LIBRARIES "-DENABLE_STATIC=0")
# cunit
set(EP_cunit_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_cunit_CMAKE_OPTIONS}")
list(INSERT EP_cunit_CMAKE_OPTIONS 0 ${CMAKE_SHARED_LIBRARIES})
# xml2
set(EP_xml2_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES} ${EP_xml2_CONFIGURE_OPTIONS}")
# antlr3
set(EP_antlr3c_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_antlr3c_CMAKE_OPTIONS}")
list(INSERT EP_antlr3c_CMAKE_OPTIONS 0 ${CMAKE_SHARED_LIBRARIES})
# polarssl
set(EP_polarssl_CMAKE_OPTIONS "-DUSE_SHARED_POLARSSL_LIBRARY=1 ${EP_polarssl_CMAKE_OPTIONS}")
list(APPEND EP_polarssl_CMAKE_OPTIONS "-DUSE_SHARED_POLARSSL_LIBRARY=1")
# bellesip
set(EP_bellesip_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_bellesip_CMAKE_OPTIONS}")
list(INSERT EP_bellesip_CMAKE_OPTIONS 0 ${CMAKE_SHARED_LIBRARIES})
set(EP_bellesip_EXTRA_CFLAGS "-DUSE_STRUCT_RES_STATE_NAMESERVERS ${EP_bellesip_EXTRA_CFLAGS}")
# srtp
set(EP_srtp_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_srtp_CMAKE_OPTIONS}")
list(INSERT EP_srtp_CMAKE_OPTIONS 0 ${CMAKE_SHARED_LIBRARIES})
# speex
set(EP_speex_CMAKE_OPTIONS "${CMAKE_SHARED_LIBRARIES} ${EP_speex_CMAKE_OPTIONS}")
list(INSERT EP_speex_CMAKE_OPTIONS 0 ${CMAKE_SHARED_LIBRARIES})
# opus
set(EP_opus_CONFIGURE_OPTIONS "${AUTOTOOLS_SHARED_LIBRARIES} ${EP_opus_CONFIGURE_OPTIONS} --enable-fixed-point --disable-asm")
......
......@@ -56,7 +56,7 @@ list(APPEND LINPHONE_BUILDER_BUILDERS
# cunit
set(EP_cunit_GIT_REPOSITORY "git://git.linphone.org/cunit.git")
set(EP_cunit_GIT_TAG "86562ef04d0d66c007d7822944a75f540ae37f19") # Branch 'linphone'
set(EP_cunit_CMAKE_OPTIONS "-DENABLE_AUTOMATED=0 -DENABLE_CONSOLE=0")
set(EP_cunit_CMAKE_OPTIONS "-DENABLE_AUTOMATED=0" "-DENABLE_CONSOLE=0")
# xml2
set(EP_xml2_GIT_REPOSITORY "git://git.gnome.org/libxml2")
......@@ -74,12 +74,13 @@ set(EP_polarssl_GIT_TAG "3681900a1e0a3a8c77fc33c545cccd93977a1cf2") # Branch 'li
# belle-sip
set(EP_bellesip_GIT_REPOSITORY "git://git.linphone.org/belle-sip.git")
set(EP_bellesip_GIT_TAG "be4372de075300146bdcf2e862920c500d47727f") # Branch 'master'
set(EP_bellesip_GIT_TAG "cb977e6aaa0a319c437d08e3d67492d1453adbfb") # Branch 'master'
set(EP_bellesip_CMAKE_OPTIONS )
set(EP_bellesip_DEPENDENCIES EP_antlr3c EP_polarssl)
if(${ENABLE_UNIT_TESTS})
list(APPEND EP_bellesip_DEPENDENCIES EP_cunit)
else(${ENABLE_UNIT_TESTS})
set(EP_bellesip_CMAKE_OPTIONS "${EP_bellesip_CMAKE_OPTIONS} -DENABLE_TESTS=0")
list(APPEND EP_bellesip_CMAKE_OPTIONS "-DENABLE_TESTS=0")
endif(${ENABLE_UNIT_TESTS})
# srtp
......@@ -117,7 +118,7 @@ endif(${ENABLE_ZRTP})
# mediastreamer2
set(EP_ms2_GIT_REPOSITORY "git://git.linphone.org/mediastreamer2.git")
set(EP_ms2_GIT_TAG "c4fd2eea1e49cb102327670a122a177e08a7f206") # Branch 'master'
set(EP_ms2_GIT_TAG "4372ce8a738d5a6d6dd9228c72829fb27498544b") # Branch 'master'
set(EP_ms2_CONFIGURE_OPTIONS "--disable-strict --enable-external-ortp")
set(EP_ms2_DEPENDENCIES EP_ortp)
if(${ENABLE_GSM})
......@@ -144,7 +145,7 @@ endif(${ENABLE_UNIT_TESTS})
# linphone
set(EP_linphone_GIT_REPOSITORY "git://git.linphone.org/linphone.git")
set(EP_linphone_GIT_TAG "5214931034de70fbf0234711ee4122c15b3cbfae") # Branch 'master'
set(EP_linphone_GIT_TAG "3a8d2ee20d219432b40cc583dd0d0a3e28e4e7f7") # Branch 'master'
set(EP_linphone_CONFIGURE_OPTIONS "--disable-strict --enable-bellesip --enable-external-ortp --enable-external-mediastreamer")
set(EP_linphone_DEPENDENCIES EP_bellesip EP_ortp EP_ms2 EP_xml2)
if(${ENABLE_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