diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile index cca1f6baf8f2..30f8f07fdd83 100644 --- a/audio/baresip/Makefile +++ b/audio/baresip/Makefile @@ -1,131 +1,131 @@ PORTNAME= baresip PORTVERSION= 0.5.8 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio MASTER_SITES= http://www.creytiv.com/pub/ MAINTAINER= crees@FreeBSD.org COMMENT= Small SIP client LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/docs/COPYING BUILD_DEPENDS= re>=0.5.8:audio/re \ rem>=0.5.3:audio/rem RUN_DEPENDS:= ${BUILD_DEPENDS} USES= gmake pkgconfig ssl CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc MAKE_ARGS= MOD_AUTODETECT="" PLIST_FILES= bin/baresip PORTDATA= * PORTDOCS= * PORTEXAMPLES= * #OPTIONS_NOT_YET_WORKING= ALSA BV32 G722_1 PLC ISAC OPENGLES OPTIONS_DEFINE= CONS DOCS EXAMPLES FFMPEG G711 G722 G726 GSM GSTREAMER ILBC \ L16 OPUS OSS PORTAUDIO PULSEAUDIO SDL SNDFILE SPEEX STDIO UUID V4L V4L2 X11 \ DTLS_SRTP AUBRIDGE VIDBRIDGE HTTPD DSHOW DIRECTFB ACCOUNT \ NATPMP SDL MIW SNAPSHOT SELFVIEW VUMETER AULOOP CONTACT \ MENU PRESENCE SYSLOG VIDLOOP OPTIONS_DEFAULT=CONS G711 G722 G726 L16 OSS STDIO AULOOP_DESC= Audio-loop test module BV32_DESC= BroadVoice32 Wideband Audio codec CONTACT_DESC= Contacts module CONS_DESC= Console input driver DTLS_SRTP_DESC= DTLS Secure RTP module [broken] G711_DESC= G.711 audio codec G722_DESC= G.722 audio codec G722_1_DESC= G.722.1 audio codec G726_DESC= G.726 audio codec ILBC_DESC= iLBC audio codec L16_DESC= L16 audio codec MENU_DESC= Interactive menu OPENGLES_DESC= OpenGL ES video output PLC_DESC= Packet Loss Concealment PRESENCE_DESC= Presence module STDIO_DESC= stdio input driver SYSLOG_DESC= Syslog module UUID_DESC= UUID module V4L_DESC= Video4Linux module [broken] V4L2_DESC= Video4Linux2 module [broken] VIDLOOP_DESC= Video-loop test module X11_DESC= X11 module [broken] .for o in ${OPTIONS_DEFINE} . ifndef $o_DESC $o_DESC= ${o:C,^(.).*,\1,}${o:C,^.,,:tl} module . endif .endfor .include .include "${.CURDIR}/Makefile.depends" # Port calls it GST, standard OPTION is GSTREAMER .if ${PORT_OPTIONS:MGSTREAMER} PORT_OPTIONS+= GST .endif # Port calls it PULSE, standard OPTION is PULSEAUDIO .if ${PORT_OPTIONS:MPULSEAUDIO} PORT_OPTIONS+= PULSE .endif .if ${PORT_OPTIONS:MSDL} USES+= sdl USE_SDL= sdl sound .endif # SPEEX forces install of speex, therefore may as well enable all methods .if ${PORT_OPTIONS:MSPEEX} . for s in SPEEX_AEC SPEEX_PP SPEEX_RESAMP MAKE_ARGS+= USE_$s=yes . endfor MAKE_ARGS+= HAVE_SPEEXDSP=yes .endif .for o in V4L DTLS_SRTP V4L2 X11 . if ${PORT_OPTIONS:M$o} BROKEN= OPTIONS marked as BROKEN have not been updated to the new Baresip API . endif .endfor .if ${PORT_OPTIONS:MX11} USES+= xorg USE_XORG= x11 .endif .for o in ${PORT_OPTIONS} MAKE_ARGS+= USE_$o=yes BUILD_DEPENDS+= ${$o_DEPEND} RUN_DEPENDS+= ${$o_DEPEND} .endfor # GNU Make does not do make -V, which makes life difficult post-patch: ${ECHO_CMD} >> ${WRKSRC}/Makefile ${ECHO_CMD} ".PHONY: showmodules" >> ${WRKSRC}/Makefile ${ECHO_CMD} "showmodules:" >> ${WRKSRC}/Makefile ${ECHO_CMD} ' @${ECHO_CMD} $$(MODULES)' >> ${WRKSRC}/Makefile ${REINPLACE_CMD} 's,-lportaudio[0-9]*,-L${LOCALBASE}/lib -lportaudio,' \ ${WRKSRC}/modules/portaudio/module.mk do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/share/* ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules for m in $$(${SETENV} ${MAKE_ENV} ${MAKE_CMD} -sC ${WRKSRC} ${MAKE_ARGS} showmodules); \ do ${INSTALL_LIB} ${WRKSRC}/$$m.so \ ${STAGEDIR}${PREFIX}/lib/baresip/modules; \ ${ECHO_CMD} lib/${PORTNAME}/modules/$$m.so >> ${TMPPLIST}; \ done ${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) ${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR} ${RMDIR} ${STAGEDIR}${DOCSDIR}/examples .include diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile index fea700f1eaa2..84d75333f3fe 100644 --- a/comms/spandsp/Makefile +++ b/comms/spandsp/Makefile @@ -1,20 +1,28 @@ # Created by: wlloyd@slap.net PORTNAME= spandsp -PORTVERSION= 0.0.6 +DISTVERSION= ${SPANDSP_VERSION}.g20211014 CATEGORIES= comms -MASTER_SITES= http://www.soft-switch.org/downloads/spandsp/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jailbird@fdf.net COMMENT= DSP library and software FAX machine LICENSE= LGPL21 LIB_DEPENDS= libtiff.so:graphics/tiff +USES= autoreconf gmake jpeg libtool localbase + +USE_GITHUB= yes +GH_ACCOUNT= freeswitch +GH_TAGNAME= ${GITHUB_COMMIT} +GITHUB_COMMIT= 284fe91 + +USE_LDCONFIG= yes + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= autoreconf gmake libtool localbase -USE_LDCONFIG= yes + +SPANDSP_VERSION= 3.0.0 .include diff --git a/comms/spandsp/distinfo b/comms/spandsp/distinfo index b486ff476e6a..3c66f956f62e 100644 --- a/comms/spandsp/distinfo +++ b/comms/spandsp/distinfo @@ -1,2 +1,3 @@ -SHA256 (spandsp-0.0.6.tar.gz) = cc053ac67e8ac4bb992f258fd94f275a7872df959f6a87763965feabfdcc9465 -SIZE (spandsp-0.0.6.tar.gz) = 3309837 +TIMESTAMP = 1634216290 +SHA256 (freeswitch-spandsp-3.0.0.g20211014-284fe91_GH0.tar.gz) = 288b12eb058d615c526e85fe0fe339293e5713b3513e7918043e93e52e4efd49 +SIZE (freeswitch-spandsp-3.0.0.g20211014-284fe91_GH0.tar.gz) = 3584374 diff --git a/comms/spandsp/files/patch-Makefile.am b/comms/spandsp/files/patch-Makefile.am index ce87f18afc76..6b2648aa852f 100644 --- a/comms/spandsp/files/patch-Makefile.am +++ b/comms/spandsp/files/patch-Makefile.am @@ -1,11 +1,11 @@ ---- Makefile.am.orig 2014-09-03 14:15:04.000000000 +0300 -+++ Makefile.am 2014-09-03 14:15:16.000000000 +0300 -@@ -61,7 +61,7 @@ SUBDIRS = src $(MAYBE_DOC) $(MAYBE_TESTD +--- Makefile.am.orig 2021-08-14 20:26:24 UTC ++++ Makefile.am +@@ -60,7 +60,7 @@ SUBDIRS = src $(MAYBE_DOC) $(MAYBE_TESTS) DIST_SUBDIRS = src doc test-data spandsp-sim tests -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(libdir)data/pkgconfig pkgconfig_DATA = spandsp.pc faq: faq.xml diff --git a/comms/spandsp/files/patch-configure.ac b/comms/spandsp/files/patch-configure.ac deleted file mode 100644 index 6863077083ad..000000000000 --- a/comms/spandsp/files/patch-configure.ac +++ /dev/null @@ -1,37 +0,0 @@ ---- configure.ac.orig 2014-11-11 15:56:10.000000000 +0100 -+++ configure.ac 2014-11-11 15:58:13.000000000 +0100 -@@ -198,7 +198,6 @@ AC_CHECK_HEADERS([stdlib.h]) - AC_CHECK_HEADERS([string.h]) - AC_CHECK_HEADERS([strings.h]) - AC_CHECK_HEADERS([malloc.h]) --AC_CHECK_HEADERS([tgmath.h], [INSERT_TGMATH_HEADER="#include "]) - AC_CHECK_HEADERS([math.h], [INSERT_MATH_HEADER="#include "]) - AC_CHECK_HEADERS([float.h]) - AC_CHECK_HEADERS([fcntl.h]) -@@ -331,7 +330,7 @@ AX_CHECK_EXPORT_CAPABILITY([$host], - - case "${ax_cv_c_compiler_vendor}" in - gnu) -- COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" -+ COMP_VENDOR_CFLAGS="-std=gnu99 -ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" - if test "$enable_avx" = "yes" ; then - COMP_VENDOR_CFLAGS="-mavx $COMP_VENDOR_CFLAGS" - fi -@@ -392,7 +391,7 @@ sun) - REMOVE_FROM_VAR(CFLAGS, -Xc) - ;; - intel) -- COMP_VENDOR_CFLAGS="-std=c99 -D_POSIX_C_SOURCE=2 -D_GNU_SOURCE=1 -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" -+ COMP_VENDOR_CFLAGS="-std=c99 -D_POSIX_C_SOURCE=2 -D_GNU_SOURCE=1 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" - if test "$enable_avx" = "yes" ; then - COMP_VENDOR_CFLAGS="-mavx $COMP_VENDOR_CFLAGS" - fi -@@ -426,7 +425,7 @@ intel) - COMP_VENDOR_LDFLAGS= - ;; - *) -- COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wunused-but-set-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" -+ COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes $COMP_VENDOR_CFLAGS" - COMP_VENDOR_LDFLAGS= - ;; - esac diff --git a/comms/spandsp/pkg-plist b/comms/spandsp/pkg-plist index 26cc7a306f4e..f983fa3af474 100644 --- a/comms/spandsp/pkg-plist +++ b/comms/spandsp/pkg-plist @@ -1,152 +1,166 @@ include/spandsp.h include/spandsp/adsi.h +include/spandsp/alloc.h include/spandsp/arctan2.h include/spandsp/async.h include/spandsp/at_interpreter.h include/spandsp/awgn.h include/spandsp/bell_r2_mf.h include/spandsp/bert.h include/spandsp/biquad.h include/spandsp/bit_operations.h include/spandsp/bitstream.h include/spandsp/complex.h include/spandsp/complex_filters.h include/spandsp/complex_vector_float.h include/spandsp/crc.h include/spandsp/dc_restore.h +include/spandsp/data_modems.h include/spandsp/dds.h include/spandsp/dtmf.h include/spandsp/echo.h include/spandsp/fax.h include/spandsp/fir.h include/spandsp/fsk.h include/spandsp/g168models.h include/spandsp/g711.h include/spandsp/g722.h include/spandsp/g726.h include/spandsp/gsm0610.h include/spandsp/hdlc.h include/spandsp/ima_adpcm.h include/spandsp/logging.h include/spandsp/lpc10.h include/spandsp/modem_connect_tones.h include/spandsp/modem_echo.h include/spandsp/noise.h include/spandsp/oki_adpcm.h include/spandsp/playout.h include/spandsp/plc.h include/spandsp/power_meter.h include/spandsp/queue.h include/spandsp/schedule.h include/spandsp/sig_tone.h include/spandsp/silence_gen.h include/spandsp/super_tone_rx.h include/spandsp/super_tone_tx.h include/spandsp/t30_api.h include/spandsp/t30_logging.h include/spandsp/t30.h include/spandsp/t30_fcf.h include/spandsp/t31.h include/spandsp/t35.h include/spandsp/t38_core.h include/spandsp/t38_gateway.h include/spandsp/t38_terminal.h include/spandsp/telephony.h include/spandsp/time_scale.h include/spandsp/timing.h include/spandsp/tone_detect.h include/spandsp/tone_generate.h include/spandsp/v17rx.h include/spandsp/v17tx.h include/spandsp/v22bis.h include/spandsp/v27ter_rx.h include/spandsp/v27ter_tx.h include/spandsp/v29rx.h include/spandsp/v29tx.h include/spandsp/v42.h include/spandsp/v42bis.h include/spandsp/v8.h include/spandsp/vector_float.h include/spandsp/vector_int.h include/spandsp/version.h include/spandsp/ademco_contactid.h include/spandsp/complex_vector_int.h include/spandsp/expose.h include/spandsp/fast_convert.h include/spandsp/fax_modems.h include/spandsp/image_translate.h include/spandsp/math_fixed.h include/spandsp/private/ademco_contactid.h include/spandsp/private/adsi.h include/spandsp/private/async.h include/spandsp/private/at_interpreter.h include/spandsp/private/awgn.h include/spandsp/private/bell_r2_mf.h include/spandsp/private/bert.h include/spandsp/private/bitstream.h +include/spandsp/private/data_modems.h include/spandsp/private/dtmf.h include/spandsp/private/echo.h include/spandsp/private/fax.h include/spandsp/private/fax_modems.h include/spandsp/private/fsk.h include/spandsp/private/g711.h include/spandsp/private/g722.h include/spandsp/private/g726.h include/spandsp/private/gsm0610.h include/spandsp/private/hdlc.h include/spandsp/private/ima_adpcm.h include/spandsp/private/image_translate.h include/spandsp/private/logging.h include/spandsp/private/lpc10.h include/spandsp/private/modem_connect_tones.h include/spandsp/private/modem_echo.h include/spandsp/private/noise.h include/spandsp/private/oki_adpcm.h +include/spandsp/private/playout.h +include/spandsp/private/plc.h +include/spandsp/private/power_meter.h include/spandsp/private/queue.h include/spandsp/private/schedule.h include/spandsp/private/sig_tone.h include/spandsp/private/silence_gen.h include/spandsp/private/super_tone_rx.h include/spandsp/private/super_tone_tx.h include/spandsp/private/swept_tone.h include/spandsp/private/t30.h include/spandsp/private/t30_dis_dtc_dcs_bits.h include/spandsp/private/t31.h include/spandsp/private/t38_core.h include/spandsp/private/t38_gateway.h include/spandsp/private/t38_non_ecm_buffer.h include/spandsp/private/t38_terminal.h include/spandsp/private/t4_rx.h include/spandsp/private/t4_t6_decode.h include/spandsp/private/t4_t6_encode.h include/spandsp/private/t4_tx.h +include/spandsp/private/t42.h +include/spandsp/private/t43.h +include/spandsp/private/t81_t82_arith_coding.h +include/spandsp/private/t85.h include/spandsp/private/time_scale.h include/spandsp/private/timezone.h include/spandsp/private/tone_detect.h include/spandsp/private/tone_generate.h include/spandsp/private/v17rx.h include/spandsp/private/v17tx.h include/spandsp/private/v18.h include/spandsp/private/v22bis.h include/spandsp/private/v27ter_rx.h include/spandsp/private/v27ter_tx.h include/spandsp/private/v29rx.h include/spandsp/private/v29tx.h include/spandsp/private/v42.h include/spandsp/private/v42bis.h include/spandsp/private/v8.h include/spandsp/saturated.h include/spandsp/stdbool.h include/spandsp/swept_tone.h include/spandsp/t38_non_ecm_buffer.h include/spandsp/t4_rx.h include/spandsp/t4_t6_decode.h include/spandsp/t4_t6_encode.h include/spandsp/t4_tx.h +include/spandsp/t42.h +include/spandsp/t43.h +include/spandsp/t81_t82_arith_coding.h +include/spandsp/t85.h include/spandsp/timezone.h include/spandsp/v18.h lib/libspandsp.a lib/libspandsp.so -lib/libspandsp.so.2 -lib/libspandsp.so.2.0.0 +lib/libspandsp.so.3 +lib/libspandsp.so.3.0.0 libdata/pkgconfig/spandsp.pc diff --git a/misc/libsupertone/Makefile b/misc/libsupertone/Makefile index 50f0470f0355..6fa204d32581 100644 --- a/misc/libsupertone/Makefile +++ b/misc/libsupertone/Makefile @@ -1,31 +1,31 @@ # Created by: Max Khon PORTNAME= libsupertone PORTVERSION= 0.0.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc MASTER_SITES= http://www.soft-switch.org/downloads/unicall/ MAINTAINER= fjoe@FreeBSD.org COMMENT= Library for supervisory tone generation and detection LICENSE= LGPL21 LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \ libspandsp.so:comms/spandsp \ libtiff.so:graphics/tiff \ libxml2.so:textproc/libxml2 USES= tar:tgz libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib # Add missing dependency in attempt to fix parallel (-jX) builds post-patch: @${REINPLACE_CMD} -e '/DEPENDENCIES =/s,$$, $$(lib_LTLIBRARIES),' \ ${WRKSRC}/Makefile.in .include diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index e6cd9b6db497..2c26caf0037e 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -1,298 +1,299 @@ PORTNAME= asterisk PORTVERSION= 16.22.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ asterisk/old-releases/ \ sounds/releases/:g729 PKGNAMESUFFIX= 16 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} 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 USES= bison compiler:c11 cpe gmake gnome iconv libedit localbase \ shebangfix sqlite ssl ncurses USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= asterisk USE_GITHUB= nodefault EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} PJSIP_VERSION= 2.10 GNU_CONFIGURE= yes CONFIGURE_ARGS= --datarootdir=${DATADIR} \ --with-ilbc=internal \ --with-crypto=${OPENSSLBASE} \ --with-ssl=${OPENSSLBASE} \ --with-externals-cache=${DISTDIR}/${DIST_SUBDIR} CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi \ contrib/scripts/astversion LDFLAGS+= -L. 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 CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk13 asterisk18 OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \ MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \ SPANDSP SRTP SYSINFO URIPARSER XMLDOC XMPP OPTIONS_DEFAULT= CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL \ PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP URIPARSER \ VORBIS XMLDOC OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI OPTIONS_DEFAULT_i386= DAHDI XMPP OPTIONS_DEFAULT_amd64= DAHDI XMPP OPTIONS_DEFAULT_sparc64= DAHDI XMPP OPTIONS_DEFAULT_powerpc= XMPP OPTIONS_GROUP= CODECS OPTIONS_GROUP_CODECS= GSM NEWG711 OPUS SPEEX VORBIS CODECS_DESC= Encoder/Decoder (Codec) Support OPTIONS_GROUP+= DATABASE OPTIONS_GROUP_DATABASE= MYSQL ODBC PGSQL DATABASE_DESC= Database Support OPTIONS_MULTI= MENU OPTIONS_MULTI_MENU= NCURSES NEWT MENU_DESC= Menuselect Interface Backend NEWT_DESC= Newt User Interface 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 DAHDI_DESC?= DAHDI support EXCHANGE_DESC?= Exchange calendar support G729_DESC?= Install G.729 format sounds for Music-on-Hold (MoH) MACRO_DESC?= Enable app_macro (deprecated) MP3PLAYER_DESC= Install MP3 Player for Music-On-Hold (mpg123) NEWG711_DESC?= New G711 Codec OOH323_DESC?= ooh323 support OPUS_DESC?= Opus Codec PJSIP_DESC?= Build the PJSIP based SIP channel SRTP_DESC?= SecureRTP support SYSINFO_DESC?= Use devel/libsysinfo to get system information URIPARSER_DESC?= Use RFC 3986 compliant uriparser library XMLDOC_DESC?= Build and install XML documentation XMPP_DESC?= XMPP/GTALK support OPTIONS_SUB= yes ASTVERSION_RUN_DEPENDS= bash:shells/bash BACKTRACE_CONFIGURE_WITH= execinfo CURL_CONFIGURE_WITH= libcurl CURL_LIB_DEPENDS= libcurl.so:ftp/curl DAHDI_CONFIGURE_WITH= dahdi 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 \ libexpat.so:textproc/expat2 EXCHANGE_USES= gettext-runtime FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:databases/freetds 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 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 OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_EXTRACT_ONLY= ${DISTFILE_opus} OPUS_GH_TUPLE= traud:asterisk-opus:83e1b458c77e0e287adeca494eeb79edb077b0ff:opus PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql PJSIP_CONFIGURE_WITH= pjproject pjproject-bundled PJSIP_USES= pkgconfig PJSIP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp PJSIP_GH_TUPLE= pjsip:pjproject:${PJSIP_VERSION}:pjsip 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 \ libpkg.so:${PKG_ORIGIN} SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so:comms/spandsp \ libtiff.so:graphics/tiff SPEEX_CONFIGURE_WITH= speex SPEEX_LIB_DEPENDS= libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp SRTP_CONFIGURE_WITH= srtp SRTP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo URIPARSER_CONFIGURE_WITH= uriparser URIPARSER_LIB_DEPENDS= liburiparser.so:net/uriparser VORBIS_CONFIGURE_WITH= ogg VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg XMLDOC_CONFIGURE_ENABLE= xmldoc 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 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}/${DIST_SUBDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds ${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds post-extract-OPUS-on: ${CP} ${WRKSRC_opus}/include/asterisk/* ${WRKSRC}/include/asterisk ${CP} ${WRKSRC_opus}/codecs/* ${WRKSRC}/codecs ${CP} ${WRKSRC_opus}/res/* ${WRKSRC}/res post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts .endif 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 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-MACRO-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable app_macro 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-configure-OPUS-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable codec_opus_open_source menuselect.makeopts post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ast[a-f]* ${STAGEDIR}${PREFIX}/lib/*.so.* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/*.so ${STAGEDIR}${DATADIR}/agi-bin/eagi-* ${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 diff --git a/net/asterisk16/files/patch-res_res__fax__spandsp.c b/net/asterisk16/files/patch-res_res__fax__spandsp.c new file mode 100644 index 000000000000..7efe45d3e616 --- /dev/null +++ b/net/asterisk16/files/patch-res_res__fax__spandsp.c @@ -0,0 +1,62 @@ +--- res/res_fax_spandsp.c.orig 2021-11-02 08:40:01 UTC ++++ res/res_fax_spandsp.c +@@ -167,8 +167,8 @@ struct spandsp_pvt { + static int spandsp_v21_new(struct spandsp_pvt *p); + static void session_destroy(struct spandsp_pvt *p); + static int t38_tx_packet_handler(t38_core_state_t *t38_core_state, void *data, const uint8_t *buf, int len, int count); +-static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code); +-static void spandsp_log(int level, const char *msg); ++static void t30_phase_e_handler(void *data, int completion_code); ++static void spandsp_log(void *user_data, int level, const char *msg); + static int update_stats(struct spandsp_pvt *p, int completion_code); + static int spandsp_modems(struct ast_fax_session_details *details); + +@@ -375,10 +375,11 @@ static int update_stats(struct spandsp_pvt *p, int com + * This function pulls stats from the spandsp stack and stores them for res_fax + * to use later. + */ +-static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code) ++static void t30_phase_e_handler(void *data, int completion_code) + { + struct ast_fax_session *s = data; + struct spandsp_pvt *p = s->tech_pvt; ++ t30_state_t *t30_state = p->t30_state; + char headerinfo[T30_MAX_PAGE_HEADER_INFO + 1]; + const char *c; + t30_stats_t stats; +@@ -430,7 +431,7 @@ static void t30_phase_e_handler(t30_state_t *t30_state + * + * \note This function is a callback function called by spandsp. + */ +-static void spandsp_log(int level, const char *msg) ++static void spandsp_log(void *user_data, int level, const char *msg) + { + if (level == SPAN_LOG_ERROR) { + ast_log(LOG_ERROR, "%s", msg); +@@ -449,7 +450,7 @@ static void set_logging(logging_state_t *state, struct + level = SPAN_LOG_DEBUG_3; + } + +- span_log_set_message_handler(state, spandsp_log); ++ span_log_set_message_handler(state, spandsp_log, NULL); + span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level); + } + +@@ -479,7 +480,7 @@ static void set_file(t30_state_t *t30_state, struct as + static void set_ecm(t30_state_t *t30_state, struct ast_fax_session_details *details) + { + t30_set_ecm_capability(t30_state, details->option.ecm); +- t30_set_supported_compressions(t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); ++ t30_set_supported_compressions(t30_state, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6); + } + + static int spandsp_v21_new(struct spandsp_pvt *p) +@@ -1256,7 +1257,7 @@ static int load_module(void) + } + + /* prevent logging to stderr */ +- span_set_message_handler(NULL); ++ span_set_message_handler(NULL, NULL); + + return AST_MODULE_LOAD_SUCCESS; + } diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index 9e8daffc76cf..066d77629b52 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/Makefile @@ -1,298 +1,299 @@ PORTNAME= asterisk PORTVERSION= 18.8.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ asterisk/old-releases/ \ sounds/releases/:g729 PKGNAMESUFFIX= 18 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} 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 USES= bison compiler:c11 cpe gmake gnome iconv libedit localbase \ shebangfix sqlite ssl ncurses USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= asterisk USE_GITHUB= nodefault EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} PJSIP_VERSION= 2.10 GNU_CONFIGURE= yes CONFIGURE_ARGS= --datarootdir=${DATADIR} \ --with-ilbc=internal \ --with-crypto=${OPENSSLBASE} \ --with-ssl=${OPENSSLBASE} \ --with-externals-cache=${DISTDIR}/${DIST_SUBDIR} CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi \ contrib/scripts/astversion LDFLAGS+= -L. 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 CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk13 asterisk16 OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \ MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \ SPANDSP SRTP SYSINFO URIPARSER XMLDOC XMPP OPTIONS_DEFAULT= CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL \ PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP URIPARSER \ VORBIS XMLDOC OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI OPTIONS_DEFAULT_i386= DAHDI XMPP OPTIONS_DEFAULT_amd64= DAHDI XMPP OPTIONS_DEFAULT_sparc64= DAHDI XMPP OPTIONS_DEFAULT_powerpc= XMPP OPTIONS_GROUP= CODECS OPTIONS_GROUP_CODECS= GSM NEWG711 OPUS SPEEX VORBIS CODECS_DESC= Encoder/Decoder (Codec) Support OPTIONS_GROUP+= DATABASE OPTIONS_GROUP_DATABASE= MYSQL ODBC PGSQL DATABASE_DESC= Database Support OPTIONS_MULTI= MENU OPTIONS_MULTI_MENU= NCURSES NEWT MENU_DESC= Menuselect Interface Backend NEWT_DESC= Newt User Interface 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 DAHDI_DESC?= DAHDI support EXCHANGE_DESC?= Exchange calendar support G729_DESC?= Install G.729 format sounds for Music-on-Hold (MoH) MACRO_DESC?= Enable app_macro (deprecated) MP3PLAYER_DESC= Install MP3 Player for Music-On-Hold (mpg123) NEWG711_DESC?= New G711 Codec OOH323_DESC?= ooh323 support OPUS_DESC?= Opus Codec PJSIP_DESC?= Build the PJSIP based SIP channel SRTP_DESC?= SecureRTP support SYSINFO_DESC?= Use devel/libsysinfo to get system information URIPARSER_DESC?= Use RFC 3986 compliant uriparser library XMLDOC_DESC?= Build and install XML documentation XMPP_DESC?= XMPP/GTALK support OPTIONS_SUB= yes ASTVERSION_RUN_DEPENDS= bash:shells/bash BACKTRACE_CONFIGURE_WITH= execinfo CURL_CONFIGURE_WITH= libcurl CURL_LIB_DEPENDS= libcurl.so:ftp/curl DAHDI_CONFIGURE_WITH= dahdi 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 \ libexpat.so:textproc/expat2 EXCHANGE_USES= gettext-runtime FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:databases/freetds 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 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 OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_EXTRACT_ONLY= ${DISTFILE_opus} OPUS_GH_TUPLE= traud:asterisk-opus:83e1b458c77e0e287adeca494eeb79edb077b0ff:opus PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql PJSIP_CONFIGURE_WITH= pjproject pjproject-bundled PJSIP_USES= pkgconfig PJSIP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp PJSIP_GH_TUPLE= pjsip:pjproject:${PJSIP_VERSION}:pjsip 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 \ libpkg.so:${PKG_ORIGIN} SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so:comms/spandsp \ libtiff.so:graphics/tiff SPEEX_CONFIGURE_WITH= speex SPEEX_LIB_DEPENDS= libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp SRTP_CONFIGURE_WITH= srtp SRTP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo URIPARSER_CONFIGURE_WITH= uriparser URIPARSER_LIB_DEPENDS= liburiparser.so:net/uriparser VORBIS_CONFIGURE_WITH= ogg VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg XMLDOC_CONFIGURE_ENABLE= xmldoc 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 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}/${DIST_SUBDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds ${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds post-extract-OPUS-on: ${CP} ${WRKSRC_opus}/include/asterisk/* ${WRKSRC}/include/asterisk ${CP} ${WRKSRC_opus}/codecs/* ${WRKSRC}/codecs ${CP} ${WRKSRC_opus}/res/* ${WRKSRC}/res post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts .endif 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 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-MACRO-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable app_macro 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-configure-OPUS-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable codec_opus_open_source menuselect.makeopts post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ast[a-f]* ${STAGEDIR}${PREFIX}/lib/*.so.* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/*.so ${STAGEDIR}${DATADIR}/agi-bin/eagi-* ${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 diff --git a/net/asterisk18/files/patch-res_res__fax__spandsp.c b/net/asterisk18/files/patch-res_res__fax__spandsp.c new file mode 100644 index 000000000000..5ad7b22a40ad --- /dev/null +++ b/net/asterisk18/files/patch-res_res__fax__spandsp.c @@ -0,0 +1,62 @@ +--- res/res_fax_spandsp.c.orig 2021-11-02 08:42:19 UTC ++++ res/res_fax_spandsp.c +@@ -167,8 +167,8 @@ struct spandsp_pvt { + static int spandsp_v21_new(struct spandsp_pvt *p); + static void session_destroy(struct spandsp_pvt *p); + static int t38_tx_packet_handler(t38_core_state_t *t38_core_state, void *data, const uint8_t *buf, int len, int count); +-static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code); +-static void spandsp_log(int level, const char *msg); ++static void t30_phase_e_handler(void *data, int completion_code); ++static void spandsp_log(void *user_data, int level, const char *msg); + static int update_stats(struct spandsp_pvt *p, int completion_code); + static int spandsp_modems(struct ast_fax_session_details *details); + +@@ -375,10 +375,11 @@ static int update_stats(struct spandsp_pvt *p, int com + * This function pulls stats from the spandsp stack and stores them for res_fax + * to use later. + */ +-static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code) ++static void t30_phase_e_handler(void *data, int completion_code) + { + struct ast_fax_session *s = data; + struct spandsp_pvt *p = s->tech_pvt; ++ t30_state_t *t30_state = p->t30_state; + char headerinfo[T30_MAX_PAGE_HEADER_INFO + 1]; + const char *c; + t30_stats_t stats; +@@ -430,7 +431,7 @@ static void t30_phase_e_handler(t30_state_t *t30_state + * + * \note This function is a callback function called by spandsp. + */ +-static void spandsp_log(int level, const char *msg) ++static void spandsp_log(void *user_data, int level, const char *msg) + { + if (level == SPAN_LOG_ERROR) { + ast_log(LOG_ERROR, "%s", msg); +@@ -449,7 +450,7 @@ static void set_logging(logging_state_t *state, struct + level = SPAN_LOG_DEBUG_3; + } + +- span_log_set_message_handler(state, spandsp_log); ++ span_log_set_message_handler(state, spandsp_log, NULL); + span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level); + } + +@@ -479,7 +480,7 @@ static void set_file(t30_state_t *t30_state, struct as + static void set_ecm(t30_state_t *t30_state, struct ast_fax_session_details *details) + { + t30_set_ecm_capability(t30_state, details->option.ecm); +- t30_set_supported_compressions(t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); ++ t30_set_supported_compressions(t30_state, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6); + } + + static int spandsp_v21_new(struct spandsp_pvt *p) +@@ -1256,7 +1257,7 @@ static int load_module(void) + } + + /* prevent logging to stderr */ +- span_set_message_handler(NULL); ++ span_set_message_handler(NULL, NULL); + + return AST_MODULE_LOAD_SUCCESS; + } diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile index 8296916b6484..98affa033a07 100644 --- a/net/mediastreamer/Makefile +++ b/net/mediastreamer/Makefile @@ -1,101 +1,101 @@ # Created by: Maxim Sobolev PORTNAME= mediastreamer PORTVERSION= 2.16.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= https://www.linphone.org/releases/sources/mediastreamer/ MAINTAINER= ports@FreeBSD.org COMMENT= Real-time audio and video streaming and processing LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \ libortp.so:net/ortp \ libspeexdsp.so:audio/speexdsp \ libsrtp2.so:net/libsrtp2 \ libbzrtp.so:security/bzrtp USES= cmake compiler python:build USE_LDCONFIG= yes CMAKE_ARGS= -DENABLE_ALSA=NO -DENABLE_BV16=NO -DENABLE_DOC=NO \ -DENABLE_JPEG=NO -DENABLE_OSS=YES -DENABLE_PULSEAUDIO=NO \ -DENABLE_STATIC=NO -DENABLE_STRICT=NO -DENABLE_TOOLS=NO \ -DENABLE_UNIT_TESTS=NO LDFLAGS+= -pthread OPTIONS_DEFINE= MATROSKA VIDEO OPTIONS_GROUP= AUDIOOPT VIDEOOPT OPTIONS_GROUP_AUDIOOPT= G726 G729 GSM OPUS SPEEX OPTIONS_GROUP_VIDEOOPT= FFMPEG GLX THEORA V4L VPX XVIDEO OPTIONS_DEFAULT= MATROSKA VIDEO \ G729 GSM OPUS SPEEX \ FFMPEG GLX THEORA V4L VPX XVIDEO OPTIONS_SUB= yes AUDIOOPT_DESC= Audio options FFMPEG_IMPLIES= VIDEO FFMPEG_CMAKE_BOOL= ENABLE_FFMPEG FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg G726_CMAKE_BOOL= ENABLE_G726 G726_DESC= G.726 codec support G726_LIB_DEPENDS= libspandsp.so:comms/spandsp G729_CMAKE_BOOL= ENABLE_G729 G729_DESC= G.729 codec support G729_LIB_DEPENDS= libbcg729.so:audio/bcg729 GLX_IMPLIES= VIDEO GLX_CMAKE_BOOL= ENABLE_GL ENABLE_GLX GLX_USES= gl GLX_USE= GL=glew GSM_CMAKE_BOOL= ENABLE_GSM GSM_LIB_DEPENDS= libgsm.so:audio/gsm MATROSKA_CMAKE_BOOL= ENABLE_MKV MATROSKA_LIB_DEPENDS= libbcmatroska2.so:multimedia/bcmatroska2 OPUS_CMAKE_BOOL= ENABLE_OPUS OPUS_LIB_DEPENDS= libopus.so:audio/opus SPEEX_CMAKE_BOOL= ENABLE_SPEEX_CODEC SPEEX_LIB_DEPENDS= libspeex.so:audio/speex THEORA_IMPLIES= VIDEO THEORA_CMAKE_BOOL= ENABLE_THEORA THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora V4L_IMPLIES= VIDEO V4L_CMAKE_BOOL= ENABLE_V4L V4L_BUILD_DEPENDS= v4l_compat>=1.0.20120501:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l VIDEOOPT_DESC= Video options VIDEO_CMAKE_BOOL= ENABLE_VIDEO VPX_IMPLIES= VIDEO VPX_CMAKE_BOOL= ENABLE_VPX VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx XVIDEO_IMPLIES= VIDEO XVIDEO_CMAKE_BOOL= ENABLE_X11 ENABLE_XV XVIDEO_USES= xorg XVIDEO_USE= XORG=xorgproto,x11,xv .include post-patch: @${REINPLACE_CMD} 's,gsm/gsm\.h,gsm.h,' \ ${WRKSRC}/cmake/FindGSM.cmake ${WRKSRC}/src/audiofilters/gsm.c .if ${CHOSEN_COMPILER_TYPE} == gcc @${REINPLACE_CMD} '/-Wno-format-truncation/d' ${WRKSRC}/CMakeLists.txt .endif .include diff --git a/net/opal/Makefile b/net/opal/Makefile index b63dc9ffce3b..7533159ed87e 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -1,276 +1,276 @@ # Created by: Roger Hardiman PORTNAME= opal PORTVERSION= 3.10.10 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= net MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= VoIP abstraction library LICENSE= MPL10 LIB_DEPENDS= libpt.so:devel/ptlib USES= compiler:c11 gmake pathfix pkgconfig tar:xz GNU_CONFIGURE= yes USE_LDCONFIG= yes CXXFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= JAVA ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO \ AEC DEBUG RUBY # MSRP = plist extra line vpd? # RTPTEXT disable == build fail, so make it default? OPTIONS_DEFAULT=GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \ RTPTEXT LID AEC DEBUG_DESC= Install debug library JAVA_DESC= Java JNI support RUBY_DESC= Ruby support ILBC_DESC= iLBC codec from ports GSM_DESC= GSM 06.10 codec from ports SPEEX_DESC= SPEEX codec from ports THEORA_DESC= Theora codec support FFMPEG_DESC= Ffmpeg codec support X264_DESC= x.264 codec support SIP_DESC= SIP protocol support H323_DESC= H.323 protocol support IAX_DESC= IAX2 protocol support H224_DESC= H.224 control protocol H281_DESC= H.281 (Far End Camera Control) protocol support FAX_DESC= Fax T.38 support MSRP_DESC= MSRP protocol SIPIM_DESC= SIP-IM protocol RTPTEXT_DESC= RFC4103 Text RTP payload support H450_DESC= H.450 H.323 subset H460_DESC= H.460 H.323 extension for NAT traversal H501_DESC= H.501 H323 mobility extensions LID_DESC= Light-Weight Identity (incl. xJack cards and voicetronix vpb) support UVIDEO_DESC= RFC4175 uncompressed video RTP payload AEC_DESC= Accoustic echo cancellation .include .ifdef OPALDIR .error OPALDIR is defined as an environment variable, or in the arguments \ to "make". Please unset it and restart the build. .endif PLIST_SUB+= VERSION=${PORTVERSION} \ PVERSION_MAJOR=${PVERSION_MAJOR} \ PVERSION_MINOR=${PVERSION_MINOR} PVERSION_MAJOR= ${PORTVERSION:C/.[0-9]+.[0-9]+$//g} PVERSION_MINOR= ${PORTVERSION:C/.[0-9]+$//g} .if ${PORT_OPTIONS:MDEBUG} ALL_TARGET= debug opt PLIST_SUB+= DEBUG="" .else ALL_TARGET= opt PLIST_SUB+= DEBUG="@comment " .endif CONFIGURE_ARGS+= --disable-celt --disable-zrtp .if ${PORT_OPTIONS:MGSM} LIB_DEPENDS+= libgsm.so:audio/gsm .else CONFIGURE_ARGS+= --enable-localgsm .endif .if ${PORT_OPTIONS:MSPEEX} LIB_DEPENDS+= libspeex.so:audio/speex .else CONFIGURE_ARGS+= --enable-localspeex .endif .if ${PORT_OPTIONS:MJAVA} CONFIGURE_ARGS+= --enable-java .else CONFIGURE_ARGS+= --disable-java .endif .if ${PORT_OPTIONS:MRUBY} CONFIGURE_ARGS+= --enable-ruby .else CONFIGURE_ARGS+= --disable-ruby .endif .if ${PORT_OPTIONS:MILBC} LIB_DEPENDS+= libilbc.so:net/ilbc .else CONFIGURE_ARGS+= --enable-localilbc .endif .if ${PORT_OPTIONS:MTHEORA} LIB_DEPENDS+= libtheora.so:multimedia/libtheora CONFIGURE_ARGS+= --enable-theora PLIST_SUB+= THEORA="" WITH_VIDEO= yes .else CONFIGURE_ARGS+= --disable-theora PLIST_SUB+= THEORA="@comment " .endif .if ${PORT_OPTIONS:MX264} && ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= libx264.so:multimedia/libx264 CONFIGURE_ARGS+= --enable-x264 PLIST_SUB+= X264="" WITH_VIDEO= yes # work around some weirdness in plugins/configure where it looses the # cflags/libs of x264 CONFIGURE_ENV+= X264_CFLAGS="`pkg-config --cflags x264`" \ X264_LIBS="`pkg-config --libs x264`" .else CONFIGURE_ARGS+= --disable-x264 PLIST_SUB+= X264="@comment " .endif .if ${PORT_OPTIONS:MFFMPEG} BUILD_DEPENDS+= ffmpeg>=2:multimedia/ffmpeg RUN_DEPENDS+= ffmpeg>=2:multimedia/ffmpeg CONFIGURE_ARGS+= --enable-libavcodec PLIST_SUB+= FFMPEG="" WITH_VIDEO= yes .else CONFIGURE_ARGS+= --disable-libavcodec PLIST_SUB+= FFMPEG="@comment " .endif WITH_VIDEO=yes .if defined(WITH_VIDEO) CONFIGURE_ARGS+= --enable-video PLIST_SUB+= VIDEO="" .else CONFIGURE_ARGS+= --disable-video PLIST_SUB+= VIDEO="@comment " .endif .if ${PORT_OPTIONS:MSIP} CONFIGURE_ARGS+= --enable-sip .else CONFIGURE_ARGS+= --disable-sip .endif .if ${PORT_OPTIONS:MH323} CONFIGURE_ARGS+= --enable-h323 .else CONFIGURE_ARGS+= --disable-h323 .endif .if ${PORT_OPTIONS:MIAX} CONFIGURE_ARGS+= --enable-iax2 .else CONFIGURE_ARGS+= --disable-iax2 .endif .if ${PORT_OPTIONS:MH224} CONFIGURE_ARGS+= --enable-h224 .else CONFIGURE_ARGS+= --disable-h224 .endif .if ${PORT_OPTIONS:MH281} CONFIGURE_ARGS+= --enable-h281 .else CONFIGURE_ARGS+= --disable-h281 .endif .if ${PORT_OPTIONS:MFAX} LIB_DEPENDS+= libspandsp.so:comms/spandsp CONFIGURE_ARGS+= --enable-spandsp --enable-fax --enable-t38 PLIST_SUB+= FAX="" .else CONFIGURE_ARGS+= --disable-fax --disable-t38 --disable-spandsp PLIST_SUB+= FAX="@comment " .endif .if ${PORT_OPTIONS:MMSRP} CONFIGURE_ARGS+= --enable-msrp ##BROKEN= Does not compile .else CONFIGURE_ARGS+= --disable-msrp .endif .if ${PORT_OPTIONS:MSIPIM} CONFIGURE_ARGS+= --enable-sipim .else CONFIGURE_ARGS+= --disable-sipim .endif .if ${PORT_OPTIONS:MRTPTEXT} CONFIGURE_ARGS+= --enable-rfc4103 .else CONFIGURE_ARGS+= --disable-rfc4103 .endif .if ${PORT_OPTIONS:MH450} CONFIGURE_ARGS+= --enable-h450 .else CONFIGURE_ARGS+= --disable-h450 .endif .if ${PORT_OPTIONS:MH460} CONFIGURE_ARGS+= --enable-h460 .else CONFIGURE_ARGS+= --disable-h460 .endif .if ${PORT_OPTIONS:MH501} CONFIGURE_ARGS+= --enable-h501 .else CONFIGURE_ARGS+= --disable-h501 .endif .if ${PORT_OPTIONS:MLID} CONFIGURE_ARGS+= --enable-lid --enable-ixj --enable-vpb PLIST_SUB+= LID="" .else CONFIGURE_ARGS+= --disable-lid --disable-ixj --disable-vpb PLIST_SUB+= LID="@comment " .endif .if ${PORT_OPTIONS:MUVIDEO} CONFIGURE_ARGS+= --enable-rfc4175 .else CONFIGURE_ARGS+= --disable-rfc4175 .endif # xxxx .if ${PORT_OPTIONS:MXXXX} CONFIGURE_ARGS+= --enable-rfc2435 .else CONFIGURE_ARGS+= --disable-rfc2435 .endif .if ${PORT_OPTIONS:MAEC} CONFIGURE_ARGS+= --enable-aec .else CONFIGURE_ARGS+= --disable-aec .endif # ?? CONFIGURE_ARGS+= --disable-debug # configure flags not used CONFIGURE_ARGS+= --disable-gsmamr \ --disable-ruby post-install: ${LN} -sf libopal.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PVERSION_MAJOR} ${LN} -sf libopal.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PVERSION_MINOR} .if ${PORT_OPTIONS:MDEBUG} ${LN} -sf libopal_d.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal_d.so.${PVERSION_MAJOR} ${LN} -sf libopal_d.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal_d.so.${PVERSION_MINOR} .endif @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/codecs/video/h264_video_pwplugin_helper @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/*/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/*/*/*.so .include diff --git a/net/opal/files/patch-plugins_fax_fax__spandsp_spandsp__fax.cpp b/net/opal/files/patch-plugins_fax_fax__spandsp_spandsp__fax.cpp new file mode 100644 index 000000000000..7e74990ce577 --- /dev/null +++ b/net/opal/files/patch-plugins_fax_fax__spandsp_spandsp__fax.cpp @@ -0,0 +1,153 @@ +--- plugins/fax/fax_spandsp/spandsp_fax.cpp.orig 2013-02-20 02:18:10 UTC ++++ plugins/fax/fax_spandsp/spandsp_fax.cpp +@@ -82,7 +82,7 @@ static PluginCodec_LogFunction LogFunction; + LogFunction(level, __FILE__, __LINE__, "FaxCodec", strm.str().c_str()); \ + } else (void)0 + +-static void SpanDSP_Message(int level, const char *text) ++static void SpanDSP_Message(void *user_data, int level, const char *text) + { + if (*text != '\0' && LogFunction != NULL) { + if (level >= SPAN_LOG_DEBUG) +@@ -117,7 +117,7 @@ static void SpanDSP_Message(int level, const char *tex + + static void InitLogging(logging_state_t * logging, const std::string & tag) + { +- span_log_set_message_handler(logging, SpanDSP_Message); ++ span_log_set_message_handler(logging, SpanDSP_Message, NULL); + + int level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_DEBUG; + +@@ -807,7 +807,7 @@ class MyStats : private t30_stats_t (public) + strm << "-1 (In progress)"; + strm << "\n" + "Bit Rate=" << stats.bit_rate << "\n" +- "Encoding=" << stats.encoding << ' ' << CompressionNames[stats.encoding&3] << "\n" ++ "Encoding=" << stats.compression << ' ' << CompressionNames[stats.compression&3] << "\n" + "Error Correction=" << stats.error_correcting_mode << "\n" + "Tx Pages=" << (stats.m_receiving ? -1 : stats.pages_tx) << "\n" + "Rx Pages=" << (stats.m_receiving ? stats.pages_rx : -1) << "\n" +@@ -839,25 +839,27 @@ class FaxTIFF : public FaxSpanDSP + char m_phase; + + protected: ++ t30_state_t * m_t30State; ++ + FaxTIFF() + : m_receiving(false) + , m_stationIdentifer("-") +- , m_supported_image_sizes(T30_SUPPORT_US_LETTER_LENGTH | +- T30_SUPPORT_US_LEGAL_LENGTH | +- T30_SUPPORT_UNLIMITED_LENGTH | +- T30_SUPPORT_A4_LENGTH | +- T30_SUPPORT_B4_LENGTH | +- T30_SUPPORT_215MM_WIDTH | +- T30_SUPPORT_255MM_WIDTH | +- T30_SUPPORT_303MM_WIDTH) +- , m_supported_resolutions(T30_SUPPORT_STANDARD_RESOLUTION | +- T30_SUPPORT_FINE_RESOLUTION | +- T30_SUPPORT_SUPERFINE_RESOLUTION | +- T30_SUPPORT_R8_RESOLUTION | +- T30_SUPPORT_R16_RESOLUTION) +- , m_supported_compressions(T30_SUPPORT_T4_1D_COMPRESSION | +- T30_SUPPORT_T4_2D_COMPRESSION | +- T30_SUPPORT_T6_COMPRESSION) ++ , m_supported_image_sizes(T4_SUPPORT_LENGTH_US_LETTER | ++ T4_SUPPORT_LENGTH_US_LEGAL | ++ T4_SUPPORT_LENGTH_UNLIMITED | ++ T4_SUPPORT_LENGTH_A4 | ++ T4_SUPPORT_LENGTH_B4 | ++ T4_SUPPORT_WIDTH_215MM | ++ T4_SUPPORT_WIDTH_255MM | ++ T4_SUPPORT_WIDTH_303MM) ++ , m_supported_resolutions(T4_RESOLUTION_R8_STANDARD | ++ T4_RESOLUTION_R8_FINE | ++ T4_RESOLUTION_R8_SUPERFINE | ++ T4_RESOLUTION_200_400 | ++ T4_RESOLUTION_400_400) ++ , m_supported_compressions(T4_COMPRESSION_T4_1D | ++ T4_COMPRESSION_T4_2D | ++ T4_COMPRESSION_T6) + , m_phase('A') + { + } +@@ -932,6 +934,7 @@ class FaxTIFF : public FaxSpanDSP + PTRACE(3, m_tag << " Set transmit TIFF file to \"" << m_tiffFileName << '"'); + } + ++ m_t30State = t30state; + t30_set_phase_b_handler(t30state, PhaseB, this); + t30_set_phase_d_handler(t30state, PhaseD, this); + t30_set_phase_e_handler(t30state, PhaseE, this); +@@ -948,7 +951,7 @@ class FaxTIFF : public FaxSpanDSP + + t30_set_supported_modems(t30state, m_supported_modems); + t30_set_supported_image_sizes(t30state, m_supported_image_sizes); +- t30_set_supported_resolutions(t30state, m_supported_resolutions); ++ t30_set_supported_bilevel_resolutions(t30state, m_supported_resolutions); + t30_set_supported_compressions(t30state, m_supported_compressions); + t30_set_ecm_capability(t30state, m_useECM); + +@@ -983,50 +986,50 @@ class FaxTIFF : public FaxSpanDSP + bool IsReceiving() const { return m_receiving; } + + +- static int PhaseB(t30_state_t * t30state, void * user_data, int result) ++ static int PhaseB(void * user_data, int result) + { + if (user_data != NULL) +- ((FaxTIFF *)user_data)->PhaseB(t30state, result); ++ ((FaxTIFF *)user_data)->PhaseB(result); + return T30_ERR_OK; + } + +- static int PhaseD(t30_state_t * t30state, void * user_data, int result) ++ static int PhaseD(void * user_data, int result) + { + if (user_data != NULL) +- ((FaxTIFF *)user_data)->PhaseD(t30state, result); ++ ((FaxTIFF *)user_data)->PhaseD(result); + return T30_ERR_OK; + } + +- static void PhaseE(t30_state_t * t30state, void * user_data, int result) ++ static void PhaseE(void * user_data, int result) + { + if (user_data != NULL) +- ((FaxTIFF *)user_data)->PhaseE(t30state, result); ++ ((FaxTIFF *)user_data)->PhaseE(result); + } + + + private: +- void PhaseB(t30_state_t * t30state, int) ++ void PhaseB(int) + { + m_phase = 'B'; + PTRACE(3, m_tag << " SpanDSP entered Phase B:\n" +- << MyStats(t30state, m_completed, m_receiving, m_phase)); ++ << MyStats(this->m_t30State, m_completed, m_receiving, m_phase)); + } + +- void PhaseD(t30_state_t * t30state, int) ++ void PhaseD(int) + { + m_phase = 'D'; + PTRACE(3, m_tag << " SpanDSP entered Phase D:\n" +- << MyStats(t30state, m_completed, m_receiving, m_phase)); ++ << MyStats(this->m_t30State, m_completed, m_receiving, m_phase)); + } + +- void PhaseE(t30_state_t * t30state, int result) ++ void PhaseE(int result) + { + if (result >= 0) + m_completed = true; // Finished, exit codec loops + + m_phase = 'E'; + PTRACE(3, m_tag << " SpanDSP entered Phase E:\n" +- << MyStats(t30state, m_completed, m_receiving, m_phase)); ++ << MyStats(this->m_t30State, m_completed, m_receiving, m_phase)); + } + }; + diff --git a/net/sems/Makefile b/net/sems/Makefile index e712b34c8947..8e04acc48f8e 100644 --- a/net/sems/Makefile +++ b/net/sems/Makefile @@ -1,64 +1,65 @@ # Created by: Nathan Whitehon PORTNAME= sems DISTVERSION= ${SEMS_VERSION}.g20200510 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= nwhitehorn@FreeBSD.org COMMENT= SIP Express Media Server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/COPYING LIB_DEPENDS= libopus.so:audio/opus \ libcodec2.so:audio/codec2 \ libevent.so:devel/libevent \ librtmp.so:multimedia/librtmp \ libilbc.so:net/ilbc \ libgsm.so:audio/gsm \ libsamplerate.so:audio/libsamplerate \ libspeex.so:audio/speex \ libspandsp.so:comms/spandsp USES= cmake compiler:c++11-lang python:3.4+,run shebangfix ssl SHEBANG_GLOB= sems-* PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write USE_GITHUB= yes GH_ACCOUNT= sems-server GH_TAGNAME= f89581a CFLAGS+= -Wno-reorder CMAKE_ARGS= -DSEMS_CFG_PREFIX=${PREFIX} -DSEMS_AUDIO_PREFIX=${PREFIX}/lib \ -DSEMS_EXEC_PREFIX=${PREFIX} -DSEMS_DOC_PREFIX=${PREFIX}/share/doc CMAKE_ON= SEMS_USE_SPANDSP SEMS_USE_LIBSAMPLERATE SEMS_USE_OPUS \ SEMS_USE_OPENSSL USE_RC_SUBR= sems USERS= sems GROUPS= sems SEMS_VERSION= 1.7.0 PLIST_SUB= SEMS_VERSION=${SEMS_VERSION} FIXUP_2TO3= sbin/sems-get-callproperties sbin/sems-list-active-calls \ sbin/sems-list-calls sbin/sems-list-finished-calls \ sbin/sems-sbc-get-activeprofile \ sbin/sems-sbc-get-regex-map-names sbin/sems-sbc-list-profiles \ sbin/sems-sbc-load-callcontrol-modules \ sbin/sems-sbc-load-profile sbin/sems-sbc-reload-profile \ sbin/sems-sbc-reload-profiles sbin/sems-sbc-set-activeprofile \ sbin/sems-sbc-set-regex-map sbin/sems-sbc-teardown-call post-install: . for p in ${FIXUP_2TO3} ${PY2TO3_CMD} ${PY2TO3_ARGS} ${STAGEDIR}${PREFIX}/${p} . endfor cd ${STAGEDIR}${ETCDIR} && ${FIND} . \ -type f -exec ${MV} {} {}.sample \; .include diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 6bbc31c07903..7afe05b110d1 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,202 +1,203 @@ # Created by: Bill Fumerola PORTNAME?= wireshark PORTVERSION= 3.4.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ http://wireshark.askapache.com/download/src/all-versions/ \ ftp://ftp.uni-kl.de/pub/wireshark/src/ \ http://prdownloads.sourceforge.net/wireshark/ \ http://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ ftp://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ http://wireshark.zing.org/download/src/ DISTNAME= ${DATADIR_NAME}-${PORTVERSION} MAINTAINER= marcus@FreeBSD.org COMMENT?= Powerful network analyzer/capture tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS_INSTALL?= wireshark-lite-[0-9]* tshark-[0-9]* tshark-lite-[0-9]* DATADIR_NAME= wireshark DATADIR= ${PREFIX}/share/${DATADIR_NAME} USES= alias cmake compiler:c++11-lang cpe gettext-runtime gnome \ libtool localbase pathfix perl5 pkgconfig python:3.4+ ssl \ tar:xz USE_PERL5= build USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes LIB_DEPENDS+= libgpg-error.so:security/libgpg-error \ libgcrypt.so:security/libgcrypt \ liblz4.so:archivers/liblz4 \ libnghttp2.so:www/libnghttp2 \ libsnappy.so:archivers/snappy \ libcares.so:dns/c-ares #CFLAGS+= -funit-at-a-time PLIST_SUB+= PORTVERSION=${PORTVERSION} .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ reordercap captype randpktdump udpdump sharkd .if defined(LITE) PKGNAMESUFFIX= -lite PLIST_SUB+= ${x:tu}="@comment $x not installed" \ ${x:tu}_LIB="@comment $x not installed " \ ${x:tu}_MAN="@comment $x not installed " CMAKE_ARGS+= -DBUILD_$x=OFF EXTRA_PATCHES= ${FILESDIR}/extra-patch-doc_CMakeLists.txt OPTIONS_EXCLUDE+= RTP SNMP LUA ANDROIDDUMP CISCODUMP SSHDUMP .else PLIST_SUB+= ${x:tu}=bin/$x \ ${x:tu}_MAN="" \ ${x:tu}_LIB="" .endif .endfor OPTIONS_DEFINE= GUI RTP SNMP MAXMIND LTO LUA DECRYPT ANDROIDDUMP SSHDUMP CISCODUMP OPUS OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI=GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT?= GUI SNMP MAXMIND GSSAPI_BASE DECRYPT GUI_DESC= Enable Qt 5 based Wireshark GUI RTP_DESC= Enable support for playing back RTP streams DECRYPT_DESC= Decryption support for SSL and IPSec ANDROIDDUMP_DESC= Build androiddump extcap tool MAXMIND_DESC= Enable MaxMindDB-based GeoIP geolocation support GSSAPI_DESC= Kerberos dissection support GSSAPI_BASE_DESC= Kerberos support via base system GSSAPI_HEIMDAL_DESC= Kerberos support via security/heimdal GSSAPI_MIT_DESC= Kerberos support via security/krb5 GSSAPI_NONE_DESC= Disable Kerberos support SSHDUMP_DESC= Build sshdump extcap tool CISCODUMP_DESC= Build ciscodump extcap tool OPUS_DESC= Build opus decoder plugin GUI_USES= qt:5 GUI_USE= qt=core,gui,multimedia,widgets,printsupport,svg,buildtools_build,linguisttools_build,qmake_build LTO_CMAKE_BOOL= ENABLE_LTO LUA_USES= lua:51-52 GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit RTP_LIB_DEPENDS= libspandsp.so:comms/spandsp RTP_CPPFLAGS= -I${LOCALBASE}/include MAXMIND_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb SNMP_LIB_DEPENDS= libsmi.so:net-mgmt/libsmi DECRYPT_LIB_DEPENDS= libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt SSHDUMP_LIB_DEPENDS= libssh.so:security/libssh CISCODUMP_LIB_DEPENDS= libssh.so:security/libssh OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CPPFLAGS= -I${LOCALBASE}/include GSSAPI_NONE_CMAKE_ON= -DENABLE_KERBEROS=OFF GSSAPI_NONE_CMAKE_OFF= -DENABLE_KERBEROS=ON GSSAPI_NONE_CONFIGURE_ENV_OFF= KRB5_CONFIG=${KRB5CONFIG} LUA_CMAKE_ON= -DENABLE_LUA=ON LUA_CMAKE_OFF= -DENABLE_LUA=OFF RTP_CMAKE_ON= -DENABLE_SPANDSP=ON RTP_CMAKE_OFF= -DENABLE_SPANDSP=OFF SNMP_CMAKE_ON= -DENABLE_SMI=ON SNMP_CMAKE_OFF= -DENABLE_SMI=OFF DECRYPT_CMAKE_ON= -DENABLE_GNUTLS=ON DECRYPT_CMAKE_OFF= -DENABLE_GNUTLS=OFF ANDROIDDUMP_CMAKE_ON=-DBUILD_androiddump=ON ANDROIDDUMP_CMAKE_OFF=-DBUILD_androiddump=OFF SSHDUMP_CMAKE_ON=-DBUILD_sshdump=ON SSHDUMP_CMAKE_OFF=-DBUILD_sshdump=OFF CISCODUMP_CMAKE_ON=-DBUILD_ciscodump=ON CISCODUMP_CMAKE_OFF=-DBUILD_ciscodump=OFF OPUS_CMAKE_ON= -DENABLE_OPUS=ON OPUS_CMAKE_OFF= -DENABLE_OPUS=OFF LUA_CPPFLAGS= -I${LUA_INCDIR} GUI_CONFIGURE_ENV= PATH="${PATH}:${QT_BINDIR}" GUI_MAKE_ENV= PATH="${PATH}:${QT_BINDIR}" OPTIONS_SUB= yes .if defined(LITE) CMAKE_ARGS+= -DBUILD_androiddump=OFF \ -DBUILD_sshdump=OFF \ -DBUILD_ciscodump=OFF \ -DENABLE_OPUS=OFF PLIST_SUB+= ANDROIDDUMP_LIB="@comment " \ ANDROIDDUMP_MAN="@comment " \ SSHDUMP_LIB="@comment " \ SSHDUMP_MAN="@comment " \ CISCODUMP_LIB="@comment " \ CISCODUMP_MAN="@comment " \ OPUS="@comment " .endif .include .if empty(PORT_OPTIONS:MMAXMIND) CMAKE_ARGS+= -DBUILD_mmdbresolve=OFF .else CMAKE_ARGS+= -DBUILD_mmdbresolve=ON .endif .if empty(PORT_OPTIONS:MGUI) CMAKE_ARGS+= -DBUILD_wireshark=OFF PLIST_SUB+= GUI="@comment " .else USES+= desktop-file-utils shared-mime-info PLIST_SUB+= GUI="" .endif .if !defined(LITE) .if ${PORT_OPTIONS:MANDROIDDUMP} PLIST_SUB+= ANDROIDDUMP_LIB="" \ ANDROIDDUMP_MAN="" .else PLIST_SUB+= ANDROIDDUMP_LIB="@comment " \ ANDROIDDUMP_MAN="@comment " .endif .if ${PORT_OPTIONS:MSSHDUMP} PLIST_SUB+= SSHDUMP_LIB="" \ SSHDUMP_MAN="" .else PLIST_SUB+= SSHDUMP_LIB="@comment " \ SSHDUMP_MAN="@comment " .endif .if ${PORT_OPTIONS:MCISCODUMP} PLIST_SUB+= CISCODUMP_LIB="" \ CISCODUMP_MAN="" .else PLIST_SUB+= CISCODUMP_LIB="@comment " \ CISCODUMP_MAN="@comment " .endif .if ${PORT_OPTIONS:MOPUS} PLIST_SUB+= OPUS="" .else PLIST_SUB+= OPUS="@comment " .endif .endif .if ${PORT_OPTIONS:MGSSAPI_BASE} && exists(${LOCALBASE}/include/krb5.h) IGNORE= cannot build with base Kerberos if krb5 port is installed. \ Use ``make config'' to choose a different option .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/share/applications|${DESKTOPDIR}|g ; \ s|/usr/share|${LOCALBASE}/share|g' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|lua$${LUA_INC_SUFFIX}|lua-${LUA_VER}|g' \ ${WRKSRC}/cmake/modules/FindLUA.cmake .include diff --git a/net/yate/Makefile b/net/yate/Makefile index 48169a364bdc..5ff7898bfd47 100644 --- a/net/yate/Makefile +++ b/net/yate/Makefile @@ -1,99 +1,100 @@ # Created by: Valery Komarov PORTNAME= yate PORTVERSION= 6.4.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://yate.null.ro/tarballs/yate6/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1 MAINTAINER= nc@FreeBSD.org COMMENT= Yet Another Telephony Engine LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le sparc64 LIB_DEPENDS= libasound.so:audio/alsa-lib \ libspeex.so:audio/speex \ libgsm.so:audio/gsm USES= autoreconf bison gmake shebangfix USE_GCC= yes SHEBANG_FILES= share/scripts/banbrutes.php \ share/scripts/leavemail.php \ share/scripts/queue_in.php \ share/scripts/queue_out.php \ share/scripts/route.php \ share/scripts/tts.sh \ share/scripts/voicemail.php USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-fdsize \ --without-libqt4 \ --with-zlib=/usr PLIST_SUB= VERSION="${PORTVERSION}" MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message USE_RC_SUBR= yate USERS= yate GROUPS= yate DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= AMRNB DOCS DAHDI H323 ILBC MYSQL PGSQL SCTP SPANDSP SQLITE OPTIONS_DEFAULT=SCTP AMRNB_DESC= Adaptive Multi-Rate Narrowband support DAHDI_DESC= Dahdi support H323_DESC= H323 software channel/protocol support ILBC_DESC= iLBC narrowband speech codec support SCTP_DESC= Stream Control Transmission Protocol support OPTIONS_SUB= yes AMRNB_CONFIGURE_WITH= amrnb=${LOCALBASE} AMRNB_LIB_DEPENDS= libamrnb.so:audio/libamrnb DAHDI_CONFIGURE_ENABLE= dahdi 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 H323_CONFIGURE_WITH= openh323=${LOCALBASE} H323_LIB_DEPENDS= libopenh323.so:net/h323plus \ libpt.so:devel/ptlib ILBC_CONFIGURE_ENABLE= ilbc ILBC_LIB_DEPENDS= libilbc.so:net/ilbc MYSQL_CONFIGURE_WITH= mysql MYSQL_USES= mysql ssl PGSQL_CONFIGURE_WITH= libpq=${LOCALBASE} PGSQL_USES= pgsql SCTP_CONFIGURE_ENABLE= sctp SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so:comms/spandsp SQLITE_CONFIGURE_WITH= sqlite SQLITE_USES= pkgconfig sqlite post-extract: @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/yate @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libyate*.so.${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/*.yate @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/radio/*.yate @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/sig/*.yate .for dir in client server jabber sip @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/${dir}/*.yate .endfor .include