- Updates to the Linphone stack: Belle-sip 1.4.0, oRTP 0.24.1,

  Mediastreamer 2.11.1, Linphone 3.8.1
- Switch to PolarSSL 1.3.x to enable instant messaging encryption
- SRTP/ZRTP support has been moved from oRTP to Mediastreamer

Notable enhancements in this release:
- Fullscreen mode
- Hang up button in the video window
- Wizard for audio/video settings
- Arabic translation
- Support RTP/AVPF (RFC4585) with VP8 codec: this feature allows
  transmission error recovery for video, which greatly enhances the
  video quality over unreliable links

5 files changed, 7 insertions, 26 deletions

diff --git a/net/ortp/Makefile b/net/ortp/Makefile
index 4ced62b13772..0dc38819d3a2 100644
--- a/net/ortp/Makefile
+++ b/net/ortp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ortp
-PORTVERSION=	0.23.0
-PORTREVISION=	2
+PORTVERSION=	0.24.1
 CATEGORIES=	net
 MASTER_SITES=	SAVANNAH/linphone/ortp/sources
 
@@ -13,14 +12,10 @@ COMMENT=	Real-time Transport Protocol (RTP) library
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsrtp.so:${PORTSDIR}/net/libsrtp \
-		libzrtpcppcore.so:${PORTSDIR}/security/libzrtpcppcore
-
 CONFLICTS_INSTALL=	linphone-base-[0-9]*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-silent-rules --disable-strict \
-		--enable-zrtp --with-srtp
+CONFIGURE_ARGS=	--disable-silent-rules --disable-strict
 INSTALL_TARGET=	install-strip
 USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/net/ortp/distinfo b/net/ortp/distinfo
index 880f7708417e..d94d8985a894 100644
--- a/net/ortp/distinfo
+++ b/net/ortp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ortp-0.23.0.tar.gz) = 91a5ada15f62ce5f08beceef4d0adb65469211e2f208bd96e493a8df9f84fcdb
-SIZE (ortp-0.23.0.tar.gz) = 540135
+SHA256 (ortp-0.24.1.tar.gz) = d1ecce20bed145186f727914f10f500d0594e30c2a234a276e7e12dcd8814cd5
+SIZE (ortp-0.24.1.tar.gz) = 557772
diff --git a/net/ortp/files/patch-configure b/net/ortp/files/patch-configure
index 54c11eafe26a..3b0ffc952588 100644
--- a/net/ortp/files/patch-configure
+++ b/net/ortp/files/patch-configure
@@ -8,13 +8,3 @@
  	;;
  	*mingw32ce)
  		CFLAGS="$CFLAGS -D_WIN32_WCE -D_WIN32_WINNT=0x0501 -DORTP_STATIC"
-@@ -12211,7 +12210,8 @@ if test "${srtp_prefix}" != "none" ; the
- 		SRTP_CFLAGS="-I${srtp_prefix}/include -I${srtp_prefix}/include/srtp"
- 		SRTP_LIBS="-L${srtp_prefix}/lib"
- 	fi
--	SRTP_LIBS="$SRTP_LIBS -lsrtp"
-+	SRTP_CFLAGS="$(pkg-config --cflags libsrtp)"
-+	SRTP_LIBS="$(pkg-config --libs libsrtp)"
- 
- 		have_srtp=no
- 	CPPFLAGS_save=$CPPFLAGS
diff --git a/net/ortp/files/patch-ortp.pc.in b/net/ortp/files/patch-ortp.pc.in
index 3e96164d7d8a..27f75c97dd82 100644
--- a/net/ortp/files/patch-ortp.pc.in
+++ b/net/ortp/files/patch-ortp.pc.in
@@ -1,9 +1,9 @@
---- ortp.pc.in.orig	2010-02-08 14:38:31 UTC
+--- ortp.pc.in.orig	2015-01-30 09:36:41 UTC
 +++ ortp.pc.in
 @@ -6,5 +6,6 @@ includedir=@includedir@
  Name: oRTP 
- Description: Implement the RFC3550 (RTP) with a easy to use API with high and low level access. 
- Version: @ORTP_PKGCONFIG_VERSION@                           
+ Description: Implement the RFC3550 (RTP) with a easy to use API with high and low level access.
+ Version: @ORTP_PKGCONFIG_VERSION@
 -Libs: -L@libdir@ -lortp @ORTPDEPS_LIBS@
 +Libs: -L@libdir@ -lortp
 +Libs.private: @ORTPDEPS_LIBS@
diff --git a/net/ortp/pkg-plist b/net/ortp/pkg-plist
index f387e860eefa..90ffd7bb47ec 100644
--- a/net/ortp/pkg-plist
+++ b/net/ortp/pkg-plist
@@ -2,7 +2,6 @@ include/ortp/b64.h
 include/ortp/event.h
 include/ortp/logging.h
 include/ortp/ortp.h
-include/ortp/ortp_srtp.h
 include/ortp/payloadtype.h
 include/ortp/port.h
 include/ortp/rtcp.h
@@ -12,10 +11,7 @@ include/ortp/rtpsession.h
 include/ortp/rtpsignaltable.h
 include/ortp/sessionset.h
 include/ortp/str_utils.h
-include/ortp/stun.h
-include/ortp/stun_udp.h
 include/ortp/telephonyevents.h
-include/ortp/zrtp.h
 lib/libortp.so
 lib/libortp.so.9
 lib/libortp.so.9.0.0