- Update pjsip to 2.6

- Add new WEBRTC option, disabled by default
- Make audio/speexdsp a dependency of the SPEEX option, reported
  by poudriere
- Regenerate some patches
- Bump net/asterisk13 PORTREVISION, I observed crashed when updating
  the pjsip libraries "below" it

10 files changed, 64 insertions, 14 deletions

diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index 9e114a1509ee..8c28f78a4c53 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	13.13.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
index 09d96d5ae2ec..332141381269 100644
--- a/net/pjsip/Makefile
+++ b/net/pjsip/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pjsip
-PORTVERSION=	2.5.5
-PORTREVISION=	2
+PORTVERSION=	2.6
 CATEGORIES=	net
 MASTER_SITES=	http://www.pjsip.org/release/${PORTVERSION}/
 DISTNAME=	pjproject-${DISTVERSION}
@@ -27,7 +26,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DEBUG FFMPEG G711 G722 G7221 GSM ILBC IPV6 L16 \
 		OPENH264 PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SDL \
-		SHARED SPEEX SPEEXAEC V4L SOUND VIDEO AMR EXTSRTP
+		SHARED SPEEX SPEEXAEC V4L SOUND VIDEO AMR EXTSRTP WEBRTC
 OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC
 
 G711_DESC=	G.711 codec support
@@ -44,6 +43,7 @@ SPEEXAEC_DESC=	Speex Acoustic Echo Canceller/AEC
 V4L_DESC=	Video4Linux2 support
 YUV_DESC=	Libyuv support
 EXTSRTP_DESC=	Use libsrtp port (needed to get SRTP support in asterisk13 pjsip backend)
+WEBRTC_DESC=	Build linwebrtc
 
 OPTIONS_SUB=	yes
 
@@ -63,7 +63,6 @@ IPV6_CFLAGS_OFF=		-DPJ_HAS_IPV6=1
 L16_CONFIGURE_ENABLE=		l16-codec
 OPENH264_CONFIGURE_ENABLE=	openh264
 OPENH264_LIB_DEPENDS=		libopenh264.so:multimedia/openh264
-PJSUA_LIB_DEPENDS=		libspeexdsp.so:audio/speexdsp
 RESAMPLE_CONFIGURE_ENABLE=	resample
 RESAMPLEDLL_CONFIGURE_ENABLE=	resample-dll
 SAMPLERATE_CONFIGURE_ENABLE=	libsamplerate
@@ -73,7 +72,8 @@ SDL_USE=			SDL=sdl
 SHARED_CONFIGURE_ENABLE=	shared
 SPEEX_CONFIGURE_ENABLE=		speex-codec
 SPEEX_CONFIGURE_ON=		--with-external-speex
-SPEEX_LIB_DEPENDS=		libspeex.so:audio/speex
+SPEEX_LIB_DEPENDS=		libspeex.so:audio/speex \
+				libspeexdsp.so:audio/speexdsp
 SPEEXAEC_CONFIGURE_ENABLE=	speex-aec
 V4L_CONFIGURE_ENABLE=		v4l2
 V4L_BUILD_DEPENDS=		v4l_compat>=0:multimedia/v4l_compat
@@ -86,6 +86,7 @@ AMR_LIB_DEPENDS=		libopencore-amrwb.so:audio/opencore-amr \
 				libvo-amrwbenc.so:audio/vo-amrwbenc
 EXTSRTP_CONFIGURE_WITH=		external-srtp
 EXTSRTP_LIB_DEPENDS=		libsrtp.so:net/libsrtp
+WEBRTC_CONFIGURE_OFF=		--disable-libwebrtc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
diff --git a/net/pjsip/distinfo b/net/pjsip/distinfo
index ebcf37ae8826..f0b51f7da731 100644
--- a/net/pjsip/distinfo
+++ b/net/pjsip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470021325
-SHA256 (pjproject-2.5.5.tar.bz2) = ab39207b761d3485199cd881410afeb2d171dff7c2bf75e8caae91c6dca508f3
-SIZE (pjproject-2.5.5.tar.bz2) = 4364389
+TIMESTAMP = 1486460881
+SHA256 (pjproject-2.6.tar.bz2) = 2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4
+SIZE (pjproject-2.6.tar.bz2) = 4933273
diff --git a/net/pjsip/files/patch-aconfigure b/net/pjsip/files/patch-aconfigure
index 2525fb90f5be..951f96798079 100644
--- a/net/pjsip/files/patch-aconfigure
+++ b/net/pjsip/files/patch-aconfigure
@@ -1,6 +1,6 @@
---- aconfigure.orig	2016-07-20 07:03:49 UTC
+--- aconfigure.orig	2017-01-25 11:23:08 UTC
 +++ aconfigure
-@@ -6234,14 +6234,7 @@ $as_echo "Checking sound device backend.
+@@ -6310,14 +6310,7 @@ $as_echo "Checking sound device backend.
  	;;
    *)
  		ac_pjmedia_snd=alsa
@@ -15,7 +15,7 @@
  
  
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5
-@@ -6865,7 +6858,7 @@ else
+@@ -6941,7 +6934,7 @@ else
  			FFMPEG_PREFIX=$with_ffmpeg
  			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
  $as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
@@ -24,3 +24,12 @@
  		fi
  
  		for ac_prog in pkg-config "python pkgconfig.py"
+@@ -8493,7 +8486,7 @@ $as_echo "Checking if libwebrtc is disab
+ 			ac_webrtc_instset=sse2
+ 			ac_webrtc_cflags="-msse2"
+ 			;;
+-		     *win32* | *w32* | *darwin* | *linux*)
++		     *win32* | *w32* | *darwin* | *linux* | *amd64*freebsd* )
+ 			ac_webrtc_instset=sse2
+ 			;;
+ 		     *)
diff --git a/net/pjsip/files/patch-build.mak.in b/net/pjsip/files/patch-build.mak.in
index 1dabf83775e9..630811628556 100644
--- a/net/pjsip/files/patch-build.mak.in
+++ b/net/pjsip/files/patch-build.mak.in
@@ -1,4 +1,4 @@
---- build.mak.in.orig	2016-06-28 14:32:08 UTC
+--- build.mak.in.orig	2016-08-25 01:36:33 UTC
 +++ build.mak.in
 @@ -106,7 +106,7 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/t
  endif
diff --git a/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in b/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
index 290bbcaa9b29..1d5108499e00 100644
--- a/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
+++ b/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
@@ -1,6 +1,6 @@
---- pjmedia/build/os-auto.mak.in.orig	2016-06-28 14:32:08 UTC
+--- pjmedia/build/os-auto.mak.in.orig	2016-08-25 01:36:33 UTC
 +++ pjmedia/build/os-auto.mak.in
-@@ -203,50 +203,7 @@ export CFLAGS += -I$(THIRD_PARTY)/yuv/in
+@@ -215,50 +215,7 @@ export CFLAGS += -I$(THIRD_PARTY)/webrtc
  endif
  endif
  
diff --git a/net/pjsip/files/patch-third__party_build_os-auto.mak.in b/net/pjsip/files/patch-third__party_build_os-auto.mak.in
new file mode 100644
index 000000000000..d0c8fbb8a2d5
--- /dev/null
+++ b/net/pjsip/files/patch-third__party_build_os-auto.mak.in
@@ -0,0 +1,12 @@
+--- third_party/build/os-auto.mak.in.orig	2016-12-22 09:33:55 UTC
++++ third_party/build/os-auto.mak.in
+@@ -104,8 +104,7 @@ else ifneq ($(findstring mips,@ac_webrtc
+ else # Generic fixed point
+     WEBRTC_SRC = \
+ 	      modules/audio_processing/aecm/aecm_core_c.o                \
+-	      modules/audio_processing/ns/nsx_core_c.o                   \
+-	      common_audio/signal_processing/complex_fft.o
++	      modules/audio_processing/ns/nsx_core_c.o
+ endif
+ endif
+ endif
diff --git a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c b/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c
new file mode 100644
index 000000000000..bf7210a54510
--- /dev/null
+++ b/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c
@@ -0,0 +1,11 @@
+--- third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_core.c.orig	2016-08-29 08:44:54 UTC
++++ third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_core.c
+@@ -1478,7 +1478,7 @@ AecCore* WebRtcAec_CreateAec() {
+   WebRtcAec_ComfortNoise = ComfortNoise;
+   WebRtcAec_SubbandCoherence = SubbandCoherence;
+ 
+-#if defined(WEBRTC_ARCH_X86_FAMILY)
++#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(__SSE2__)
+   if (WebRtc_GetCPUInfo(kSSE2)) {
+     WebRtcAec_InitAec_SSE2();
+   }
diff --git a/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c b/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c
new file mode 100644
index 000000000000..1a3fd3e56331
--- /dev/null
+++ b/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c
@@ -0,0 +1,11 @@
+--- third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_rdft.c.orig	2016-08-25 01:36:33 UTC
++++ third_party/webrtc/src/webrtc/modules/audio_processing/aec/aec_rdft.c
+@@ -571,7 +571,7 @@ void aec_rdft_init(void) {
+   cftfsub_128 = cftfsub_128_C;
+   cftbsub_128 = cftbsub_128_C;
+   bitrv2_128 = bitrv2_128_C;
+-#if defined(WEBRTC_ARCH_X86_FAMILY)
++#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(__SSE2__)
+   if (WebRtc_GetCPUInfo(kSSE2)) {
+     aec_rdft_init_sse2();
+   }
diff --git a/net/pjsip/pkg-plist b/net/pjsip/pkg-plist
index e368f9f3dd0d..386e3de886a1 100644
--- a/net/pjsip/pkg-plist
+++ b/net/pjsip/pkg-plist
@@ -46,6 +46,8 @@ include/pj/compat/os_sunos.h
 include/pj/compat/os_symbian.h
 include/pj/compat/os_win32.h
 include/pj/compat/os_win32_wince.h
+include/pj/compat/os_winphone8.h
+include/pj/compat/os_winuwp.h
 include/pj/compat/rand.h
 include/pj/compat/setjmp.h
 include/pj/compat/size_t.h
@@ -351,6 +353,9 @@ lib/libpjsua2-%%CONFIGURE_TARGET%%.a
 %%NO_EXTSRTP%%lib/libsrtp-%%CONFIGURE_TARGET%%.a
 %%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so
 %%NO_EXTSRTP%%%%SHARED%%lib/libsrtp.so.2
+%%WEBRTC%%lib/libwebrtc-%%CONFIGURE_TARGET%%.a
+%%WEBRTC%%%%SHARED%%lib/libwebrtc.so
+%%WEBRTC%%%%SHARED%%lib/libwebrtc.so.2
 libdata/pkgconfig/libpjproject.pc
 %%PJSUA%%bin/pjsua
 %%PJSUA%%bin/pjsystest