Update the Linphone stack: belle-sip 1.4.1, libbzrtp 1.0.2, ortp 0.24.2,

mediastreamer 2.11.2, linphone 3.8.2

11 files changed, 60 insertions, 15 deletions

diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile
index 1abcf725d0b3..4355dfd07fbc 100644
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	belle-sip
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.1
 CATEGORIES=	net java
 MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/ \
 		http://www.antlr3.org/download/:source2
diff --git a/net/belle-sip/distinfo b/net/belle-sip/distinfo
index 5ba1e89427fe..1803142ffe2c 100644
--- a/net/belle-sip/distinfo
+++ b/net/belle-sip/distinfo
@@ -1,4 +1,4 @@
-SHA256 (belle-sip-1.4.0.tar.gz) = fffae80a4376125c17e77c2451ff8b01e28fedcc3219c7dd027051b6f9769dd3
-SIZE (belle-sip-1.4.0.tar.gz) = 742966
+SHA256 (belle-sip-1.4.1.tar.gz) = 4b1067ba14457c3e0a3b1506866c34b0082dcd19794526599f23f6acb11b2d60
+SIZE (belle-sip-1.4.1.tar.gz) = 748460
 SHA256 (antlr-3.4-complete.jar) = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7
 SIZE (antlr-3.4-complete.jar) = 2388361
diff --git a/net/linphone/Makefile b/net/linphone/Makefile
index 601ecf68e95c..589102db85df 100644
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	linphone
-PORTVERSION=	3.8.1
+PORTVERSION=	3.8.2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/3.8.x/sources
diff --git a/net/linphone/distinfo b/net/linphone/distinfo
index 3fcec6661048..78d648101406 100644
--- a/net/linphone/distinfo
+++ b/net/linphone/distinfo
@@ -1,2 +1,2 @@
-SHA256 (linphone-3.8.1.tar.gz) = 8d45bc9ec9a795a29bfdbf60c665bdfa81b46f3c83e870d50ad7c3f25156bca7
-SIZE (linphone-3.8.1.tar.gz) = 15327283
+SHA256 (linphone-3.8.2.tar.gz) = a14a228fe0f7cd9918777558f8272690a6d7541f262a593893eb447b500fec6d
+SIZE (linphone-3.8.2.tar.gz) = 15366935
diff --git a/net/linphone/files/patch-gtk-main.c b/net/linphone/files/patch-gtk-main.c
new file mode 100644
index 000000000000..cb511cc2e03c
--- /dev/null
+++ b/net/linphone/files/patch-gtk-main.c
@@ -0,0 +1,26 @@
+--- gtk/main.c.orig	2015-05-13 14:47:31 UTC
++++ gtk/main.c
+@@ -1919,9 +1919,7 @@ void linphone_gtk_log_handler(OrtpLogLev
+ 	if (verbose){
+ 		const char *lname="undef";
+ 		char *msg;
+-#if defined(__linux) || defined(__APPLE__)
+ 		va_list cap;/*copy of our argument list: a va_list cannot be re-used (SIGSEGV on linux 64 bits)*/
+-#endif
+ 		switch(lev){
+ 			case ORTP_DEBUG:
+ 				lname="debug";
+@@ -1941,13 +1939,9 @@ void linphone_gtk_log_handler(OrtpLogLev
+ 			default:
+ 				g_error("Bad level !");
+ 		}
+-#if defined(__linux) || defined(__APPLE__)
+ 		va_copy(cap,args);
+ 		msg=g_strdup_vprintf(fmt,cap);
+ 		va_end(cap);
+-#else
+-		msg=g_strdup_vprintf(fmt,args);
+-#endif
+ 		fprintf(stdout,"linphone-%s : %s\n",lname,msg);
+ 		ortp_free(msg);
+ 	}
diff --git a/net/linphone/files/patch-gtk-status_icon.c b/net/linphone/files/patch-gtk-status_icon.c
new file mode 100644
index 000000000000..9d5ad0bdd9da
--- /dev/null
+++ b/net/linphone/files/patch-gtk-status_icon.c
@@ -0,0 +1,19 @@
+--- gtk/status_icon.c.orig	2015-05-13 14:47:31 UTC
++++ gtk/status_icon.c
+@@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suit
+ #endif
+ 
+ #if !defined(WIN32) && !defined(__APPLE__) && GLIB_CHECK_VERSION(2, 26, 0)
+-#define STATUS_NOTIFIER_IS_USABLE 1
+ #endif
+ 
+ #include "status_notifier.h"
+@@ -195,7 +194,7 @@ static LinphoneStatusIcon *_linphone_sta
+ }
+ 
+ static void _linphone_status_icon_free(LinphoneStatusIcon *obj) {
+-	if(obj->desc->uninit) obj->desc->uninit(obj->data);
++	if(obj->desc->uninit) obj->desc->uninit(obj);
+ 	if(obj->params) linphone_status_icon_params_unref(obj->params);
+ 	g_free(obj);
+ }
diff --git a/net/linphone/pkg-plist b/net/linphone/pkg-plist
index 6e73229b8e4f..2d52fc3b50ea 100644
--- a/net/linphone/pkg-plist
+++ b/net/linphone/pkg-plist
@@ -1,4 +1,4 @@
-bin/auto_answer
+bin/lp-autoanswer
 bin/linphone
 bin/linphonec
 bin/linphonecsh
@@ -20,8 +20,8 @@ include/linphone/lpconfig.h
 include/linphone/sipsetup.h
 include/linphone/xml2lpc.h
 lib/liblinphone.so
-lib/liblinphone.so.6
-lib/liblinphone.so.6.0.0
+lib/liblinphone.so.7
+lib/liblinphone.so.7.0.0
 libdata/pkgconfig/linphone.pc
 man/cs/man1/linphone.1.gz
 man/cs/man1/linphonec.1.gz
diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index 876d285217f3..7170a657d14f 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mediastreamer
-PORTVERSION=	2.11.1
+PORTVERSION=	2.11.2
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/mediastreamer
 
diff --git a/net/mediastreamer/distinfo b/net/mediastreamer/distinfo
index 7efc2884354d..0586f727da9c 100644
--- a/net/mediastreamer/distinfo
+++ b/net/mediastreamer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mediastreamer-2.11.1.tar.gz) = eda29f98f8fa73f9a7da48e3ab00e1d3015b6bcffac98e06c27e7b9dc524db3d
-SIZE (mediastreamer-2.11.1.tar.gz) = 6347710
+SHA256 (mediastreamer-2.11.2.tar.gz) = 8c09b0646c8ba0354b3e1d807811e70110d6f3a893fd19f4ef91864f3357cfbc
+SIZE (mediastreamer-2.11.2.tar.gz) = 6356644
diff --git a/net/ortp/Makefile b/net/ortp/Makefile
index 0dc38819d3a2..a5498d7fbaf7 100644
--- a/net/ortp/Makefile
+++ b/net/ortp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ortp
-PORTVERSION=	0.24.1
+PORTVERSION=	0.24.2
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/ortp/sources
 
diff --git a/net/ortp/distinfo b/net/ortp/distinfo
index d94d8985a894..622716dcb2a4 100644
--- a/net/ortp/distinfo
+++ b/net/ortp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ortp-0.24.1.tar.gz) = d1ecce20bed145186f727914f10f500d0594e30c2a234a276e7e12dcd8814cd5
-SIZE (ortp-0.24.1.tar.gz) = 557772
+SHA256 (ortp-0.24.2.tar.gz) = cb37c76985b3703157f0ed06d900d662b903ad3c5b772e2d1ea36478ad8a6616
+SIZE (ortp-0.24.2.tar.gz) = 560529