Index: head/net/asterisk13/Makefile =================================================================== --- head/net/asterisk13/Makefile (revision 415114) +++ head/net/asterisk13/Makefile (revision 415115) @@ -1,290 +1,291 @@ # $FreeBSD$ PORTNAME= asterisk PORTVERSION= 13.9.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729 MASTER_SITE_SUBDIR= asterisk/:main \ asterisk/old-releases/:main \ sounds/releases/:g729 PKGNAMESUFFIX= 13 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main 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 localbase ncurses shebangfix sqlite USE_CSTD= gnu89 USE_GNOME= libxml2 USE_LDCONFIG= yes USE_OPENSSL= yes USE_RC_SUBR= asterisk GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datarootdir=${DATADIR} \ --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 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 GCC XMPP OPTIONS_DEFAULT_amd64= DAHDI GCC 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_BUILD_DEPENDS= libpri>=1.4.10:misc/libpri \ ${LOCALBASE}/include/dahdi/user.h:misc/dahdi DAHDI_LIB_DEPENDS= libpri.so:misc/libpri \ libopenr2.so:misc/openr2 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 .if ${PORT_OPTIONS:MG729} ${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds ${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds .endif post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample .if ${PORT_OPTIONS:MSYSINFO} @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile .else @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile .endif .if exists(${FILESDIR}/.asterisk.makeopts) USER_MAKEOPTS_FILE=${FILESDIR}/.asterisk.makeopts .else USER_MAKEOPTS_FILE= .endif post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts USER_MAKEOPTS="${USER_MAKEOPTS_FILE}" @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 .if ${PORT_OPTIONS:MMYSQL} @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 .endif .if ${PORT_OPTIONS:MOOH323} @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts .endif .if ${PORT_OPTIONS:MNEWG711} @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts .endif post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua .if ! ${PORT_OPTIONS:MASTVERSION} @${RM} ${STAGEDIR}${PREFIX}/sbin/astversion .endif ${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} && \ ${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST}); .include Index: head/net/pjsip/Makefile =================================================================== --- head/net/pjsip/Makefile (revision 415114) +++ head/net/pjsip/Makefile (revision 415115) @@ -1,92 +1,95 @@ # $FreeBSD$ PORTNAME= pjsip -PORTVERSION= 2.4.5 -PORTREVISION= 1 +PORTVERSION= 2.5 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 tar:bz2 +USES= gmake localbase pathfix 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 RESAMPLE RESAMPLEDLL \ SAMPLERATE SDL SHARED SPEEX SPEEXAEC V4L IPV6 SOUND VIDEO AMR EXTSRTP 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 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) 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 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 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 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 .include Index: head/net/pjsip/distinfo =================================================================== --- head/net/pjsip/distinfo (revision 415114) +++ head/net/pjsip/distinfo (revision 415115) @@ -1,2 +1,2 @@ -SHA256 (pjproject-2.4.5.tar.bz2) = 086f5e70dcaee312b66ddc24dac6ef85e6f1fec4eed00ff2915cebe0ee3cdd8d -SIZE (pjproject-2.4.5.tar.bz2) = 4654415 +SHA256 (pjproject-2.5.tar.bz2) = 66e2ee1a81548efba21fa6c234d7fa6260dc98b3cd95af2137b851846d6501de +SIZE (pjproject-2.5.tar.bz2) = 4179560 Index: head/net/pjsip/files/patch-Makefile =================================================================== --- head/net/pjsip/files/patch-Makefile (revision 415114) +++ head/net/pjsip/files/patch-Makefile (nonexistent) @@ -1,26 +0,0 @@ ---- Makefile.orig 2014-07-14 07:21:58 UTC -+++ Makefile -@@ -124,7 +124,7 @@ install: - for d in pjlib pjlib-util pjnath pjmedia pjsip; do \ - cp -RLf $$d/include/* $(DESTDIR)$(includedir)/; \ - done -- mkdir -p $(DESTDIR)$(libdir)/pkgconfig -+ mkdir -p $(DESTDIR)$(prefix)/libdata/pkgconfig - sed -e "s!@PREFIX@!$(prefix)!" libpjproject.pc.in | \ - sed -e "s!@INCLUDEDIR@!$(includedir)!" | \ - sed -e "s!@LIBDIR@!$(libdir)!" | \ -@@ -132,11 +132,11 @@ install: - sed -e "s!@PJ_LDLIBS@!!" | \ - sed -e "s!@PJ_LDXXLIBS@!$(PJ_LDXXLIBS)!" | \ - sed -e "s!@PJ_INSTALL_CFLAGS@!!" | \ -- sed -e "s!@PJ_INSTALL_CXXFLAGS@!$(PJ_INSTALL_CXXFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc -+ sed -e "s!@PJ_INSTALL_CXXFLAGS@!$(PJ_INSTALL_CXXFLAGS)!" > $(DESTDIR)/$(prefix)/libdata/pkgconfig/libpjproject.pc - - uninstall: -- $(RM) $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc -- -rmdir $(DESTDIR)$(libdir)/pkgconfig 2> /dev/null -+ $(RM) $(DESTDIR)$(prefix)/libdata/pkgconfig/libpjproject.pc -+ -rmdir $(DESTDIR)$(prefix)/libdata/pkgconfig 2> /dev/null - for d in pjlib pjlib-util pjnath pjmedia pjsip; do \ - for f in $$d/include/*; do \ - $(RM) -r "$(DESTDIR)$(includedir)/`basename $$f`"; \ Property changes on: head/net/pjsip/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/pjsip/files/patch-aconfigure =================================================================== --- head/net/pjsip/files/patch-aconfigure (revision 415114) +++ head/net/pjsip/files/patch-aconfigure (revision 415115) @@ -1,11 +1,26 @@ ---- aconfigure.orig 2014-08-19 02:18:07 UTC +--- aconfigure.orig 2016-04-12 07:46:12 UTC +++ aconfigure -@@ -6654,7 +6654,7 @@ else +@@ -6179,14 +6179,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 +@@ -6773,7 +6766,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" Property changes on: head/net/pjsip/files/patch-aconfigure ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in =================================================================== --- head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in (nonexistent) +++ head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in (revision 415115) @@ -0,0 +1,11 @@ +--- pjmedia/build/os-auto.mak.in.orig 2016-05-13 06:08:17 UTC ++++ pjmedia/build/os-auto.mak.in +@@ -209,7 +209,7 @@ endif + # Unix specific + # + ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),) +-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \ ++export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=0 \ + -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ + -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 + endif Property changes on: head/net/pjsip/files/patch-pjmedia_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/pkg-plist =================================================================== --- head/net/pjsip/pkg-plist (revision 415114) +++ head/net/pjsip/pkg-plist (revision 415115) @@ -1,348 +1,351 @@ 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/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 %%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 libdata/pkgconfig/libpjproject.pc