Index: head/net/asterisk13/Makefile =================================================================== --- head/net/asterisk13/Makefile (revision 433573) +++ head/net/asterisk13/Makefile (revision 433574) @@ -1,294 +1,295 @@ # $FreeBSD$ 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/ \ asterisk/old-releases/ \ sounds/releases/:g729 PKGNAMESUFFIX= 13 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 armv6 USES= bison cpe gmake iconv libedit localbase \ shebangfix sqlite ssl ncurses USE_CSTD= gnu89 USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= asterisk GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datarootdir=${DATADIR} \ --with-ilbc=internal \ --with-crypto=${OPENSSLBASE} \ --with-ssl=${OPENSSLBASE} CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi \ contrib/scripts/astversion MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OSVERSION=${OSVERSION} \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" \ ASTLDFLAGS="${LDFLAGS}" MAKE_ARGS+= NOISY_BUILD=yes \ ASTDATADIR=${DATADIR} CONFLICTS= ossp-uuid-[0-9]* CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-11* OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \ MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \ SPANDSP SRTP SYSINFO XMPP OPTIONS_DEFAULT= CURL FREETDS GSM LUA MP3PLAYER NEWT ODBC MYSQL PGSQL PJSIP \ PORTAUDIO RADIUS SNMP SPANDSP SPEEX SQLITE2 VORBIS OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI OPTIONS_DEFAULT_i386= DAHDI BASE XMPP OPTIONS_DEFAULT_amd64= DAHDI BASE XMPP OPTIONS_DEFAULT_sparc64= DAHDI GCC XMPP OPTIONS_DEFAULT_powerpc= GCC XMPP OPTIONS_DEFAULT_armv6= BASE OPTIONS_GROUP= CODECS OPTIONS_GROUP_CODECS= GSM NEWG711 SPEEX VORBIS CODECS_DESC= Encoder/Decoder (Codec) Support OPTIONS_SINGLE= COMPILER OPTIONS_SINGLE_COMPILER= BASE GCC COMPILER_DESC= Compiler to use OPTIONS_GROUP+= DATABASE OPTIONS_GROUP_DATABASE= MYSQL ODBC PGSQL SQLITE2 DATABASE_DESC= Database Support OPTIONS_MULTI= MENU OPTIONS_MULTI_MENU= NCURSES NEWT MENU_DESC= Menuselect Interface Backend NEWT_DESC= Newt User Interface OPTIONS_GROUP+= SOUNDS OPTIONS_GROUP_SOUNDS= G729 SOUNDS_DESC= Core and Music-on-Hold (MoH) Sound Files G729_DESC= Install G.729 format sounds ASTERISK_CORE_G729_SOUNDS= asterisk-core-sounds-en-g729-1.5.tar.gz ASTERISK_MOH_G729_SOUNDS= asterisk-moh-opsound-g729-2.03.tar.gz G729_DISTFILES= ${ASTERISK_CORE_G729_SOUNDS}:g729 \ ${ASTERISK_MOH_G729_SOUNDS}:g729 ASTVERSION_DESC?= Install astversion (requires bash) BACKTRACE_DESC?= Stack backtrace support via (lib)execinfo BASE_DESC= Use base compiler (experimental) DAHDI_DESC?= DAHDI support EXCHANGE_DESC?= Exchange calendar support MP3PLAYER_DESC= Install MP3 Player for Music-On-Hold (mpg123) NEWG711_DESC?= New G711 Codec OOH323_DESC?= ooh323 support PJSIP_DESC?= Build the PJSIP based SIP channel SRTP_DESC?= SecureRTP support SYSINFO_DESC?= Use devel/libsysinfo to get system information XMPP_DESC?= XMPP/GTALK support OPTIONS_SUB= yes ASTVERSION_RUN_DEPENDS= bash:shells/bash BACKTRACE_CONFIGURE_WITH= execinfo BACKTRACE_USES= execinfo CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:ftp/curl DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 DAHDI_LIB_DEPENDS= libpri.so:misc/libpri \ libopenr2.so:misc/openr2 \ libtonezone.so:misc/dahdi EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:www/neon FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:databases/freetds GCC_USE= GCC=yes GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:audio/gsm LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes LUA_CONFIGURE_WITH= lua LUA_USES= lua:51 LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} MYSQL_CONFIGURE_WITH= mysqlclient MYSQL_USES= mysql MP3PLAYER_RUN_DEPENDS= mpg123:audio/mpg123 NCURSES_USES= ncurses NEWT_LIB_DEPENDS= libnewt.so:devel/newt ODBC_CONFIGURE_WITH= unixodbc ODBC_CONFIGURE_ON= --with-ltdl ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC \ libltdl.so:devel/libltdl OOH323_CPPFLAGS= -I${LOCALBASE}/include/openh323 OOH323_LIB_DEPENDS= libpt_r.so:devel/pwlib \ libh323_r.so:net/openh323 OOH323_MAKE_ENV= OPENH323DIR=${LOCALBASE}/share/openh323 PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql PJSIP_CONFIGURE_WITH= pjproject PJSIP_USES= pkgconfig PORTAUDIO_CONFIGURE_WITH= portaudio PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio RADIUS_CONFIGURE_WITH= radius RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient SNMP_CONFIGURE_WITH= netsnmp SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so:comms/spandsp SPEEX_CONFIGURE_WITH= speex SPEEX_LIB_DEPENDS= libspeex.so:audio/speex SQLITE2_CONFIGURE_WITH= sqlite SQLITE2_LIB_DEPENDS= libsqlite.so:databases/sqlite2 SRTP_CONFIGURE_WITH= srtp SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo VORBIS_CONFIGURE_WITH= ogg VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis XMPP_CONFIGURE_WITH= iksemel XMPP_LIB_DEPENDS= libiksemel.so:textproc/iksemel ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk USERS= ${ASTERISK_USER} GROUPS= ${ASTERISK_GROUP} dahdi .include .if ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP} LIB_DEPENDS+= libpj.so:net/pjsip-extsrtp .elif ${PORT_OPTIONS:MPJSIP} && ! ${PORT_OPTIONS:MSRTP} LIB_DEPENDS+= libpj.so:net/pjsip .elif ! ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP} LIB_DEPENDS+= libsrtp.so:net/libsrtp .endif .include .if empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no .endif .if ${PREFIX} == ${LOCALBASE} VARDIR=/var .else VARDIR=${PREFIX}/var .endif SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \ ASTERISK_GROUP=${ASTERISK_GROUP} \ VARDIR=${VARDIR} post-extract: @${FIND} ${WRKSRC} -name '*.d' -delete post-extract-G729-on: ${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds ${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample post-patch-SYSINFO-on: @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile post-patch-SYSINFO-off: @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${USER_MAKEOPTS_FILE} ${WRKSRC}/menuselect.makeopts .endif post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts post-configure-MYSQL-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts post-configure-OOH323-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts post-configure-NEWG711-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts post-configure-OPTIMIZED_CFLAGS-off: @cd ${WRKSRC} && ./menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua ${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} ${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} (cd ${STAGEDIR} && \ ${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \ ${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \ ${ECHO} "@owner" >> ${TMPPLIST} && \ ${ECHO} "@group" >> ${TMPPLIST}); post-install-ASTVERSION-off: @${RM} ${STAGEDIR}${PREFIX}/sbin/astversion .include Index: head/net/pjsip/Makefile =================================================================== --- head/net/pjsip/Makefile (revision 433573) +++ head/net/pjsip/Makefile (revision 433574) @@ -1,110 +1,111 @@ # $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} MAINTAINER= madpilot@FreeBSD.org COMMENT= Multimedia communication library written in C language LICENSE= GPLv2+ LIB_DEPENDS= libportaudio.so:audio/portaudio CONFLICTS= pjsip-extsrtp-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-external-pa \ --disable-silk USES= gmake localbase pathfix ssl tar:bz2 PATHFIX_MAKEFILEIN= Makefile USE_LDCONFIG= yes PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}" 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 G722_DESC= G.722 codec support G7221_DESC= G.722.1 codec support ILBC_DESC= iLBC codec support L16_DESC= Linear/L16 codec support OPENH264_DESC= OpenH264 support PJSUA_DESC= Command line SIP agent RESAMPLE_DESC= Enable resampling implementations RESAMPLEDLL_DESC= Build libresample as shared library SHARED_DESC= Build shared libraries (other ports may depend on this) 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 DEBUG_CFLAGS= -DNDEBUG=0 DEBUG_CFLAGS_OFF= -DNDEBUG=1 FFMPEG_CONFIGURE_ENABLE= ffmpeg FFMPEG_LIB_DEPENDS= libswresample.so:multimedia/ffmpeg G711_CONFIGURE_ENABLE= g711-codec G722_CONFIGURE_ENABLE= g722-codec G7221_CONFIGURE_ENABLE= g7221-codec GSM_CONFIGURE_ENABLE= gsm-codec GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_ON= --with-external-gsm ILBC_CONFIGURE_ENABLE= ilbc-codec IPV6_CFLAGS= -DPJ_HAS_IPV6=1 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 SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SDL_CONFIGURE_ENABLE= sdl 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 V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l IPV6_CFLAGS= "-DPJ_HAS_IPV6=1" SOUND_CONFIGURE_ENABLE= sound VIDEO_CONFIGURE_ENABLE= video AMR_CONFIGURE_WITH= opencore-amr 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}|' \ ${WRKSRC}/pkgconfig.py @${REINPLACE_CMD} -e 's/$$(APP_LDFLAGS) \{0,1\}//' \ -e 's/$$(OS_LDFLAGS)/$$(APP_LDFLAGS) &/' \ ${WRKSRC}/*/build/Makefile @${ECHO} "#include " > ${WRKSRC}/pjlib/include/pj/config_site.h @${ECHO} "#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)" >> ${WRKSRC}/pjlib/include/pj/config_site.h post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so post-install-PJSUA-on: ${INSTALL_PROGRAM} \ ${WRKSRC}/pjsip-apps/bin/pjsua-${ARCH}-portbld-${OPSYS:tl}${OSREL} \ ${STAGEDIR}${PREFIX}/bin/pjsua ${INSTALL_PROGRAM} \ ${WRKSRC}/pjsip-apps/bin/pjsystest-${ARCH}-portbld-${OPSYS:tl}${OSREL} \ ${STAGEDIR}${PREFIX}/bin/pjsystest .include Index: head/net/pjsip/distinfo =================================================================== --- head/net/pjsip/distinfo (revision 433573) +++ head/net/pjsip/distinfo (revision 433574) @@ -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 Index: head/net/pjsip/files/patch-aconfigure =================================================================== --- head/net/pjsip/files/patch-aconfigure (revision 433573) +++ head/net/pjsip/files/patch-aconfigure (revision 433574) @@ -1,26 +1,35 @@ ---- 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 - ac_pa_use_alsa=1 - - ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default" -if test "x$ac_cv_header_alsa_version_h" = xyes; then : - LIBS="$LIBS -lasound" -else ac_pa_use_alsa=0 -fi { $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; } - export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig + export PKG_CONFIG_PATH=$FFMPEG_PREFIX/libdata/pkgconfig 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 + ;; + *) Index: head/net/pjsip/files/patch-build.mak.in =================================================================== --- head/net/pjsip/files/patch-build.mak.in (revision 433573) +++ head/net/pjsip/files/patch-build.mak.in (revision 433574) @@ -1,20 +1,20 @@ ---- 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 endif -ifneq ($(findstring pa,@ac_pjmedia_snd@),) +#ifneq ($(findstring pa,@ac_pjmedia_snd@),) ifeq (@ac_external_pa@,1) # External PA APP_THIRD_PARTY_EXT += -lportaudio @@ -119,7 +119,7 @@ APP_THIRD_PARTY_LIBS += -lportaudio APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX) endif endif -endif +#endif ifneq (@ac_no_yuv@,1) ifeq (@ac_external_yuv@,1) Index: head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in =================================================================== --- head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in (revision 433573) +++ head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in (revision 433574) @@ -1,53 +1,53 @@ ---- 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 - -# -# MacOSX specific -# -ifneq ($(findstring coreaudio,$(AC_PJMEDIA_SND)),) -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_COREAUDIO=1 \ - -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ - -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -endif - -# -# Unix specific -# -ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),) -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \ - -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ - -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -endif - -# -# Windows specific -# -ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),) -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 \ - -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -else export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -endif - -# -# Null sound device -# -ifeq ($(AC_PJMEDIA_SND),null) -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ - -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -endif - -# -# External sound device -# -ifeq ($(AC_PJMEDIA_SND),external) -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ - -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -endif # # QT video device Index: head/net/pjsip/files/patch-third__party_build_os-auto.mak.in =================================================================== --- head/net/pjsip/files/patch-third__party_build_os-auto.mak.in (nonexistent) +++ head/net/pjsip/files/patch-third__party_build_os-auto.mak.in (revision 433574) @@ -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 Property changes on: head/net/pjsip/files/patch-third__party_build_os-auto.mak.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c =================================================================== --- head/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c (nonexistent) +++ head/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c (revision 433574) @@ -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(); + } Property changes on: head/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__core.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c =================================================================== --- head/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c (nonexistent) +++ head/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c (revision 433574) @@ -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(); + } Property changes on: head/net/pjsip/files/patch-third__party_webrtc_src_webrtc_modules_audio__processing_aec_aec__rdft.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/pjsip/pkg-plist =================================================================== --- head/net/pjsip/pkg-plist (revision 433573) +++ head/net/pjsip/pkg-plist (revision 433574) @@ -1,356 +1,361 @@ include/pj++/file.hpp include/pj++/hash.hpp include/pj++/list.hpp include/pj++/lock.hpp include/pj++/os.hpp include/pj++/pool.hpp include/pj++/proactor.hpp include/pj++/scanner.hpp include/pj++/sock.hpp include/pj++/string.hpp include/pj++/timer.hpp include/pj++/tree.hpp include/pj++/types.hpp include/pj/activesock.h include/pj/addr_resolv.h include/pj/array.h include/pj/assert.h include/pj/compat/assert.h include/pj/compat/cc_armcc.h include/pj/compat/cc_codew.h include/pj/compat/cc_gcc.h include/pj/compat/cc_gcce.h include/pj/compat/cc_msvc.h include/pj/compat/cc_mwcc.h include/pj/compat/ctype.h include/pj/compat/errno.h include/pj/compat/high_precision.h include/pj/compat/m_alpha.h include/pj/compat/m_armv4.h include/pj/compat/m_auto.h include/pj/compat/m_auto.h.in include/pj/compat/m_i386.h include/pj/compat/m_m68k.h include/pj/compat/m_powerpc.h include/pj/compat/m_sparc.h include/pj/compat/m_x86_64.h include/pj/compat/malloc.h include/pj/compat/os_auto.h include/pj/compat/os_auto.h.in include/pj/compat/os_darwinos.h include/pj/compat/os_linux.h include/pj/compat/os_linux_kernel.h include/pj/compat/os_palmos.h include/pj/compat/os_rtems.h 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 include/pj/compat/socket.h include/pj/compat/stdarg.h include/pj/compat/stdfileio.h include/pj/compat/string.h include/pj/compat/time.h include/pj/config.h include/pj/config_site.h include/pj/config_site_sample.h include/pj/ctype.h include/pj/doxygen.h include/pj/errno.h include/pj/except.h include/pj/fifobuf.h include/pj/file_access.h include/pj/file_io.h include/pj/guid.h include/pj/hash.h include/pj/ioqueue.h include/pj/ip_helper.h include/pj/list.h include/pj/list_i.h include/pj/lock.h include/pj/log.h include/pj/math.h include/pj/os.h include/pj/pool.h include/pj/pool_alt.h include/pj/pool_buf.h include/pj/pool_i.h include/pj/rand.h include/pj/rbtree.h include/pj/sock.h include/pj/sock_qos.h include/pj/sock_select.h include/pj/ssl_sock.h include/pj/string.h include/pj/string_i.h include/pj/timer.h include/pj/types.h include/pj/unicode.h include/pjlib++.hpp include/pjlib-util.h include/pjlib-util/base64.h include/pjlib-util/cli.h include/pjlib-util/cli_console.h include/pjlib-util/cli_imp.h include/pjlib-util/cli_telnet.h include/pjlib-util/config.h include/pjlib-util/crc32.h include/pjlib-util/dns.h include/pjlib-util/dns_server.h include/pjlib-util/errno.h include/pjlib-util/getopt.h include/pjlib-util/hmac_md5.h include/pjlib-util/hmac_sha1.h include/pjlib-util/http_client.h include/pjlib-util/json.h include/pjlib-util/md5.h include/pjlib-util/pcap.h include/pjlib-util/resolver.h include/pjlib-util/scanner.h include/pjlib-util/scanner_cis_bitwise.h include/pjlib-util/scanner_cis_uint.h include/pjlib-util/sha1.h include/pjlib-util/srv_resolver.h include/pjlib-util/string.h include/pjlib-util/stun_simple.h include/pjlib-util/types.h include/pjlib-util/xml.h include/pjlib.h include/pjmedia-audiodev/audiodev.h include/pjmedia-audiodev/audiodev_imp.h include/pjmedia-audiodev/audiotest.h include/pjmedia-audiodev/config.h include/pjmedia-audiodev/errno.h include/pjmedia-codec.h include/pjmedia-codec/amr_helper.h include/pjmedia-codec/amr_sdp_match.h include/pjmedia-codec/audio_codecs.h include/pjmedia-codec/config.h include/pjmedia-codec/config_auto.h include/pjmedia-codec/config_auto.h.in include/pjmedia-codec/ffmpeg_vid_codecs.h include/pjmedia-codec/g722.h include/pjmedia-codec/g7221.h include/pjmedia-codec/g7221_sdp_match.h include/pjmedia-codec/gsm.h include/pjmedia-codec/h263_packetizer.h include/pjmedia-codec/h264_packetizer.h include/pjmedia-codec/ilbc.h include/pjmedia-codec/ipp_codecs.h include/pjmedia-codec/l16.h include/pjmedia-codec/opencore_amr.h include/pjmedia-codec/openh264.h include/pjmedia-codec/opus.h include/pjmedia-codec/passthrough.h include/pjmedia-codec/silk.h include/pjmedia-codec/speex.h include/pjmedia-codec/types.h include/pjmedia-videodev/avi_dev.h include/pjmedia-videodev/config.h include/pjmedia-videodev/errno.h include/pjmedia-videodev/opengl_dev.h include/pjmedia-videodev/videodev.h include/pjmedia-videodev/videodev_imp.h include/pjmedia.h include/pjmedia/alaw_ulaw.h include/pjmedia/audiodev.h include/pjmedia/avi.h include/pjmedia/avi_stream.h include/pjmedia/bidirectional.h include/pjmedia/circbuf.h include/pjmedia/clock.h include/pjmedia/codec.h include/pjmedia/conference.h include/pjmedia/config.h include/pjmedia/config_auto.h include/pjmedia/config_auto.h.in include/pjmedia/converter.h include/pjmedia/delaybuf.h include/pjmedia/doxygen.h include/pjmedia/echo.h include/pjmedia/echo_port.h include/pjmedia/endpoint.h include/pjmedia/errno.h include/pjmedia/event.h include/pjmedia/format.h include/pjmedia/frame.h include/pjmedia/g711.h include/pjmedia/jbuf.h include/pjmedia/master_port.h include/pjmedia/mem_port.h include/pjmedia/null_port.h include/pjmedia/plc.h include/pjmedia/port.h include/pjmedia/resample.h include/pjmedia/rtcp.h include/pjmedia/rtcp_xr.h include/pjmedia/rtp.h include/pjmedia/sdp.h include/pjmedia/sdp_neg.h include/pjmedia/session.h include/pjmedia/signatures.h include/pjmedia/silencedet.h include/pjmedia/sound.h include/pjmedia/sound_port.h include/pjmedia/splitcomb.h include/pjmedia/stereo.h include/pjmedia/stream.h include/pjmedia/stream_common.h include/pjmedia/symbian_sound_aps.h include/pjmedia/tonegen.h include/pjmedia/transport.h include/pjmedia/transport_adapter_sample.h include/pjmedia/transport_ice.h include/pjmedia/transport_loop.h include/pjmedia/transport_srtp.h include/pjmedia/transport_udp.h include/pjmedia/types.h include/pjmedia/vid_codec.h include/pjmedia/vid_codec_util.h include/pjmedia/vid_port.h include/pjmedia/vid_stream.h include/pjmedia/vid_tee.h include/pjmedia/videodev.h include/pjmedia/wav_playlist.h include/pjmedia/wav_port.h include/pjmedia/wave.h include/pjmedia/wsola.h include/pjmedia_audiodev.h include/pjmedia_videodev.h include/pjnath.h include/pjnath/config.h include/pjnath/errno.h include/pjnath/ice_session.h include/pjnath/ice_strans.h include/pjnath/nat_detect.h include/pjnath/stun_auth.h include/pjnath/stun_config.h include/pjnath/stun_msg.h include/pjnath/stun_session.h include/pjnath/stun_sock.h include/pjnath/stun_transaction.h include/pjnath/turn_session.h include/pjnath/turn_sock.h include/pjnath/types.h include/pjsip-simple/errno.h include/pjsip-simple/evsub.h include/pjsip-simple/evsub_msg.h include/pjsip-simple/iscomposing.h include/pjsip-simple/mwi.h include/pjsip-simple/pidf.h include/pjsip-simple/presence.h include/pjsip-simple/publish.h include/pjsip-simple/rpid.h include/pjsip-simple/types.h include/pjsip-simple/xpidf.h include/pjsip-ua/sip_100rel.h include/pjsip-ua/sip_inv.h include/pjsip-ua/sip_regc.h include/pjsip-ua/sip_replaces.h include/pjsip-ua/sip_timer.h include/pjsip-ua/sip_xfer.h include/pjsip.h include/pjsip/print_util.h include/pjsip/sip_auth.h include/pjsip/sip_auth_aka.h include/pjsip/sip_auth_msg.h include/pjsip/sip_auth_parser.h include/pjsip/sip_autoconf.h include/pjsip/sip_autoconf.h.in include/pjsip/sip_config.h include/pjsip/sip_dialog.h include/pjsip/sip_endpoint.h include/pjsip/sip_errno.h include/pjsip/sip_event.h include/pjsip/sip_module.h include/pjsip/sip_msg.h include/pjsip/sip_multipart.h include/pjsip/sip_parser.h include/pjsip/sip_private.h include/pjsip/sip_resolve.h include/pjsip/sip_tel_uri.h include/pjsip/sip_transaction.h include/pjsip/sip_transport.h include/pjsip/sip_transport_loop.h include/pjsip/sip_transport_tcp.h include/pjsip/sip_transport_tls.h include/pjsip/sip_transport_udp.h include/pjsip/sip_types.h include/pjsip/sip_ua_layer.h include/pjsip/sip_uri.h include/pjsip/sip_util.h include/pjsip_auth.h include/pjsip_simple.h include/pjsip_ua.h include/pjsua-lib/pjsua.h include/pjsua-lib/pjsua_internal.h include/pjsua.h include/pjsua2.hpp include/pjsua2/account.hpp include/pjsua2/call.hpp include/pjsua2/config.hpp include/pjsua2/doxygen.hpp include/pjsua2/endpoint.hpp include/pjsua2/json.hpp include/pjsua2/media.hpp include/pjsua2/persistent.hpp include/pjsua2/presence.hpp include/pjsua2/siptypes.hpp include/pjsua2/types.hpp %%G7221%%lib/libg7221codec-%%CONFIGURE_TARGET%%.a %%SHARED%%%%G7221%%lib/libg7221codec.so %%SHARED%%%%G7221%%lib/libg7221codec.so.2 %%ILBC%%lib/libilbccodec-%%CONFIGURE_TARGET%%.a %%SHARED%%%%ILBC%%lib/libilbccodec.so %%SHARED%%%%ILBC%%lib/libilbccodec.so.2 lib/libpj-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpj.so %%SHARED%%lib/libpj.so.2 lib/libpjlib-util-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpjlib-util.so %%SHARED%%lib/libpjlib-util.so.2 lib/libpjmedia-%%CONFIGURE_TARGET%%.a lib/libpjmedia-audiodev-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpjmedia-audiodev.so %%SHARED%%lib/libpjmedia-audiodev.so.2 lib/libpjmedia-codec-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpjmedia-codec.so %%SHARED%%lib/libpjmedia-codec.so.2 lib/libpjmedia-videodev-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpjmedia-videodev.so %%SHARED%%lib/libpjmedia-videodev.so.2 %%SHARED%%lib/libpjmedia.so %%SHARED%%lib/libpjmedia.so.2 lib/libpjnath-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpjnath.so %%SHARED%%lib/libpjnath.so.2 lib/libpjsip-%%CONFIGURE_TARGET%%.a lib/libpjsip-simple-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpjsip-simple.so %%SHARED%%lib/libpjsip-simple.so.2 lib/libpjsip-ua-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpjsip-ua.so %%SHARED%%lib/libpjsip-ua.so.2 %%SHARED%%lib/libpjsip.so %%SHARED%%lib/libpjsip.so.2 lib/libpjsua-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpjsua.so %%SHARED%%lib/libpjsua.so.2 lib/libpjsua2-%%CONFIGURE_TARGET%%.a %%SHARED%%lib/libpjsua2.so %%SHARED%%lib/libpjsua2.so.2 %%SHARED%%%%VIDEO%%lib/libyuv.so %%SHARED%%%%VIDEO%%lib/libyuv.so.2 %%VIDEO%%lib/libyuv-%%CONFIGURE_TARGET%%.a %%NO_SAMPLERATE%%%%RESAMPLE%%lib/libresample-%%CONFIGURE_TARGET%%.a %%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so %%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so.2 %%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