Update the Linphone stack:

Linphone 3.10.2 bctoolbox 0.2.0 oRTP 0.27.0 + bump PORTREVISION on dependent ports (devel/libosmo-abis) bzrtp 1.0.4 Belle-SIP 1.5.0 Mediastreamer 2.14.0 MS plugins (msbcg729 1.0.2, msopenh264 1.1.2)
svn path=/head/; revision=424119
2024-10-19 19:59:43 +00:00 · 2016-10-17 14:28:01 +00:00 · 2016-10-17 14:28:01 +00:00 · ef3fb3edb5 · 2021-03-31 03:12:20 +00:00
commit ef3fb3edb5
parent a978a84358
40 changed files with 270 additions and 114 deletions
--- a/audio/msbcg729/Makefile
+++ b/audio/msbcg729/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	msbcg729
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH/linphone/plugins/sources
 DISTNAME=	bcg729-${DISTVERSION}
@ -20,4 +20,12 @@ CONFIGURE_ARGS=	--disable-static --disable-strict
 INSTALL_TARGET=	install-strip
 USES=		libtool pkgconfig

+post-patch:
+# Don't install libbcg729 (provided by audio/bcg729).
+	@${REINPLACE_CMD} \
+		-e '/^LTLIBRARIES =/s/lib_LTLIBRARIES/noinst_LTLIBRARIES/' \
+		-e 's/^lib_LTLIBRARIES/noinst_LTLIBRARIES/' \
+		-e 's/-rpath $$(libdir)//' \
+		${WRKSRC}/src/Makefile.in
+
 .include <bsd.port.mk>
--- a/audio/msbcg729/distinfo
+++ b/audio/msbcg729/distinfo
@ -1,2 +1,3 @@
-SHA256 (bcg729-1.0.1.tar.gz) = 15f45abe2568b608984fe5f74aa8916d01a51cb26dcd559423d886d68ebe04ef
-SIZE (bcg729-1.0.1.tar.gz) = 473172
+TIMESTAMP = 1476528468
+SHA256 (bcg729-1.0.2.tar.gz) = 77c923edc57a53014da5f31788b63efbabfc7277c06deaeada06574628e4b03f
+SIZE (bcg729-1.0.2.tar.gz) = 474851
--- a/audio/msilbc/Makefile
+++ b/audio/msilbc/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	msilbc
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	audio net
 MASTER_SITES=	SAVANNAH/linphone/plugins/sources/

--- a/devel/libosmo-abis/Makefile
+++ b/devel/libosmo-abis/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libosmo-abis
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://git.osmocom.org/libosmo-abis/snapshot/ \
 		http://chaosophia.net/downloads/osmocom/${PORTNAME}/
--- a/multimedia/msopenh264/Makefile
+++ b/multimedia/msopenh264/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	msopenh264
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.2
 CATEGORIES=	multimedia net
 MASTER_SITES=	SAVANNAH/linphone/plugins/sources/

--- a/multimedia/msopenh264/distinfo
+++ b/multimedia/msopenh264/distinfo
@ -1,2 +1,3 @@
-SHA256 (msopenh264-1.1.1.tar.gz) = 1f9ea6fb3d08b013bdea273f51872f584e9919ff093ec96762b1c9b96f0d0b53
-SIZE (msopenh264-1.1.1.tar.gz) = 392512
+TIMESTAMP = 1476614735
+SHA256 (msopenh264-1.1.2.tar.gz) = 57e9d82540624afc42149fad8b2c52afddc996b418e61b9f6f7954749d59f8f3
+SIZE (msopenh264-1.1.2.tar.gz) = 373065
--- a/multimedia/msx264/Makefile
+++ b/multimedia/msx264/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	msx264
 PORTVERSION=	1.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia net
 MASTER_SITES=	SAVANNAH/linphone/plugins/sources/

--- a/net/Makefile
+++ b/net/Makefile
@ -42,6 +42,7 @@
    SUBDIR += axa
    SUBDIR += babeld
    SUBDIR += balance
+    SUBDIR += bctoolbox
    SUBDIR += beacon
    SUBDIR += beanstalkd
    SUBDIR += belle-sip
--- a/net/bctoolbox/Makefile
+++ b/net/bctoolbox/Makefile
@ -0,0 +1,28 @@
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	bctoolbox
+PORTVERSION=	0.2.0
+CATEGORIES=	net
+MASTER_SITES=	SAVANNAH/linphone/bctoolbox
+
+MAINTAINER=	tijl@FreeBSD.org
+COMMENT=	Belledonne Communications utility library
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	mbedtls>=2.3.0_2:security/mbedtls
+LIB_DEPENDS=	libmbedtls.so.10:security/mbedtls
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-strict
+CPPFLAGS+=	-DHAVE_ARC4RANDOM -DHAVE_DTLS_SRTP
+INSTALL_TARGET=	install-strip
+USES=		libtool pathfix pkgconfig
+USE_LDCONFIG=	yes
+
+post-stage:
+	${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bctoolbox-tester.pc
+
+.include <bsd.port.mk>
--- a/net/bctoolbox/distinfo
+++ b/net/bctoolbox/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1476352142
+SHA256 (bctoolbox-0.2.0.tar.gz) = a5d37036169dbf51bb67c705dacd300d1d9e3cd3642cef8df6dc630397d93b92
+SIZE (bctoolbox-0.2.0.tar.gz) = 439179
--- a/net/bctoolbox/files/patch-configure
+++ b/net/bctoolbox/files/patch-configure
@ -0,0 +1,19 @@
+--- configure.orig	2016-08-11 12:03:20 UTC
+++ configure
+@@ -16340,7 +16340,7 @@ fi
+ 
+ 
+ if test "$mbedtls_prefix" != "/usr" ; then
+-	MBEDTLS_CFLAGS="-I${mbedtls_prefix}"
+	MBEDTLS_CFLAGS="-I${mbedtls_prefix}/include"
+ 	MBEDTLS_LIBS="-L${mbedtls_prefix}/lib"
+ fi
+ 
+@@ -16408,7 +16408,6 @@ fi
+ 
+ 
+ if test "$cunit_found" != "true" ; then
+-	as_fn_error $? "\"CUnit not found\"" "$LINENO" 5
+ else
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CU_get_suite in -lcunit" >&5
--- a/net/bctoolbox/files/patch-src-Makefile.in
+++ b/net/bctoolbox/files/patch-src-Makefile.in
@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2016-08-11 12:03:19 UTC
+++ src/Makefile.in
+@@ -378,7 +378,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-lib_LTLIBRARIES = libbctoolbox.la libbctoolbox-tester.la
+lib_LTLIBRARIES = libbctoolbox.la
+ libbctoolbox_la_SOURCES = vfs.c utils/port.c logging/logging.c \
+ 	containers/list.c containers/map.cc $(am__append_1) \
+ 	$(am__append_2) $(am__append_3)
--- a/net/bctoolbox/files/patch-src-utils-port.c
+++ b/net/bctoolbox/files/patch-src-utils-port.c
@ -0,0 +1,11 @@
+--- src/utils/port.c.orig	2016-08-11 09:23:51 UTC
+++ src/utils/port.c
+@@ -1238,7 +1238,7 @@ void bctbx_sockaddr_remove_nat64_mapping
+ #ifdef _MSC_VER
+ 		if ((((in6->sin6_addr.u.Word[0] << 16) & in6->sin6_addr.u.Word[1]) == htonl(0x0064))
+ 			&& (((in6->sin6_addr.u.Word[2] << 16) & in6->sin6_addr.u.Word[3]) == htonl(0xff9b))) {
+-#elif __APPLE__
+#elif __APPLE__ || __FreeBSD__
+ 		if ((in6->sin6_addr.__u6_addr.__u6_addr32[0] == htonl(0x0064)) && (in6->sin6_addr.__u6_addr.__u6_addr32[1] == htonl(0xff9b))) {
+ #else
+ 		if ((in6->sin6_addr.s6_addr32[0] == htonl(0x0064)) && (in6->sin6_addr.s6_addr32[1] == htonl(0xff9b))) {
--- a/net/bctoolbox/pkg-descr
+++ b/net/bctoolbox/pkg-descr
@ -0,0 +1,3 @@
+Belledonne Communications utility library.
+
+WWW: https://www.linphone.org/
--- a/net/bctoolbox/pkg-plist
+++ b/net/bctoolbox/pkg-plist
@ -0,0 +1,11 @@
+include/bctoolbox/crypto.h
+include/bctoolbox/list.h
+include/bctoolbox/logging.h
+include/bctoolbox/map.h
+include/bctoolbox/port.h
+include/bctoolbox/tester.h
+include/bctoolbox/vfs.h
+lib/libbctoolbox.so
+lib/libbctoolbox.so.0
+lib/libbctoolbox.so.0.0.0
+libdata/pkgconfig/bctoolbox.pc
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	belle-sip
-PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 CATEGORIES=	net java
 MASTER_SITES=	SAVANNAH/linphone/${PORTNAME}/ \
 		http://www.antlr3.org/download/:source2
@ -16,7 +15,8 @@ COMMENT=	Belle-sip is a SIP (RFC3261) implementation written in C
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c
+LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c \
+		libbctoolbox.so:net/bctoolbox

 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@ -30,12 +30,6 @@ JAVA_BUILD=	jre
 JAVA_VERSION=	1.6+
 USE_LDCONFIG=	yes

-OPTIONS_DEFINE=	POLARSSL
-OPTIONS_DEFAULT=POLARSSL
-
-POLARSSL_CONFIGURE_ENABLE=	tls
-POLARSSL_LIB_DEPENDS=		libmbedtls.so.9:security/polarssl13
-
 post-extract:
 	@${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr-complete.jar

--- a/net/belle-sip/distinfo
+++ b/net/belle-sip/distinfo
@ -1,4 +1,5 @@
-SHA256 (belle-sip-1.4.2.tar.gz) = 822cb72608544cea526a03a076868380815eba8cc3d4d037d7a87c3907948830
-SIZE (belle-sip-1.4.2.tar.gz) = 765307
+TIMESTAMP = 1476371157
+SHA256 (belle-sip-1.5.0.tar.gz) = 4bc44ee83f8455fb6248d3b3045c38ab6e71e6699cde3f0cc5d67493bb38a43a
+SIZE (belle-sip-1.5.0.tar.gz) = 756785
 SHA256 (antlr-3.4-complete.jar) = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7
 SIZE (antlr-3.4-complete.jar) = 2388361
--- a/net/belle-sip/files/patch-src-belle_sip_headers_impl.c
+++ b/net/belle-sip/files/patch-src-belle_sip_headers_impl.c
@ -1,10 +1,10 @@
--- src/belle_sip_headers_impl.c.orig	2015-10-19 11:43:47 UTC
+--- src/belle_sip_headers_impl.c.orig	2016-08-11 09:23:59 UTC
 +++ src/belle_sip_headers_impl.c
-@@ -1668,11 +1668,6 @@ BELLESIP_EXPORT time_t belle_sip_header_
+@@ -1672,11 +1672,6 @@ BELLESIP_EXPORT time_t belle_sip_header_
 	char tmp2[16] ={0};
 	int i,j;
 	time_t seconds;
-#ifdef BELLE_SIP_WINDOWS_UNIVERSAL
+-#if defined(BELLE_SIP_WINDOWS_UNIVERSAL) || defined(BELLE_SIP_MSC_VER_GREATER_19)
 -	long adjust_timezone;
 -#else
 -	time_t adjust_timezone;
@ -12,7 +12,7 @@
 
 
 	/* time headers are in GMT as spec says */
-@@ -1694,26 +1689,12 @@ BELLESIP_EXPORT time_t belle_sip_header_
+@@ -1698,26 +1693,12 @@ BELLESIP_EXPORT time_t belle_sip_header_
 	return (time_t)-1;
 success:
 	ret.tm_isdst=0;
@ -24,7 +24,7 @@
 -	adjust_timezone = 0;
 -#else
 -	seconds = mktime(&ret);
-#ifdef BELLE_SIP_WINDOWS_UNIVERSAL
+-#if defined(BELLE_SIP_WINDOWS_UNIVERSAL) || defined(BELLE_SIP_MSC_VER_GREATER_19)
 -	_get_timezone(&adjust_timezone);
 -#else
 -	adjust_timezone = timezone;
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@ -1,37 +1,39 @@
 # $FreeBSD$

 PORTNAME=	linphone
-PORTVERSION=	3.9.1
+PORTVERSION=	3.10.2
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	SAVANNAH/linphone/3.9.x/sources
+MASTER_SITES=	SAVANNAH/linphone/3.10.x/sources

 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	SIP client supporting voice/video calls and text messaging

-LIB_DEPENDS=	libbellesip.so:net/belle-sip \
+LIB_DEPENDS=	libbctoolbox.so:net/bctoolbox \
+		libbellesip.so:net/belle-sip \
 		libmediastreamer_base.so:net/mediastreamer \
 		libortp.so:net/ortp \
-		libmbedtls.so.9:security/polarssl13 \
 		libsqlite3.so:databases/sqlite3

 CONFLICTS_INSTALL=	linphone-base-[0-9]*

 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	OBJC="${CC}"
 CONFIGURE_ARGS=	--disable-deplibs-link --disable-documentation \
 		--disable-speex --disable-strict \
 		--disable-tutorials \
 		--enable-external-mediastreamer --enable-external-ortp \
-		--enable-lime --with-polarssl=${LOCALBASE} \
+		--enable-lime \
 		--with-readline=${LOCALBASE}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
-USES=		gettext-tools gmake iconv libtool pathfix pkgconfig \
+USES=		gettext-tools gmake gnome iconv libtool pathfix pkgconfig \
 		readline:port
 USE_GNOME=	gtk20 intltool libxml2
 USE_LDCONFIG=	yes
+USE_XORG=	x11

 OPTIONS_DEFINE=	LDAP NLS NOTIFY UPNP VIDEO
 OPTIONS_DEFAULT=NOTIFY UPNP VIDEO
@ -56,10 +58,7 @@ VIDEO_CONFIGURE_ENABLE=	video
 CONFIGURE_ARGS+=--enable-debug
 .endif

-post-patch:
-.for l in C fr it ja
-	@${REINPLACE_CMD} '/^install-data-local:/,/^$$/d' \
-		${WRKSRC}/share/$l/Makefile.in
-.endfor
+post-stage:
+	${RM} -r ${STAGEDIR}${PREFIX}/share/gnome

 .include <bsd.port.mk>
--- a/net/linphone/distinfo
+++ b/net/linphone/distinfo
@ -1,2 +1,3 @@
-SHA256 (linphone-3.9.1.tar.gz) = 84e6eae51336f98817643f85f962a43351dafc4f2e1611825d1a3433307f24ac
-SIZE (linphone-3.9.1.tar.gz) = 13443595
+TIMESTAMP = 1476459045
+SHA256 (linphone-3.10.2.tar.gz) = 37cac1f4daa55fcd395b7b49925c01d1638b9d941c66d626ca36a9679332384c
+SIZE (linphone-3.10.2.tar.gz) = 25017003
--- a/net/linphone/files/patch-configure
+++ b/net/linphone/files/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	2015-11-02 13:54:22 UTC
+--- configure.orig	2016-08-30 14:20:13 UTC
 +++ configure
-@@ -20432,12 +20432,6 @@ $as_echo "#define HAVE_NOTIFY1 1" >>conf
+@@ -20308,12 +20308,6 @@ $as_echo "#define HAVE_NOTIFY1 1" >>conf
 	fi
 fi
 
@ -13,7 +13,25 @@
 case "$host_cpu" in
 	*arm*)
 
-@@ -22107,14 +22101,14 @@ fi
+@@ -21198,17 +21192,10 @@ fi
+ 
+ 
+ if test "$lime" != "false" ; then
+-	if test "x$found_polarssl" != "xyes" ; then
+-		if test "$lime" = "true" ; then
+-			as_fn_error $? "\"LIME requires POLARSSL in version >= 1.3\"" "$LINENO" 5
+-		fi
+-		lime=false
+-	else
+ 
+ $as_echo "#define HAVE_LIME 1" >>confdefs.h
+ 
+ 		lime=true
+-	fi
+ fi
+ 
+  if test x$console_ui = xtrue; then
+@@ -22153,14 +22140,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
 $as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
 if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then :
@ -25,25 +43,8 @@
 
 	fi
 	if test "$found_sqlite" = "yes"; then
-		SQLITE3_CFLAGS+=" -DMSG_STORAGE_ENABLED"
-+		SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DMSG_STORAGE_ENABLED"
+-		SQLITE3_CFLAGS+=" -DSQLITE_STORAGE_ENABLED"
+		SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DSQLITE_STORAGE_ENABLED"
 		if test "$build_macos" = "yes" -o "$ios_found" = "yes"; then
 			SQLITE3_LIBS+=" -liconv"
 		fi
-@@ -22262,14 +22256,14 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
- $as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
- if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then :
-  SQLITE3_LIBS+=" -lsqlite3 "; found_sqlite=yes
-+  SQLITE3_LIBS="$SQLITE3_LIBS -lsqlite3 "; found_sqlite=yes
- else
-   foo=bar
- fi
- 
-         fi
-         if test "$found_sqlite" = "yes"; then
-                SQLITE3_CFLAGS+=" -DCALL_LOGS_STORAGE_ENABLED"
-+                SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DCALL_LOGS_STORAGE_ENABLED"
-                 if test "$build_macos" = "yes" -o "$ios_found" = "yes"; then
-                         SQLITE3_LIBS+=" -liconv"
-                 fi
--- a/net/linphone/files/patch-console-Makefile.in
+++ b/net/linphone/files/patch-console-Makefile.in
@ -0,0 +1,10 @@
+--- console/Makefile.in.orig	2016-08-30 14:20:12 UTC
+++ console/Makefile.in
+@@ -464,6 +464,7 @@ COMMON_CFLAGS = \
+ @BUILD_CONSOLE_TRUE@linphonec_CFLAGS = $(COMMON_CFLAGS) $(CONSOLE_FLAGS) $(BELLESIP_CFLAGS)
+ @BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la \
+ @BUILD_CONSOLE_TRUE@		$(READLINE_LIBS)  \
+@BUILD_CONSOLE_TRUE@		$(MEDIASTREAMER_LIBS) -lbctoolbox \
+ @BUILD_CONSOLE_TRUE@		$(SQLITE3_LIBS) \
+ @BUILD_CONSOLE_TRUE@		$(X11_LIBS) \
+ @BUILD_CONSOLE_TRUE@		$(BELLESIP_LIBS) \
--- a/net/linphone/files/patch-coreapi-Makefile.in
+++ b/net/linphone/files/patch-coreapi-Makefile.in
@ -1,10 +1,10 @@
--- coreapi/Makefile.in.orig	2015-06-09 13:01:46 UTC
+--- coreapi/Makefile.in.orig	2016-10-14 19:03:24 UTC
 +++ coreapi/Makefile.in
-@@ -646,6 +646,7 @@ liblinphone_la_LIBADD = \
- 		$(LIBXML2_LIBS) \
+@@ -640,6 +640,7 @@ liblinphone_la_LIBADD = \
 		$(LDAP_LIBS) \
 		$(SASL_LIBS) \
-+		$(LTLIBICONV) \
+ 		$(BELCARD_LIBS) \
+		$(LTLIBICONV) -lbctoolbox \
 		$(ZLIB_LIBS)
 
- @ENABLE_TESTS_TRUE@test_lsd_SOURCES = test_lsd.c
+ AM_CPPFLAGS = \
--- a/net/linphone/files/patch-coreapi__presence.c
+++ b/net/linphone/files/patch-coreapi__presence.c
@ -1,10 +1,10 @@
--- coreapi/presence.c.orig	2015-10-23 09:10:07 UTC
+--- coreapi/presence.c.orig	2016-08-18 12:21:44 UTC
 +++ coreapi/presence.c
-@@ -157,11 +157,6 @@ static void presence_activity_delete(Lin
+@@ -160,11 +160,6 @@ static void presence_activity_delete(Lin
 static time_t parse_timestamp(const char *timestamp) {
 	struct tm ret;
 	time_t seconds;
-#ifdef LINPHONE_WINDOWS_UNIVERSAL
+-#if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
 -	long adjust_timezone;
 -#else
 -	time_t adjust_timezone;
@ -12,7 +12,7 @@
 
 	memset(&ret, 0, sizeof(ret));
 	sscanf(timestamp, "%d-%d-%dT%d:%d:%d",
-@@ -169,17 +164,12 @@ static time_t parse_timestamp(const char
+@@ -172,17 +167,12 @@ static time_t parse_timestamp(const char
 	ret.tm_mon--;
 	ret.tm_year -= 1900;
 	ret.tm_isdst = 0;
@ -23,7 +23,7 @@
 +		ms_error("timegm() failed: %s", strerror(errno));
 		return (time_t)-1;
 	}
-#ifdef LINPHONE_WINDOWS_UNIVERSAL
+-#if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19)
 -	_get_timezone(&adjust_timezone);
 -#else
 -	adjust_timezone = timezone;
--- a/net/linphone/files/patch-daemon-Makefile.in
+++ b/net/linphone/files/patch-daemon-Makefile.in
@ -0,0 +1,10 @@
+--- daemon/Makefile.in.orig	2016-08-30 14:20:12 UTC
+++ daemon/Makefile.in
+@@ -538,6 +538,7 @@ linphone_daemon_pipetest_LDADD = $(ORTP_
+ linphone_daemon_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS)  \
+ 		$(MEDIASTREAMER_LIBS) \
+ 		$(ORTP_LIBS) \
+		-lbctoolbox \
+ 		$(SPEEX_LIBS) \
+ 		$(LIBXML2_LIBS)
+ 
--- a/net/linphone/files/patch-gtk-Makefile.in
+++ b/net/linphone/files/patch-gtk-Makefile.in
@ -0,0 +1,10 @@
+--- gtk/Makefile.in.orig	2016-08-30 14:20:12 UTC
+++ gtk/Makefile.in
+@@ -543,6 +543,7 @@ EXTRA_DIST = \
+ @BUILD_GTK_UI_TRUE@	$(am__append_4)
+ @BUILD_GTK_UI_TRUE@linphone_LDADD =  \
+ @BUILD_GTK_UI_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
+@BUILD_GTK_UI_TRUE@	$(MEDIASTREAMER_LIBS) -lbctoolbox \
+ @BUILD_GTK_UI_TRUE@	$(LIBGTK_LIBS) $(NOTIFY1_LIBS) \
+ @BUILD_GTK_UI_TRUE@	$(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) \
+ @BUILD_GTK_UI_TRUE@	$(INTLLIBS) $(SQLITE3_LIBS) \
--- a/net/linphone/files/patch-tools-Makefile.in
+++ b/net/linphone/files/patch-tools-Makefile.in
@ -0,0 +1,20 @@
+--- tools/Makefile.in.orig	2016-10-14 20:18:07 UTC
+++ tools/Makefile.in
+@@ -539,14 +539,15 @@ EXTRA_DIST = xml2lpc_jni.cc lpc2xml_jni.
+ @BUILD_TOOLS_TRUE@lp_autoanswer_CFLAGS = $(COMMON_CFLAGS)
+ @BUILD_TOOLS_TRUE@lp_autoanswer_LDADD = \
+ @BUILD_TOOLS_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
+@BUILD_TOOLS_TRUE@	-lbctoolbox \
+ @BUILD_TOOLS_TRUE@	$(MEDIASTREAMER_LIBS)
+ 
+ @BUILD_TOOLS_TRUE@lp_test_ecc_SOURCES = test_ecc.c
+ @BUILD_TOOLS_TRUE@lp_test_ecc_CFLAGS = $(COMMON_CFLAGS)
+-@BUILD_TOOLS_TRUE@lp_test_ecc_LDADD = $(top_builddir)/coreapi/liblinphone.la
+@BUILD_TOOLS_TRUE@lp_test_ecc_LDADD = $(top_builddir)/coreapi/liblinphone.la $(MEDIASTREAMER_LIBS)
+ @BUILD_TOOLS_TRUE@lp_sendmsg_SOURCES = lpsendmsg.c
+ @BUILD_TOOLS_TRUE@lp_sendmsg_CFLAGS = $(COMMON_CFLAGS)
+-@BUILD_TOOLS_TRUE@lp_sendmsg_LDADD = $(top_builddir)/coreapi/liblinphone.la
+@BUILD_TOOLS_TRUE@lp_sendmsg_LDADD = $(top_builddir)/coreapi/liblinphone.la $(MEDIASTREAMER_LIBS)
+ @ENABLE_TESTS_TRUE@test_lsd_SOURCES = test_lsd.c
+ @ENABLE_TESTS_TRUE@test_lsd_CFLAGS = $(COMMON_CFLAGS)
+ @ENABLE_TESTS_TRUE@test_lsd_LDADD = $(top_builddir)/coreapi/liblinphone.la
--- a/net/linphone/pkg-plist
+++ b/net/linphone/pkg-plist
@ -1,16 +1,23 @@
-bin/lp-autoanswer
 bin/linphone
+bin/linphone-daemon
+bin/linphone-daemon-pipetest
 bin/linphonec
 bin/linphonecsh
+bin/lp-autoanswer
 bin/lp-gen-wrappers
+bin/lp-sendmsg
+bin/lp-test-ecc
 bin/lpc2xml_test
 bin/xml2lpc_test
 include/linphone/account_creator.h
 include/linphone/buffer.h
 include/linphone/call_log.h
 include/linphone/call_params.h
+include/linphone/carddav.h
+include/linphone/conference.h
 include/linphone/content.h
 include/linphone/event.h
+include/linphone/friendlist.h
 include/linphone/linphone_proxy_config.h
 include/linphone/linphone_tunnel.h
 include/linphone/linphonecore.h
@ -19,12 +26,16 @@ include/linphone/linphonefriend.h
 include/linphone/linphonepresence.h
 include/linphone/lpc2xml.h
 include/linphone/lpconfig.h
+include/linphone/nat_policy.h
+include/linphone/ringtoneplayer.h
 include/linphone/sipsetup.h
+include/linphone/sqlite3_bctbx_vfs.h
+include/linphone/vcard.h
 include/linphone/xml2lpc.h
 include/linphone/xmlrpc.h
 lib/liblinphone.so
-lib/liblinphone.so.8
-lib/liblinphone.so.8.0.0
+lib/liblinphone.so.9
+lib/liblinphone.so.9.0.0
 libdata/pkgconfig/linphone.pc
 man/cs/man1/linphone.1.gz
 man/cs/man1/linphonec.1.gz
@ -76,6 +87,7 @@ share/icons/hicolor/48x48/status/linphone-status-away.png
 share/icons/hicolor/48x48/status/linphone-status-donotdisturb.png
 share/icons/hicolor/48x48/status/linphone-status-offline.png
 share/icons/hicolor/48x48/status/linphone-status-online.png
+share/icons/hicolor/48x48/status/linphone-take-screenshot.png
 share/icons/hicolor/48x48/status/linphone-warning.png
 share/icons/hicolor/scalable/actions/linphone-add-call.svg
 share/icons/hicolor/scalable/actions/linphone-call-transfer.svg
@ -147,6 +159,7 @@ share/icons/hicolor/scalable/status/linphone-warning.svg
 %%NLS%%share/locale/cs/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/de/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/es/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/he/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/linphone.mo
@ -165,17 +178,17 @@ share/icons/hicolor/scalable/status/linphone-warning.svg
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/linphone.mo
 share/pixmaps/linphone/linphone-banner.png
 share/pixmaps/linphone/linphone.icns
+share/sounds/linphone/dont_wait_too_long.mkv
 share/sounds/linphone/hello16000.wav
 share/sounds/linphone/hello8000.wav
 share/sounds/linphone/incoming_chat.wav
 share/sounds/linphone/ringback.wav
-share/sounds/linphone/rings/bigben.wav
+share/sounds/linphone/rings/four_hands_together.mkv
+share/sounds/linphone/rings/house_keeping.mkv
+share/sounds/linphone/rings/its_a_game.mkv
+share/sounds/linphone/rings/leaving_dreams.mkv
+share/sounds/linphone/rings/notes_of_the_optimistic.mkv
 share/sounds/linphone/rings/oldphone-mono-30s.caf
 share/sounds/linphone/rings/oldphone-mono.wav
-share/sounds/linphone/rings/oldphone.wav
-share/sounds/linphone/rings/orig.wav
-share/sounds/linphone/rings/rock.wav
-share/sounds/linphone/rings/sweet.wav
-share/sounds/linphone/rings/synth.wav
-share/sounds/linphone/rings/tapping.wav
-share/sounds/linphone/rings/toy-mono.wav
+share/sounds/linphone/rings/soft_as_snow.mkv
+share/sounds/linphone/toy-mono.wav
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mediastreamer
-PORTVERSION=	2.12.1
-PORTREVISION=	1
+PORTVERSION=	2.14.0
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/mediastreamer

@ -13,10 +12,10 @@ COMMENT=	Real-time audio and video streaming and processing
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	libortp.so:net/ortp \
+LIB_DEPENDS=	libbctoolbox.so:net/bctoolbox \
+		libortp.so:net/ortp \
 		libsrtp.so:net/libsrtp \
-		libbzrtp.so:security/libbzrtp \
-		libmbedtls.so.9:security/polarssl13
+		libbzrtp.so:security/bzrtp

 CONFLICTS_INSTALL=	linphone-base-[0-9]*

@ -24,8 +23,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa --disable-documentation --disable-matroska \
 		--disable-pulseaudio --disable-strict \
 		--with-gsm=${LOCALBASE} --with-srtp=${LOCALBASE} \
-		--with-polarssl=${LOCALBASE} xxd_found=yes
-CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_ARC4RANDOM
+		xxd_found=yes
+CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 USES=		gettext-tools gmake libtool pathfix pkgconfig
@ -70,9 +69,7 @@ THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 UPNP_CONFIGURE_ENABLE=	upnp
 UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp

-V4L_CONFIGURE_ENABLE=	libv4l1 libv4l2
-V4L_CONFIGURE_OFF=	ac_cv_header_linux_videodev_h=no \
-			ac_cv_header_linux_videodev2_h=no
+V4L_CONFIGURE_ENABLE=	v4l
 V4L_BUILD_DEPENDS=	v4l_compat>=1.0.20120501:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l

--- a/net/mediastreamer/distinfo
+++ b/net/mediastreamer/distinfo
@ -1,2 +1,3 @@
-SHA256 (mediastreamer-2.12.1.tar.gz) = 0dbf8d4f721a04db9ec0982e98a4e852ad2d3acbcbd25edd96a66164a980f2e7
-SIZE (mediastreamer-2.12.1.tar.gz) = 6385132
+TIMESTAMP = 1476373165
+SHA256 (mediastreamer-2.14.0.tar.gz) = 1144849c0c96abafb1153adf56109f0f195a9e4a53cf28cb611bbca7a9012c1a
+SIZE (mediastreamer-2.14.0.tar.gz) = 6388303
--- a/net/mediastreamer/pkg-plist
+++ b/net/mediastreamer/pkg-plist
@ -3,6 +3,7 @@ bin/msaudiocmp
 include/mediastreamer2/allfilters.h
 include/mediastreamer2/bitratecontrol.h
 include/mediastreamer2/bits_rw.h
+include/mediastreamer2/devices.h
 include/mediastreamer2/dsptools.h
 include/mediastreamer2/dtls_srtp.h
 include/mediastreamer2/dtmfgen.h
@ -31,11 +32,12 @@ include/mediastreamer2/msjpegwriter.h
 include/mediastreamer2/msmediaplayer.h
 include/mediastreamer2/msqueue.h
 include/mediastreamer2/msrtp.h
+include/mediastreamer2/msrtt4103.h
 include/mediastreamer2/mssndcard.h
-include/mediastreamer2/msutils.h
 include/mediastreamer2/mstee.h
 include/mediastreamer2/msticker.h
 include/mediastreamer2/mstonedetector.h
+include/mediastreamer2/msutils.h
 include/mediastreamer2/msv4l.h
 include/mediastreamer2/msvaddtx.h
 include/mediastreamer2/msvideo.h
@ -46,17 +48,15 @@ include/mediastreamer2/mswebcam.h
 include/mediastreamer2/qualityindicator.h
 include/mediastreamer2/rfc3984.h
 include/mediastreamer2/stun.h
-include/mediastreamer2/stun_udp.h
 include/mediastreamer2/upnp_igd.h
-include/mediastreamer2/videostarter.h
 include/mediastreamer2/x11_helper.h
 include/mediastreamer2/zrtp.h
 lib/libmediastreamer_base.so
-lib/libmediastreamer_base.so.6
-lib/libmediastreamer_base.so.6.0.0
+lib/libmediastreamer_base.so.7
+lib/libmediastreamer_base.so.7.0.0
 lib/libmediastreamer_voip.so
-lib/libmediastreamer_voip.so.6
-lib/libmediastreamer_voip.so.6.0.0
+lib/libmediastreamer_voip.so.7
+lib/libmediastreamer_voip.so.7.0.0
 libdata/pkgconfig/mediastreamer.pc
 share/images/nowebcamCIF.jpg
 %%NLS%%share/locale/cs/LC_MESSAGES/mediastreamer.mo
--- a/net/ortp/Makefile
+++ b/net/ortp/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	ortp
-PORTVERSION=	0.25.0
+PORTVERSION=	0.27.0
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/ortp/sources

@ -12,6 +12,8 @@ COMMENT=	Real-time Transport Protocol (RTP) library
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING

+LIB_DEPENDS=	libbctoolbox.so:net/bctoolbox
+
 CONFLICTS_INSTALL=	linphone-base-[0-9]*

 GNU_CONFIGURE=	yes
--- a/net/ortp/distinfo
+++ b/net/ortp/distinfo
@ -1,2 +1,3 @@
-SHA256 (ortp-0.25.0.tar.gz) = 0deb826b79b1fd329f7638821d5439dc343bc55bb122daa6c90d19116cfe8d9a
-SIZE (ortp-0.25.0.tar.gz) = 565836
+TIMESTAMP = 1476351902
+SHA256 (ortp-0.27.0.tar.gz) = eb61a833ab3ad80978d7007411240f46e9b2d1034373b9d9dfaac88c1b6ec0af
+SIZE (ortp-0.27.0.tar.gz) = 592522
--- a/net/ortp/pkg-plist
+++ b/net/ortp/pkg-plist
@ -13,6 +13,6 @@ include/ortp/sessionset.h
 include/ortp/str_utils.h
 include/ortp/telephonyevents.h
 lib/libortp.so
-lib/libortp.so.10
-lib/libortp.so.10.0.0
+lib/libortp.so.11
+lib/libortp.so.11.0.0
 libdata/pkgconfig/ortp.pc
--- a/security/Makefile
+++ b/security/Makefile
@ -49,6 +49,7 @@
    SUBDIR += bsdsfv
    SUBDIR += bsmtrace
    SUBDIR += bugs
+    SUBDIR += bzrtp
    SUBDIR += ca_root_nss
    SUBDIR += calife
    SUBDIR += cardpeek
@ -297,7 +298,6 @@
    SUBDIR += libassuan
    SUBDIR += libbeid
    SUBDIR += libbf
-    SUBDIR += libbzrtp
    SUBDIR += libcryptui
    SUBDIR += libecc
    SUBDIR += libfprint
--- a/security/libbzrtp/Makefile
+++ b/security/libbzrtp/Makefile
@ -1,10 +1,9 @@
 # $FreeBSD$

-PORTNAME=	libbzrtp
-PORTVERSION=	1.0.3
+PORTNAME=	bzrtp
+PORTVERSION=	1.0.4
 CATEGORIES=	security
 MASTER_SITES=	SAVANNAH/linphone/bzrtp
-DISTNAME=	bzrtp-${DISTVERSION}

 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	ZRTP support library (RFC 6189)
@ -12,11 +11,10 @@ COMMENT=	ZRTP support library (RFC 6189)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	libmbedtls.so.9:security/polarssl13
+LIB_DEPENDS=	libbctoolbox.so:net/bctoolbox

 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-strict \
-		--with-polarssl=${LOCALBASE}
+CONFIGURE_ARGS=	--disable-strict
 INSTALL_TARGET=	install-strip
 USES=		libtool pathfix pkgconfig
 USE_GNOME=	libxml2
--- a/security/bzrtp/distinfo
+++ b/security/bzrtp/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1476457627
+SHA256 (bzrtp-1.0.4.tar.gz) = 8113c6afde48916113d028369d04bcaba4964e756066a7290ae1bd2eeece0caa
+SIZE (bzrtp-1.0.4.tar.gz) = 440150
--- a/security/libbzrtp/pkg-descr
+++ b/security/libbzrtp/pkg-descr
--- a/security/libbzrtp/pkg-plist
+++ b/security/libbzrtp/pkg-plist
--- a/security/libbzrtp/distinfo
+++ b/security/libbzrtp/distinfo
@ -1,2 +0,0 @@
-SHA256 (bzrtp-1.0.3.tar.gz) = c89cf7e3371408795814ac2eea8ff7783831e9ee1ae161d2583923397589f74b
-SIZE (bzrtp-1.0.3.tar.gz) = 459897