Date: Tue, 18 Sep 2018 18:35:36 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480060 - in head/net/freeswitch: . files Message-ID: <201809181835.w8IIZaC1087432@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Sep 18 18:35:36 2018 New Revision: 480060 URL: https://svnweb.freebsd.org/changeset/ports/480060 Log: net/freeswitch: update to 1.8.1 PR: 231292 Submitted by: corsmith@gmail.com (maintainer) Modified: head/net/freeswitch/Makefile (contents, props changed) head/net/freeswitch/distinfo (contents, props changed) head/net/freeswitch/files/extrapatch-modules.conf (contents, props changed) head/net/freeswitch/files/patch-ffmpeg4 (contents, props changed) head/net/freeswitch/pkg-plist (contents, props changed) Modified: head/net/freeswitch/Makefile ============================================================================== --- head/net/freeswitch/Makefile Tue Sep 18 18:30:27 2018 (r480059) +++ head/net/freeswitch/Makefile Tue Sep 18 18:35:36 2018 (r480060) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= freeswitch -PORTVERSION= 1.6.19 -PORTREVISION= 2 +PORTVERSION= 1.8.1 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/releases/freeswitch/ \ http://files.freeswitch.org/releases/sounds/:sounds @@ -26,7 +25,8 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libsndfile.so:audio/libsndfile \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ - libjbig.so:graphics/jbigkit + libjbig.so:graphics/jbigkit \ + libtiff.so:graphics/tiff USES= gmake iconv jpeg libedit libtool lua perl5 pkgconfig shebangfix ssl tar:xz USE_LDCONFIG= yes @@ -39,7 +39,9 @@ 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 + -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} @@ -69,7 +71,7 @@ ALL_MODULES_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa 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_video.so:graphics/opencv \ libopencv_core.so:graphics/opencv-core \ libhiredis.so:databases/hiredis \ libmemcached.so:databases/libmemcached \ @@ -134,7 +136,8 @@ post-install: .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 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/freeswitch/mod/mod_*.so \ + ${STAGEDIR}${PREFIX}/lib/libfreeswitch.so.1.0.0 (cd ${WRKSRC}/conf && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) Modified: head/net/freeswitch/distinfo ============================================================================== --- head/net/freeswitch/distinfo Tue Sep 18 18:30:27 2018 (r480059) +++ head/net/freeswitch/distinfo Tue Sep 18 18:35:36 2018 (r480060) @@ -1,6 +1,6 @@ -TIMESTAMP = 1500379394 -SHA256 (freeswitch-1.6.19.tar.xz) = e8d271a0d876ba4cca551682af0a4f5047bfd79438fcebdcc17d00711c04a8ff -SIZE (freeswitch-1.6.19.tar.xz) = 33497296 +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 Modified: head/net/freeswitch/files/extrapatch-modules.conf ============================================================================== --- head/net/freeswitch/files/extrapatch-modules.conf Tue Sep 18 18:30:27 2018 (r480059) +++ head/net/freeswitch/files/extrapatch-modules.conf Tue Sep 18 18:35:36 2018 (r480060) @@ -1,6 +1,6 @@ ---- modules.conf.orig 2017-04-17 16:23:36.000000000 +0200 -+++ modules.conf 2017-04-25 21:25:33.251657000 +0200 -@@ -1,163 +1,163 @@ +--- 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 @@ -#applications/mod_abstraction -#applications/mod_av -#applications/mod_avmd @@ -86,7 +86,9 @@ +applications/mod_stress +applications/mod_translate applications/mod_valet_parking +-#applications/mod_video_filter -#applications/mod_vmd ++applications/mod_video_filter +applications/mod_vmd applications/mod_voicemail -#applications/mod_voicemail_ivr @@ -144,8 +146,6 @@ -#endpoints/mod_rtmp +endpoints/mod_rtmp endpoints/mod_skinny --#endpoints/mod_skypopen -+endpoints/mod_skypopen endpoints/mod_sofia endpoints/mod_verto #event_handlers/mod_amqp @@ -158,8 +158,10 @@ -#event_handlers/mod_event_multicast +event_handlers/mod_event_multicast event_handlers/mod_event_socket +-#event_handlers/mod_fail2ban -#event_handlers/mod_format_cdr -#event_handlers/mod_json_cdr ++event_handlers/mod_fail2ban +event_handlers/mod_format_cdr +event_handlers/mod_json_cdr #event_handlers/mod_radius_cdr @@ -204,7 +206,9 @@ +loggers/mod_graylog2 loggers/mod_logfile loggers/mod_syslog +-#loggers/mod_raven -#say/mod_say_de ++loggers/mod_raven +say/mod_say_de say/mod_say_en -#say/mod_say_es Modified: head/net/freeswitch/files/patch-ffmpeg4 ============================================================================== --- head/net/freeswitch/files/patch-ffmpeg4 Tue Sep 18 18:30:27 2018 (r480059) +++ head/net/freeswitch/files/patch-ffmpeg4 Tue Sep 18 18:35:36 2018 (r480060) @@ -27,7 +27,7 @@ avformat.c:638:31: error: use of undeclared identifier { --- 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) +@@ -479,13 +479,13 @@ c->ticks_per_frame = 2; @@ -43,7 +43,7 @@ avformat.c:638:31: error: use of undeclared identifier av_opt_set_int(c->priv_data, "coder", 1, 0); switch (mm->vprofile) { -@@ -550,7 +550,7 @@ GCC_DIAG_ON(deprecated-declarations) +@@ -568,7 +568,7 @@ /* Some formats want stream headers to be separate. */ if (fc->oformat->flags & AVFMT_GLOBALHEADER) { @@ -51,13 +51,13 @@ avformat.c:638:31: error: use of undeclared identifier + c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; } - return SWITCH_STATUS_SUCCESS; -@@ -635,7 +635,7 @@ GCC_DIAG_ON(deprecated-declarations) + 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 = 10000; + mst->frame->nb_samples = (mst->frame->sample_rate / 50) * c->channels; } else { - mst->frame->nb_samples = c->frame_size; Modified: head/net/freeswitch/pkg-plist ============================================================================== --- head/net/freeswitch/pkg-plist Tue Sep 18 18:30:27 2018 (r480059) +++ head/net/freeswitch/pkg-plist Tue Sep 18 18:35:36 2018 (r480060) @@ -12,6 +12,8 @@ include/freeswitch/switch.h include/freeswitch/switch_am_config.h include/freeswitch/switch_apr.h include/freeswitch/switch_buffer.h +include/freeswitch/switch_cJSON.h +include/freeswitch/switch_cJSON_Utils.h include/freeswitch/switch_caller.h include/freeswitch/switch_channel.h include/freeswitch/switch_config.h @@ -37,6 +39,7 @@ include/freeswitch/switch_loadable_module.h include/freeswitch/switch_log.h include/freeswitch/switch_module_interfaces.h include/freeswitch/switch_mprintf.h +include/freeswitch/switch_msrp.h include/freeswitch/switch_nat.h include/freeswitch/switch_odbc.h include/freeswitch/switch_pgsql.h @@ -50,6 +53,7 @@ include/freeswitch/switch_stun.h include/freeswitch/switch_types.h include/freeswitch/switch_utf8.h include/freeswitch/switch_utils.h +include/freeswitch/switch_vad.h include/freeswitch/switch_vpx.h include/freeswitch/switch_xml.h include/freeswitch/switch_xml_config.h @@ -91,6 +95,7 @@ lib/freeswitch/mod/mod_esf.so %%ALL_MODULES%%lib/freeswitch/mod/mod_event_multicast.so lib/freeswitch/mod/mod_event_socket.so lib/freeswitch/mod/mod_expr.so +%%ALL_MODULES%%lib/freeswitch/mod/mod_fail2ban.so lib/freeswitch/mod/mod_fifo.so %%ALL_MODULES%%lib/freeswitch/mod/mod_format_cdr.so %%ALL_MODULES%%lib/freeswitch/mod/mod_fsk.so @@ -126,6 +131,7 @@ lib/freeswitch/mod/mod_png.so %%ALL_MODULES%%lib/freeswitch/mod/mod_portaudio_stream.so %%ALL_MODULES%%lib/freeswitch/mod/mod_posix_timer.so %%ALL_MODULES%%lib/freeswitch/mod/mod_prefix.so +%%ALL_MODULES%%lib/freeswitch/mod/mod_raven.so %%ALL_MODULES%%lib/freeswitch/mod/mod_rayo.so %%ALL_MODULES%%lib/freeswitch/mod/mod_redis.so %%ALL_MODULES%%lib/freeswitch/mod/mod_rss.so @@ -152,7 +158,6 @@ lib/freeswitch/mod/mod_say_en.so %%ALL_MODULES%%lib/freeswitch/mod/mod_shell_stream.so %%ALL_MODULES%%lib/freeswitch/mod/mod_shout.so lib/freeswitch/mod/mod_skinny.so -%%ALL_MODULES%%lib/freeswitch/mod/mod_skypopen.so lib/freeswitch/mod/mod_sms.so %%ALL_MODULES%%lib/freeswitch/mod/mod_snapshot.so lib/freeswitch/mod/mod_sndfile.so @@ -173,6 +178,7 @@ lib/freeswitch/mod/mod_tone_stream.so %%ALL_MODULES%%lib/freeswitch/mod/mod_unimrcp.so lib/freeswitch/mod/mod_valet_parking.so lib/freeswitch/mod/mod_verto.so +%%ALL_MODULES%%lib/freeswitch/mod/mod_video_filter.so %%ALL_MODULES%%lib/freeswitch/mod/mod_vlc.so %%ALL_MODULES%%lib/freeswitch/mod/mod_vmd.so lib/freeswitch/mod/mod_voicemail.so @@ -542,6 +548,7 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/softphone/freeswitch.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/acl.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/amd.conf.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/amr.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/cdr_csv.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/conference.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/testing/autoload_configs/conference_layouts.conf.xml @@ -634,6 +641,8 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/acl.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/alsa.conf.xml %%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/avmd.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/blacklist.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/callcenter.conf.xml @@ -674,6 +683,7 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/memcache.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/modules.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/mongo.conf.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/msrp.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/nibblebill.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/opal.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/opus.conf.xml @@ -706,6 +716,7 @@ libdata/pkgconfig/freeswitch.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/verto.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/voicemail.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/voicemail_ivr.conf.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/vpx.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/xml_cdr.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/xml_curl.conf.xml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vanilla/autoload_configs/xml_rpc.conf.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809181835.w8IIZaC1087432>