Index: head/net/freeswitch/Makefile =================================================================== --- head/net/freeswitch/Makefile (revision 468852) +++ head/net/freeswitch/Makefile (revision 468853) @@ -1,142 +1,141 @@ # Created by: Corey Smith # $FreeBSD$ PORTNAME= freeswitch PORTVERSION= 1.6.19 PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ \ http://files.freeswitch.org/releases/sounds/:sounds DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= corsmith@gmail.com COMMENT= Multi-protocol soft switch for telephony applications LICENSE= MPL11 ONLY_FOR_ARCHS= amd64 LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libcurl.so:ftp/curl \ libpcre.so:devel/pcre \ libspeexdsp.so:audio/speexdsp \ libspeex.so:audio/speex \ libldns.so:dns/ldns \ libopus.so:audio/opus \ libsndfile.so:audio/libsndfile \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libjbig.so:graphics/jbigkit USES= gmake iconv jpeg libedit libtool lua perl5 pkgconfig shebangfix ssl tar:xz USE_LDCONFIG= yes USE_RC_SUBR= freeswitch SHEBANG_FILES= scripts/fsxs.in CONFLICTS_BUILD= xmlrpc-c-* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ --enable-zrtp CFLAGS+= -Wno-c11-extensions -Wno-deprecated-declarations \ -Wno-zero-length-array -Wno-incompatible-pointer-types USERS= ${PORTNAME} GROUPS= ${USERS} SUB_FILES= pkg-message OPTIONS_DEFINE= ALL_MODULES X11 OPTIONS_DEFAULT= 8K 16K ENGLISH OPTIONS_MULTI= BITRATE LANGUAGE OPTIONS_MULTI_BITRATE= 8K 16K 32K 48K OPTIONS_MULTI_LANGUAGE= ENGLISH FRENCH RUSSIAN 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 -ALL_MODULES_BROKEN= fails to build with ffmpeg 4.0 ALL_MODULES_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa \ ${LOCALBASE}/bin/aclocal:devel/automake ALL_MODULES_CONFLICTS_BUILD= apr ALL_MODULES_EXTRA_PATCHES= ${FILESDIR}/extrapatch-modules.conf ALL_MODULES_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libopencv_gpu.so:graphics/opencv \ libopencv_core.so:graphics/opencv-core \ libhiredis.so:databases/hiredis \ libmemcached.so:databases/libmemcached \ libSoundTouch.so:audio/soundtouch \ libasound.so:audio/alsa-lib \ libportaudio.so:audio/portaudio \ libmp4v2.so:multimedia/mp4v2 \ libshout.so:audio/libshout \ libmpg123.so:audio/mpg123 \ libmp3lame.so:audio/lame \ libnetsnmp.so:net-mgmt/net-snmp \ libvlc.so:multimedia/vlc \ libyaml.so:textproc/libyaml ALL_MODULES_RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa ALL_MODULES_USE= XORG=x11 OPENLDAP=yes 8K_VARS= BITRATES+=8000 16K_VARS= BITRATES+=16000 32K_VARS= BITRATES+=32000 48K_VARS= BITRATES+=48000 # install-strip causes `make stage' to fail: # libtool: install: strip --strip-debug /wrkdirs/usr/ports/net/freeswitch/work/stage/usr/local/lib/libfreeswitch.a # strip: file format not recognized # INSTALL_TARGET= install-strip .include .if ${PORT_OPTIONS:MALL_MODULES} .if ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick .else LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick-nox11 .endif .endif EDPRE= freeswitch-sounds EDPOST= 1.0.51.tar.gz EDPOST_MUSIC= 1.0.52.tar.gz .for rate in ${BITRATES} EXTRADISTFILES+= ${EDPRE}-music-${rate}-${EDPOST_MUSIC} .if ${PORT_OPTIONS:MENGLISH} EXTRADISTFILES+= ${EDPRE}-en-us-callie-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MFRENCH} EXTRADISTFILES+= ${EDPRE}-fr-ca-june-${rate}-${EDPOST} .endif .if ${PORT_OPTIONS:MRUSSIAN} EXTRADISTFILES+= ${EDPRE}-ru-RU-elena-${rate}-${EDPOST} .endif .endfor .for distfile in ${EXTRADISTFILES} DISTFILES+= ${distfile}:sounds .endfor post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/sounds .for distfile in ${EXTRADISTFILES} ${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_png.so (cd ${WRKSRC}/conf && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include Index: head/net/freeswitch/files/patch-ffmpeg4 =================================================================== --- head/net/freeswitch/files/patch-ffmpeg4 (nonexistent) +++ head/net/freeswitch/files/patch-ffmpeg4 (revision 468853) @@ -0,0 +1,63 @@ +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 +@@ -468,13 +468,13 @@ GCC_DIAG_ON(deprecated-declarations) + 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) { +@@ -550,7 +550,7 @@ GCC_DIAG_ON(deprecated-declarations) + + /* 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; + } + + return SWITCH_STATUS_SUCCESS; +@@ -635,7 +635,7 @@ GCC_DIAG_ON(deprecated-declarations) + 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; + } else { + mst->frame->nb_samples = c->frame_size; Property changes on: head/net/freeswitch/files/patch-ffmpeg4 ___________________________________________________________________ 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