mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-22 21:58:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update libzrtp to v4 in standalone mode

Browse source 
- update srtp to include name collision correction
- update linphone to get updated oRTP using libzrtpv4 API
This commit is contained in:
Johan Pascal 2014-01-08 20:24:24 +01:00
parent 0728679785
commit e7e583cd1d
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -33,7 +33,7 @@
url = http://git.chromium.org/webm/libvpx.git
[submodule "submodules/externals/zrtpcpp"]
path = submodules/externals/zrtpcpp
url = git://git.linphone.org/zrtpcpp.git
url = https://github.com/wernerd/ZRTPCPP.git
[submodule "submodules/mssilk"]
path = submodules/mssilk
url = git://git.linphone.org/mssilk.git

2
submodules/build/builders.d/zrtp.mk
View file

@ -3,7 +3,7 @@ $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile:
mkdir -p $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)
cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/\
&& host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
&& cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -Denable-ccrtp=false -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake \
&& cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -DCORE_LIB=true -DSDES=false -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake \
-LH -Wdev -DCMAKE_C_COMPILER=`xcrun --find clang` -DCMAKE_CXX_COMPILER=`xcrun --find clang` \
-DCMAKE_SYSTEM_PROCESSOR=$$ARCH -DCMAKE_C_FLAGS="$$COMMON_FLAGS" -DCMAKE_CXX_FLAGS="$$COMMON_FLAGS" \
-DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix) -DBUILD_STATIC=ON "

2
submodules/externals/srtp vendored

@ -1 +1 @@
Subproject commit 14027d37c7574b27bf22e57f508137b4e86b6466
Subproject commit 218e54f8063426234153cdc977d08bb2d661f011

2
submodules/externals/zrtpcpp vendored

@ -1 +1 @@
Subproject commit bfbfcab72dfa27862b05607d18bb24b6f8395fcf
Subproject commit 4473ee0f94a0b8dde180f2f8d9c3684c80bd1e86

2
submodules/linphone

@ -1 +1 @@
Subproject commit e8d63aa3bae0a13788fdb09a9499190eb406f4c3
Subproject commit c2ca9f8c089b1b6ed8e7bc1f2bfa8d5a5defc524