Index: Makefile =================================================================== --- Makefile (revision 502922) +++ Makefile (working copy) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= freeswitch -PORTVERSION= 1.8.1 -PORTREVISION= 2 +PORTVERSION= 1.8.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ \ http://files.freeswitch.org/releases/sounds/:sounds -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= corsmith@gmail.com COMMENT= Multi-protocol soft switch for telephony applications @@ -29,17 +29,26 @@ libjbig.so:graphics/jbigkit \ libtiff.so:graphics/tiff -USES= gmake iconv jpeg libedit libtool lua perl5 pkgconfig shebangfix ssl tar:xz +#Add autoreconf for mod_unimrcp +USES= autoreconf gmake iconv jpeg libedit libtool lua perl5 pkgconfig shebangfix ssl tar:xz USE_LDCONFIG= yes USE_RC_SUBR= freeswitch + SHEBANG_FILES= scripts/fsxs.in +#for mod_signalwire +#USE_GITHUB= nodefault +#GH_TUPLE= signalwire:libks:1.1.0:libks + CONFLICTS_BUILD= xmlrpc-c-* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --enable-zrtp -CFLAGS+= -Wno-error +CFLAGS+= -Wno-c11-extensions -Wno-deprecated-declarations \ + -Wno-zero-length-array -Wno-incompatible-pointer-types \ + -Wno-ignored-optimization-argument -Wno-unknown-warning-option \ + -Wno-unused-function -Wno-enum-conversion -Wno-reserved-user-defined-literal USERS= ${PORTNAME} GROUPS= ${USERS} @@ -46,23 +55,29 @@ SUB_FILES= pkg-message -OPTIONS_DEFINE= ALL_MODULES X11 EXAMPLES -OPTIONS_DEFAULT= 8K 16K ENGLISH +OPTIONS_DEFINE= ALL_MODULES X11 EXAMPLES POSTGRESQL +OPTIONS_DEFAULT= 8K 16K ENGLISH POSTGRESQL OPTIONS_MULTI= BITRATE LANGUAGE OPTIONS_MULTI_BITRATE= 8K 16K 32K 48K -OPTIONS_MULTI_LANGUAGE= ENGLISH FRENCH RUSSIAN +OPTIONS_MULTI_LANGUAGE= ENGLISH ENGLISH_CA FRENCH_CA RUSSIAN BRAZILIAN SWEDISH CHINESE_SIM CHINESE_HK OPTIONS_SUB= yes NO_OPTIONS_SORT= yes ALL_MODULES_DESC= Build all modules -X11_DESC= graphics/ImageMagick[-nox11] dependency -8K_DESC= 8kHz Audio Files -16K_DESC= 16kHz Audio Files -32K_DESC= 32kHz Audio Files -48K_DESC= 48kHz Audio Files -ENGLISH_DESC= US English Language Sounds -FRENCH_DESC= French Canadian Language Sounds -RUSSIAN_DESC= Russian Language Sounds +X11_DESC= graphics/ImageMagick[-nox11] dependency +8K_DESC= 8kHz Audio Files +16K_DESC= 16kHz Audio Files +32K_DESC= 32kHz Audio Files +48K_DESC= 48kHz Audio Files +ENGLISH_DESC= US English Language Sounds +ENGLISH_CA_DESC= Canadian English Language Sounds +FRENCH_CA_DESC= French Canadian Language Sounds +RUSSIAN_DESC= Russian Language Sounds +BRAZILIAN_DESC= Brazilian Portuguese Language Sounds +SWEDISH_DESC= Swedish Language Sounds +CHINESE_SIM_DESC= Chinese Simplified Language Sounds +CHINESE_HK_DESC= Chinese Traditional Hong Kong +POSTGRESQL_DESC= Compile with --enable-core-pgsql-support ALL_MODULES_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa \ ${LOCALBASE}/bin/aclocal:devel/automake @@ -106,8 +121,16 @@ .endif .endif -EDPRE= freeswitch-sounds -EDPOST= 1.0.51.tar.gz +.if ${PORT_OPTIONS:MPOSTGRESQL} +USES+= pgsql +CONFIGURE_ARGS+= --enable-core-pgsql-support +LIB_DEPENDS+= libpq.so:databases/postgresql10-server +.endif + +EDPRE= freeswitch-sounds +EDPOST= 1.0.51.tar.gz +#Swedish lang sounds are older/lower version. +EDPOSTOLD= 1.0.50.tar.gz EDPOST_MUSIC= 1.0.52.tar.gz .for rate in ${BITRATES} @@ -115,12 +138,27 @@ .if ${PORT_OPTIONS:MENGLISH} EXTRADISTFILES+= ${EDPRE}-en-us-callie-${rate}-${EDPOST} .endif -.if ${PORT_OPTIONS:MFRENCH} +.if ${PORT_OPTIONS:MENGLISH_CA} +EXTRADISTFILES+= ${EDPRE}-en-ca-june-${rate}-${EDPOST} +.endif +.if ${PORT_OPTIONS:MFRENCH_CA} EXTRADISTFILES+= ${EDPRE}-fr-ca-june-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MRUSSIAN} EXTRADISTFILES+= ${EDPRE}-ru-RU-elena-${rate}-${EDPOST} .endif +.if ${PORT_OPTIONS:MBRAZILIAN} +EXTRADISTFILES+= ${EDPRE}-pt-BR-karina-${rate}-${EDPOST} +.endif +.if ${PORT_OPTIONS:MSWEDISH} +EXTRADISTFILES+= ${EDPRE}-sv-se-jakob-${rate}-${EDPOSTOLD} +.endif +.if ${PORT_OPTIONS:MCHINESE_SIM} +EXTRADISTFILES+= ${EDPRE}-zh-cn-sinmei-${rate}-${EDPOST} +.endif +.if ${PORT_OPTIONS:MCHINESE_HK} +EXTRADISTFILES+= ${EDPRE}-zh-hk-sinmei-${rate}-${EDPOST} +.endif .endfor .for distfile in ${EXTRADISTFILES} @@ -127,16 +165,20 @@ DISTFILES+= ${distfile}:sounds .endfor +#mod_signalwire need libks +post-patch: + @${REINPLACE_CMD} -e 's|^applications\/mod_signalwire|#applications\/mod_signalwire|g' ${WRKSRC}/modules.conf + post-install: - ${MKDIR} ${STAGEDIR}${DATADIR}/sounds + ${MKDIR} ${STAGEDIR}${DATADIR}/sounds .for distfile in ${EXTRADISTFILES} - ${TAR} --cd ${STAGEDIR}${DATADIR}/sounds -xf ${DISTDIR}/${distfile} + ${TAR} --cd ${STAGEDIR}${DATADIR}/sounds -xf ${DISTDIR}/${distfile} .endfor - ${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} - ${RM} -r ${STAGEDIR}${ETCDIR} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freeswitch/mod/mod_*.so \ - ${STAGEDIR}${PREFIX}/lib/libfreeswitch.so.1.0.0 - (cd ${WRKSRC}/conf && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + ${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} + ${RM} -r ${STAGEDIR}${ETCDIR} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freeswitch/mod/mod_*.so \ + ${STAGEDIR}${PREFIX}/lib/libfreeswitch.so.1.0.0 + (cd ${WRKSRC}/conf && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include Index: distinfo =================================================================== --- distinfo (revision 502922) +++ distinfo (working copy) @@ -1,35 +1,77 @@ -TIMESTAMP = 1536503355 -SHA256 (freeswitch-1.8.1.tar.xz) = f606de858e2df09a752f890e8f0fc41dae8dd888e3fe952e17a90e9ff9ed270e -SIZE (freeswitch-1.8.1.tar.xz) = 28449552 -SHA256 (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 2491dcb92a69c629b03ea070d2483908a52e2c530dd77791f49a45a4d70aaa07 -SIZE (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 14620675 -SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8 -SIZE (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = 18657031 -SHA256 (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c -SIZE (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = 13460178 -SHA256 (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66 -SIZE (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = 12678200 +TIMESTAMP = 1552339873 +SHA256 (freeswitch-1.8.5.tar.xz) = 503a551be5d6df06162ea9d98a952b6fb524852ce2352fe3ca3a36a76995b046 +SIZE (freeswitch-1.8.5.tar.xz) = 28816680 SHA256 (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 93e0bf31797f4847dc19a94605c039ad4f0763616b6d819f5bddbfb6dd09718a SIZE (freeswitch-sounds-music-16000-1.0.52.tar.gz) = 27991592 SHA256 (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2 SIZE (freeswitch-sounds-en-us-callie-16000-1.0.51.tar.gz) = 37171776 +SHA256 (freeswitch-sounds-en-ca-june-16000-1.0.51.tar.gz) = 8d0091a2c98e5e06afea6bdd9f6cf2942e937786016037207b85757218b0f7a7 +SIZE (freeswitch-sounds-en-ca-june-16000-1.0.51.tar.gz) = 9417564 SHA256 (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = f942980ad359951ef3f69a324a3299ef86cdb4f8d2c62adaf73a1b95fb39fcc6 SIZE (freeswitch-sounds-fr-ca-june-16000-1.0.51.tar.gz) = 26591167 SHA256 (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = e5a354cd10401208291f1d0e668a8cf8215d3cdcb93f2cbd4b83dd134425e60b SIZE (freeswitch-sounds-ru-RU-elena-16000-1.0.51.tar.gz) = 25072831 +SHA256 (freeswitch-sounds-pt-BR-karina-16000-1.0.51.tar.gz) = 80432c1027f57e464cd899ed92216936cf48a3993dc1c168b1be2545b8f97aed +SIZE (freeswitch-sounds-pt-BR-karina-16000-1.0.51.tar.gz) = 27665896 +SHA256 (freeswitch-sounds-sv-se-jakob-16000-1.0.50.tar.gz) = 52da670c651ff598815aed655644b44b891ee158f4c67d048da90056a36ddcf6 +SIZE (freeswitch-sounds-sv-se-jakob-16000-1.0.50.tar.gz) = 5391972 +SHA256 (freeswitch-sounds-zh-cn-sinmei-16000-1.0.51.tar.gz) = d849a5818ac6630d7c572d728dcd48176a6877defd8c239cb12011528e95c2cd +SIZE (freeswitch-sounds-zh-cn-sinmei-16000-1.0.51.tar.gz) = 596908 +SHA256 (freeswitch-sounds-zh-hk-sinmei-16000-1.0.51.tar.gz) = 0950e1d971b4f2ba4decd949406ccd0198fe9c686f246e175c70aafdf9783f30 +SIZE (freeswitch-sounds-zh-hk-sinmei-16000-1.0.51.tar.gz) = 553051 SHA256 (freeswitch-sounds-music-32000-1.0.52.tar.gz) = 4129788a638b77c5f85ff35abfcd69793d8aeb9d7833a75c74ec77355b2657a9 SIZE (freeswitch-sounds-music-32000-1.0.52.tar.gz) = 53007947 SHA256 (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 06fd6b8aec937556bf5303ab19a212c60daf00546d395cf269dfe324ac9c6838 SIZE (freeswitch-sounds-en-us-callie-32000-1.0.51.tar.gz) = 73012907 +SHA256 (freeswitch-sounds-en-ca-june-32000-1.0.51.tar.gz) = 8720b363995724792ff4723e1c8218ef95b27cb36208b7258f93bdda72123387 +SIZE (freeswitch-sounds-en-ca-june-32000-1.0.51.tar.gz) = 18422131 SHA256 (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 8966a0c4daf666018cca6d8ba0f7708e251bed952b015d0ca6a0792341fe531b SIZE (freeswitch-sounds-fr-ca-june-32000-1.0.51.tar.gz) = 52040064 SHA256 (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = a2b43f20246f376d55dd73d269eb238cbeb6a961a40716d2f79a5835344aabfc SIZE (freeswitch-sounds-ru-RU-elena-32000-1.0.51.tar.gz) = 49276482 +SHA256 (freeswitch-sounds-pt-BR-karina-32000-1.0.51.tar.gz) = e80a8653585cf9a4fe9cf1c0004279602542d15894ba13f2104d990cefdee567 +SIZE (freeswitch-sounds-pt-BR-karina-32000-1.0.51.tar.gz) = 53420983 +SHA256 (freeswitch-sounds-sv-se-jakob-32000-1.0.50.tar.gz) = 160de01069afa827c830595e521b53d95de4b415b48061fb843a1c4025fa17f2 +SIZE (freeswitch-sounds-sv-se-jakob-32000-1.0.50.tar.gz) = 10018608 +SHA256 (freeswitch-sounds-zh-cn-sinmei-32000-1.0.51.tar.gz) = 903fda016d2ac053ffe6bc2d4eaf816a66c8043ddc3383d48b7b14335d9ea98e +SIZE (freeswitch-sounds-zh-cn-sinmei-32000-1.0.51.tar.gz) = 1153330 +SHA256 (freeswitch-sounds-zh-hk-sinmei-32000-1.0.51.tar.gz) = 97d846ab06b5c84d2c46bec64560556acbfc88eb2080bd325b2c5259a5ae80d0 +SIZE (freeswitch-sounds-zh-hk-sinmei-32000-1.0.51.tar.gz) = 1061068 SHA256 (freeswitch-sounds-music-48000-1.0.52.tar.gz) = cc31cdb5b1bd653850bf6e054d963314bcf7c1706a9bf05f5a69bcbd00858d2a SIZE (freeswitch-sounds-music-48000-1.0.52.tar.gz) = 75551487 SHA256 (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = cfc50f1d9b5d43cb87a9a2c0ce136c37ee85ac3b0e5be930d8dc2c913c4495aa SIZE (freeswitch-sounds-en-us-callie-48000-1.0.51.tar.gz) = 105319388 +SHA256 (freeswitch-sounds-en-ca-june-48000-1.0.51.tar.gz) = d2fce478a95b8d9500a544a00253c81d7e9f639e21980bd689910fac87f30871 +SIZE (freeswitch-sounds-en-ca-june-48000-1.0.51.tar.gz) = 27088410 SHA256 (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = abaea558fb5485abdd01d0b1186e03cf508f96ac90492814cc7ed4475e99a1e0 SIZE (freeswitch-sounds-fr-ca-june-48000-1.0.51.tar.gz) = 76666642 SHA256 (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = ffd7d34907f6b6ac861e7898d2237ad763f242a17cd23811da28fd7745d3350d SIZE (freeswitch-sounds-ru-RU-elena-48000-1.0.51.tar.gz) = 72438142 +SHA256 (freeswitch-sounds-pt-BR-karina-48000-1.0.51.tar.gz) = 51ef9cac2dc4dd70d81c18f8e65bfd11de44207e8fac9961a68aa0d50d539870 +SIZE (freeswitch-sounds-pt-BR-karina-48000-1.0.51.tar.gz) = 78609528 +SHA256 (freeswitch-sounds-sv-se-jakob-48000-1.0.50.tar.gz) = 059889d75926b8e1f39e8d2c33f0e8f744a43c094bbe213a1caa9f26ae9a2799 +SIZE (freeswitch-sounds-sv-se-jakob-48000-1.0.50.tar.gz) = 14125474 +SHA256 (freeswitch-sounds-zh-cn-sinmei-48000-1.0.51.tar.gz) = 95b9064acec13a0a32b15ea0b44dc408094b4d9dee84b183c5d9150a77e9bb23 +SIZE (freeswitch-sounds-zh-cn-sinmei-48000-1.0.51.tar.gz) = 1680437 +SHA256 (freeswitch-sounds-zh-hk-sinmei-48000-1.0.51.tar.gz) = bd605be7e536e11f8f67229a95513ef3f177263587c5bca75ccae647f43962a1 +SIZE (freeswitch-sounds-zh-hk-sinmei-48000-1.0.51.tar.gz) = 1552162 +SHA256 (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 2491dcb92a69c629b03ea070d2483908a52e2c530dd77791f49a45a4d70aaa07 +SIZE (freeswitch-sounds-music-8000-1.0.52.tar.gz) = 14620675 +SHA256 (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8 +SIZE (freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz) = 18657031 +SHA256 (freeswitch-sounds-en-ca-june-8000-1.0.51.tar.gz) = 9aaa9d73cfecfdab7a1fa2d63d65b922b86a405ebb9a31b09b15e58a2af9260a +SIZE (freeswitch-sounds-en-ca-june-8000-1.0.51.tar.gz) = 4754438 +SHA256 (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = eada67c61bd62ec420eb017df7524d10de286fba0c2da4800516b9f62c00e78c +SIZE (freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz) = 13460178 +SHA256 (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = d2679503eb1f4dc1716df5f8c4b5a7b721f087b17e96a02b1a92480311074c66 +SIZE (freeswitch-sounds-ru-RU-elena-8000-1.0.51.tar.gz) = 12678200 +SHA256 (freeswitch-sounds-pt-BR-karina-8000-1.0.51.tar.gz) = ba9b5d7f97675c560823a6f94804a6716dac66efe203dd1779952518c3944a77 +SIZE (freeswitch-sounds-pt-BR-karina-8000-1.0.51.tar.gz) = 14142676 +SHA256 (freeswitch-sounds-sv-se-jakob-8000-1.0.50.tar.gz) = aa81c97b2954b36d5625d556d2c6764ee79d0c925284ba5ff4c60cb479936b48 +SIZE (freeswitch-sounds-sv-se-jakob-8000-1.0.50.tar.gz) = 2800728 +SHA256 (freeswitch-sounds-zh-cn-sinmei-8000-1.0.51.tar.gz) = 764985f39313426ef4a0ea4dd848f05faaced37b91b2c9a22f17d3f77235fae3 +SIZE (freeswitch-sounds-zh-cn-sinmei-8000-1.0.51.tar.gz) = 302713 +SHA256 (freeswitch-sounds-zh-hk-sinmei-8000-1.0.51.tar.gz) = 917d08c80969bdaf30f2a63a3b69f542b143614d42c6241503ac655d13864eb0 +SIZE (freeswitch-sounds-zh-hk-sinmei-8000-1.0.51.tar.gz) = 282597 +SHA256 (signalwire-libks-1.1.0_GH0.tar.gz) = d2e6870e5c7895714b2633cd2c5b4d53f390c02690a9d9127585f32976548773 +SIZE (signalwire-libks-1.1.0_GH0.tar.gz) = 312381 Index: files/extrapatch-modules.conf =================================================================== --- files/extrapatch-modules.conf (revision 502922) +++ files/extrapatch-modules.conf (working copy) @@ -1,6 +1,6 @@ ---- modules.conf.orig 2018-09-07 17:29:48.000000000 +0000 -+++ modules.conf 2018-09-10 16:55:17.869385000 +0000 -@@ -1,165 +1,165 @@ +--- modules.conf.orig 2019-01-24 19:17:59.000000000 -0500 ++++ modules.conf 2019-03-12 14:33:07.008368805 -0400 +@@ -1,166 +1,165 @@ -#applications/mod_abstraction -#applications/mod_av -#applications/mod_avmd @@ -66,6 +66,7 @@ #applications/mod_rad_auth -#applications/mod_redis -#applications/mod_rss +-applications/mod_signalwire +applications/mod_redis +applications/mod_rss applications/mod_sms Index: files/patch-ffmpeg4 =================================================================== --- files/patch-ffmpeg4 (revision 502922) +++ files/patch-ffmpeg4 (nonexistent) @@ -1,63 +0,0 @@ -avcodec.c:194:40: error: use of undeclared identifier 'FF_INPUT_BUFFER_PADDING_SIZE' -static uint8_t ff_input_buffer_padding[FF_INPUT_BUFFER_PADDING_SIZE] = { 0 }; - ^ -avformat.c:471:14: error: use of undeclared identifier 'CODEC_FLAG_LOOP_FILTER' - c->flags|=CODEC_FLAG_LOOP_FILTER; // flags=+loop - ^ -avformat.c:477:47: error: use of undeclared identifier 'ME_HEX' - av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0); - ^ -avformat.c:553:15: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' - c->flags |= CODEC_FLAG_GLOBAL_HEADER; - ^ -avformat.c:638:31: error: use of undeclared identifier 'CODEC_CAP_VARIABLE_FRAME_SIZE' - if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { - ^ - ---- src/mod/applications/mod_av/avcodec.c.orig 2017-07-13 12:07:30 UTC -+++ src/mod/applications/mod_av/avcodec.c -@@ -191,7 +191,7 @@ typedef struct h264_codec_context_s { - int hw_encoder; - } h264_codec_context_t; - --static uint8_t ff_input_buffer_padding[FF_INPUT_BUFFER_PADDING_SIZE] = { 0 }; -+static uint8_t ff_input_buffer_padding[AV_INPUT_BUFFER_PADDING_SIZE] = { 0 }; - - static switch_status_t buffer_h264_nalu(h264_codec_context_t *context, switch_frame_t *frame) - { ---- src/mod/applications/mod_av/avformat.c.orig 2017-07-13 12:07:30 UTC -+++ src/mod/applications/mod_av/avformat.c -@@ -479,13 +479,13 @@ - c->ticks_per_frame = 2; - - -- c->flags|=CODEC_FLAG_LOOP_FILTER; // flags=+loop -+ c->flags|=AV_CODEC_FLAG_LOOP_FILTER; // flags=+loop - c->me_cmp|= 1; // cmp=+chroma, where CHROMA = 1 - c->me_range = 16; // me_range=16 - c->max_b_frames = 3; // bf=3 - - av_opt_set_int(c->priv_data, "b_strategy", 1, 0); -- av_opt_set_int(c->priv_data, "motion_est", ME_HEX, 0); -+ av_opt_set(c->priv_data, "motion_est", "hex", 0); - av_opt_set_int(c->priv_data, "coder", 1, 0); - - switch (mm->vprofile) { -@@ -568,7 +568,7 @@ - - /* Some formats want stream headers to be separate. */ - if (fc->oformat->flags & AVFMT_GLOBALHEADER) { -- c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - } - - mst->active = 1; -@@ -660,7 +660,7 @@ - mst->frame->format = AV_SAMPLE_FMT_S16; - mst->frame->channel_layout = c->channel_layout; - -- if (c->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) { -+ if (c->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) { - //mst->frame->nb_samples = 10000; - mst->frame->nb_samples = (mst->frame->sample_rate / 50) * c->channels; - } else { Property changes on: files/patch-ffmpeg4 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ 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: files/patch-src_switch__utils.c =================================================================== --- files/patch-src_switch__utils.c (nonexistent) +++ files/patch-src_switch__utils.c (working copy) @@ -0,0 +1,11 @@ +--- src/switch_utils.c.orig 2019-05-26 01:06:48 UTC ++++ src/switch_utils.c +@@ -1847,7 +1847,7 @@ SWITCH_DECLARE(switch_status_t) switch_f + goto doh; + } + +- switch_copy_string(buf, get_addr(abuf, sizeof(abuf), (struct sockaddr *) &iface_out, sizeof(struct sockaddr_storage)), len); ++ switch_copy_string(buf, get_addr(abuf, sizeof(abuf), (struct sockaddr *) &iface_out, sizeof(iface_out)), len); + if (mask) { + get_netmask((struct sockaddr_in *) &iface_out, mask); + } Property changes on: files/patch-src_switch__utils.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: pkg-plist =================================================================== --- pkg-plist (revision 502922) +++ pkg-plist (working copy) @@ -4,6 +4,11 @@ bin/fs_ivrd bin/fsxs bin/gentls_cert +bin/switch_core +bin/switch_event +bin/switch_hash +bin/switch_ivr_originate +bin/switch_utils bin/tone2wav include/freeswitch/libteletone.h include/freeswitch/libteletone_detect.h @@ -57,6 +62,8 @@ include/freeswitch/switch_vpx.h include/freeswitch/switch_xml.h include/freeswitch/switch_xml_config.h +include/freeswitch/test/switch_fct.h +include/freeswitch/test/switch_test.h include/freeswitch/tpl.h %%ALL_MODULES%%lib/freeswitch/mod/mod_abstraction.so %%ALL_MODULES%%lib/freeswitch/mod/mod_alsa.so @@ -643,6 +650,7 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amqp.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amr.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/amrwb.conf.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/av.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/avmd.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/blacklist.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/callcenter.conf.xml @@ -655,6 +663,7 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/conference.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/conference_layouts.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/console.conf.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/curl.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/db.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/dialplan_directory.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/dingaling.conf.xml