From 811fabffbb5652675a17c19893174092f9efa33f Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 12 Mar 2015 13:37:09 +0100 Subject: [PATCH 1/3] Update iOS host triplets --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 706f502ae..ce00f5807 100644 --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,7 @@ case $target in mingw_found=yes AC_CHECK_TOOL(WINDRES, windres) ;; - armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin|armv7s-apple-darwin|aarch64-apple-darwin|x86_64-apple-darwin.ios) + armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin|armv7s-apple-darwin|aarch64-apple-darwin|*-apple-darwin.ios) CFLAGS="$CFLAGS -DTARGET_OS_IPHONE=1 " LIBS="$LIBS -framework CoreFoundation -framework AudioToolbox -framework CoreAudio -framework Foundation -framework QuartzCore -framework OpenGLES -framework UIKit -framework AVFoundation" ios_found=yes From 4089e394a38e7d17cc82ec77c9d4ab42db32918b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 12 Mar 2015 14:21:20 +0100 Subject: [PATCH 2/3] Point ms2 submodule on 2.11.0 tag and ortp on 0.24.0 --- mediastreamer2 | 2 +- oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index abfb03280..c8df1970c 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit abfb03280bd9abe3a54afcb9bdd912d48d2755da +Subproject commit c8df1970c30af189bc7720c0715bcf67668c7ad6 diff --git a/oRTP b/oRTP index 68c07b231..3c10c6783 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 68c07b23191f97619d209445e99a30418c4bfc77 +Subproject commit 3c10c678342f7c2ca2d49537b86aa81b098e6110 From cc2b63af4e6af03c5dcc755070f3344fde3016d4 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 12 Mar 2015 14:46:23 +0100 Subject: [PATCH 3/3] Fix va_list crash --- coreapi/linphonecore.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index f9a0bf612..ab33bcd30 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -190,7 +190,10 @@ static void linphone_core_log_collection_handler(OrtpLogLevel level, const char struct stat statbuf; if (liblinphone_log_func != NULL) { - liblinphone_log_func(level, fmt, args); + va_list args_copy; + va_copy(args_copy, args); + liblinphone_log_func(level, fmt, args_copy); + va_end(args_copy); } ortp_gettimeofday(&tp, NULL);