From 393a70252c8c69602a7754037ac690428de080bd Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 22 Jul 2011 12:22:55 +0200 Subject: [PATCH 1/2] Removed debug trace --- coreapi/sal_eXosip2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index ff078ccf8..389179008 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -446,7 +446,6 @@ void sal_root_ca(Sal* ctx, const char* rootCa) { if (ctx->rootCa) ms_free(ctx->rootCa); ctx->rootCa = ms_strdup(rootCa); - ms_error("YIPI : %s == %s\n", rootCa, ctx->rootCa); } static int extract_received_rport(osip_message_t *msg, const char **received, int *rportval,SalTransport* transport){ From 00d09892c7b60804a3f3cbcbe66d61a23d6f779c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 29 Jul 2011 16:19:31 +0200 Subject: [PATCH 2/2] fix exosip2 version requirement --- m4/exosip.m4 | 4 ++-- mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/m4/exosip.m4 b/m4/exosip.m4 index cf1db587d..2c21b129d 100644 --- a/m4/exosip.m4 +++ b/m4/exosip.m4 @@ -25,9 +25,9 @@ dnl check for eXosip2 libs LDFLAGS_save=$LDFLAGS LDFLAGS="$OSIP_LIBS $LDFLAGS $OPENSSL_LIBS" LIBS_save=$LIBS -AC_CHECK_LIB([eXosip2],[eXosip_subscribe_remove], +AC_CHECK_LIB([eXosip2],[eXosip_set_tls_ctx], [], - [AC_MSG_ERROR([Could not find eXosip2 library with version >= 3.0.2 !])], + [AC_MSG_ERROR([Could not find eXosip2 library with version >= 3.5.0 !])], [-losipparser2 -losip2 ]) AC_CHECK_LIB([eXosip2],[eXosip_get_version], [AC_DEFINE([HAVE_EXOSIP_GET_VERSION],[1],[Defined when eXosip_get_version is available])], diff --git a/mediastreamer2 b/mediastreamer2 index 909125059..1b8cb2902 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 9091250591e54e6533cea8ba8c203f6f4f47550d +Subproject commit 1b8cb2902a0ee26327cbf8db2d8185bcce2d74a6 diff --git a/oRTP b/oRTP index 9cdfa6c82..44c5fb07f 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 9cdfa6c826b2a2701122a50ed3c78afa8ef17ec6 +Subproject commit 44c5fb07fe3b3e2648eda7a63d7e997ccf6b0c11