From 4042c86ad4477c4cd4098a343a9386e67e4111a4 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 11 Jun 2013 14:23:27 +0200 Subject: [PATCH 01/11] Added setDomain to Java LinphoneAddress --- coreapi/linphonecore_jni.cc | 9 ++++++++- java/impl/org/linphone/core/LinphoneAddressImpl.java | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 5619993ab..1dfaf3c3c 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -1387,7 +1387,14 @@ extern "C" jstring Java_org_linphone_core_LinphoneAddressImpl_getDomain(JNIEnv* return NULL; } } - +extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setDomain(JNIEnv* env + ,jobject thiz + ,jlong ptr + ,jstring jdomain) { + const char* domain = env->GetStringUTFChars(jdomain, NULL); + linphone_address_set_domain((LinphoneAddress*)ptr, domain); + env->ReleaseStringUTFChars(jdomain, domain); +} extern "C" jstring Java_org_linphone_core_LinphoneAddressImpl_toString(JNIEnv* env ,jobject thiz ,jlong ptr) { diff --git a/java/impl/org/linphone/core/LinphoneAddressImpl.java b/java/impl/org/linphone/core/LinphoneAddressImpl.java index b9d290971..8d76da77a 100644 --- a/java/impl/org/linphone/core/LinphoneAddressImpl.java +++ b/java/impl/org/linphone/core/LinphoneAddressImpl.java @@ -31,6 +31,7 @@ public class LinphoneAddressImpl implements LinphoneAddress { private native String toUri(long ptr); private native void setDisplayName(long ptr,String name); private native String toString(long ptr); + private native void setDomain(long ptr, String domain); protected LinphoneAddressImpl(String identity) { nativePtr = newLinphoneAddressImpl(identity, null); @@ -85,7 +86,7 @@ public class LinphoneAddressImpl implements LinphoneAddress { return getPortInt(); } public void setDomain(String domain) { - throw new RuntimeException("Not implemented"); + setDomain(nativePtr, domain); } public void setPort(String port) { throw new RuntimeException("Not implemented"); From 8d0c8ff41c069684242ac7cf1974e9e802eb7be3 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 12 Jun 2013 11:11:35 +0200 Subject: [PATCH 02/11] update ms2 for H263 4CIF support --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index ff9b20e9f..f4b3768c9 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit ff9b20e9fbccb0c3ca401544d2cdc39dd8ee629e +Subproject commit f4b3768c9b92bf8d0977374b4a8b5d229c4d393e From 9c933011be33ca806bb76f8cc6daec04ace3e96f Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 13 Jun 2013 09:38:41 +0200 Subject: [PATCH 03/11] Depend on automake 1.9 and tar-pax (posix2001) make dist was limited to 99 character long filenames. --- configure.ac | 2 +- mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0fcf38fc9..ddeebd5ce 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_SUBST(LINPHONE_VERSION) AC_MSG_NOTICE([$PACKAGE_NAME-$PACKAGE_VERSION A full featured audio/video sip phone.]) AC_MSG_NOTICE([licensed under the terms of the General Public License (GPL)]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([1.9 tar-pax]) AC_SUBST([LIBTOOL_DEPS]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],) AC_SUBST([docdir], [${datadir}/doc]) diff --git a/mediastreamer2 b/mediastreamer2 index f4b3768c9..64cf0f92e 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit f4b3768c9b92bf8d0977374b4a8b5d229c4d393e +Subproject commit 64cf0f92ee8550ce2a330726b46782eda9819a73 From 9b6477607e9739ec259c5e1e46bf49bd9e46b32d Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 14 Jun 2013 10:52:58 +0200 Subject: [PATCH 04/11] Update oRTP (strtok issue) --- oRTP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oRTP b/oRTP index 462296433..9853da618 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 462296433f10bd84cb605edb0b38d16a4cd81d9e +Subproject commit 9853da61897a3c01303f9b71f331231b65b2979e From 2eef978abf34a17394f13da791afad26505de23f Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Fri, 14 Jun 2013 14:37:52 +0200 Subject: [PATCH 05/11] Change silk payload bitrate. --- oRTP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oRTP b/oRTP index 9853da618..020d921f8 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 9853da61897a3c01303f9b71f331231b65b2979e +Subproject commit 020d921f876ed04d434425fb2176642bbe9b3004 From 49ac735521a902e49090ad91c4f280a78b4d52ff Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 14 Jun 2013 15:03:42 +0200 Subject: [PATCH 06/11] MS2:fix wrong sampling rate at first startup --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 64cf0f92e..7564a5073 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 64cf0f92ee8550ce2a330726b46782eda9819a73 +Subproject commit 7564a50732292a017363bc39bba63e225c8b93c9 From 0d3258a6a78235a97791c61ffd7c3440e885973f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 17 Jun 2013 14:33:21 +0200 Subject: [PATCH 07/11] fix memory leak with some camera on windows (mainly) --- NEWS | 5 +++++ configure.ac | 2 +- mediastreamer2 | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 0eede9fa5..e1a271db1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +linphone-3.6.1 -- June 17, 2013 + * fix memory leak with some video cameras on windows. + + Requires: mediastreamer2 = 2.9.1 and ortp = 0.22.0 + linphone-3.6.0 -- May 27, 2013 UI: * new friend list and chat messaging UI diff --git a/configure.ac b/configure.ac index ddeebd5ce..eb4d533e8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.6.0],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.6.1],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([coreapi/linphonecore.c]) diff --git a/mediastreamer2 b/mediastreamer2 index 7564a5073..51d3c20b5 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 7564a50732292a017363bc39bba63e225c8b93c9 +Subproject commit 51d3c20b5ac8c0c8ad4be8fc73d8fa4df195d017 From b4478c85f757fc9670163bbaf24627037ef1e309 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 18 Jun 2013 18:39:44 +0200 Subject: [PATCH 08/11] improve documentation of macos x compilation, especially regarding generating bundle compatible with older macos version. --- README.macos | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/README.macos b/README.macos index dd39c2f6e..e2f1593bd 100644 --- a/README.macos +++ b/README.macos @@ -7,6 +7,10 @@ You need: - Macports: http://www.macports.org/ Download and install macports using its user friendly installer. +- In order to enable generation of bundle for multiple macos version it is recommended to edit /opt/local/etc/macports/macports.conf to add the + following line: + macosx_deployment_target 10.6 + - Install build time dependencies $ sudo port install automake autoconf libtool intltool @@ -17,7 +21,22 @@ You need: $ sudo port install ffmpeg-devel -gpl2 $ sudo port install libvpx $ sudo port install readline - + + +- Install gtk. It is recommended to use the quartz backend for better integration. + $ sudo port install gtk2 +quartz +no_x11 + $ sudo port install gtk-osx-application -python27 + $ sudo port install hicolor-icon-theme + +- Install additional librairies required for wizard (linphone.org account creation assistant) + $ sudo port install libsoup + +- Install sqlite3 for message storage + $ sudo port install sqlite3 + +The softwares below need to be compiled manually. To ensure compatibility with multiple mac os version it is recommended to do: + $ export MACOSX_DEPLOYMENT_TARGET=10.6 + - Install srtp (optional) for call encryption $ sudo port install srtp If that fails, get from source: @@ -31,17 +50,6 @@ You need: $ cd zrtpcpp && cmake -Denable-ccrtp=false . && make $ sudo make install -- Install gtk. It is recommended to use the quartz backend for better integration. - $ sudo port install gtk2 +quartz +no_x11 - $ sudo port install gtk-osx-application -python27 - $ sudo port install hicolor-icon-theme - -- Install additional librairies required for wizard (linphone.org account creation assistant) - $ sudo port install libsoup - - - Install sqlite3 for message storage - $ sudo port install sqlite3 - ** WARNING 2013-03-06 glib-networking is currently broken in macports - generates crashes or hangs when used in a bundle ** As a temporary workaround, build a newer version by yourself: $ wget http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.34/glib-networking-2.34.2.tar.xz @@ -58,7 +66,6 @@ You need: $ ./configure --prefix=/opt/local && make && sudo make install - - Compile linphone If you got the source code from git, run ./autogen.sh first. @@ -82,8 +89,7 @@ Use git: $ sudo touch touch /opt/local/lib/charset.alias Then run, inside linphone source tree: - 1. Run configure as told before but with "--enable-relativeprefix" appended. - + Run configure as told before but with "--enable-relativeprefix" appended. $ make $ make bundle From 3d1f4a1d8ca411bfbba3f0d733ec573e78344660 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 20 Jun 2013 11:36:58 +0200 Subject: [PATCH 09/11] allow contact address to be changed during call updates --- coreapi/linphonecore.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 202519d76..34c849595 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2821,6 +2821,10 @@ int linphone_core_start_update_call(LinphoneCore *lc, LinphoneCall *call){ if (lc->vtable.display_status) lc->vtable.display_status(lc,_("Modifying call parameters...")); sal_call_set_local_media_description (call->op,call->localdesc); + if (call->dest_proxy && call->dest_proxy->op){ + /*give a chance to update the contact address if connectivity has changed*/ + sal_op_set_contact(call->op,sal_op_get_contact(call->dest_proxy->op)); + }else sal_op_set_contact(call->op,NULL); return sal_call_update(call->op,subject); } From 301b7504f1f4f337725f568be5b9e04f0ddf884f Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 21 Jun 2013 11:31:49 +0200 Subject: [PATCH 10/11] Update ms2 (msdscap bug fix) --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 51d3c20b5..08e53b3ae 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 51d3c20b5ac8c0c8ad4be8fc73d8fa4df195d017 +Subproject commit 08e53b3ae265c5927efc420ae68e16e500ac0500 From ec1875a094ca8699ac4f29bca0c3009de83fa34c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 24 Jun 2013 11:53:32 +0200 Subject: [PATCH 11/11] update MS2 for 32bits video on macosx --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 08e53b3ae..94b4434c3 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 08e53b3ae265c5927efc420ae68e16e500ac0500 +Subproject commit 94b4434c34d1ae9de5438b9cfa614ee1821eb709