From e91dc6759a3be31fafb30ccd1900bfb946386e8f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 14 Apr 2014 15:27:03 +0200 Subject: [PATCH 1/2] update belle-sip and linphone --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index e881f0512..0177ef2de 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit e881f0512913a75d58ffe4ae6edf9139703383cc +Subproject commit 0177ef2de50f9609d8ed0525e8878f957da6ab61 diff --git a/submodules/linphone b/submodules/linphone index fd8136016..28f4a815f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit fd813601605e2f4e2cbd70e2cdb96806e3e78e41 +Subproject commit 28f4a815f6be83516748a2af610d69629f0ab593 From 15fb9cac57632b4bf30724b3e584d20796d32afc Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 14 Apr 2014 20:13:31 +0200 Subject: [PATCH 2/2] fix crash in mediastreamer2 fix symbol conflict with sha256 --- submodules/build/iphone-config.site | 4 ++++ submodules/linphone | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index ee81ad99b..995023e4a 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -44,6 +44,10 @@ echo "Selecting SDK path = ${SYSROOT_PATH}" COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -${CLANG_TARGET_SPECIFIER}=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions" +#workaround for polarssl conflicting symbols + +COMMON_FLAGS="$COMMON_FLAGS -Dsha256=polarssl_sha256" + # silence clang unused operators. This is temporary, we should find a way to compile 3rd party with correct flags :( COMMON_FLAGS="-Qunused-arguments -Wno-unknown-warning-option -Wno-unused-command-line-argument-hard-error-in-future $COMMON_FLAGS" diff --git a/submodules/linphone b/submodules/linphone index 28f4a815f..e5d8ff817 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 28f4a815f6be83516748a2af610d69629f0ab593 +Subproject commit e5d8ff817a5de726d75a6a69791d6a9603fe6460