diff --git a/www/janus/Makefile b/www/janus/Makefile index 4ae29ffa53db..a3ac4eb4ff04 100644 --- a/www/janus/Makefile +++ b/www/janus/Makefile @@ -1,65 +1,65 @@ PORTNAME= janus DISTVERSIONPREFIX= v -DISTVERSION= 0.11.8 +DISTVERSION= 1.0.0 PORTREVISION= 0 CATEGORIES= www MAINTAINER= vanilla@FreeBSD.org COMMENT= WebRTC gateway LICENSE= GPLv3 BUILD_DEPENDS= gengetopt>0:devel/gengetopt LIB_DEPENDS= libconfig.so:devel/libconfig \ libcurl.so:ftp/curl \ libjansson.so:devel/jansson \ libmicrohttpd.so:www/libmicrohttpd \ libnice.so:net-im/libnice \ libogg.so:audio/libogg \ libopus.so:audio/opus \ libsofia-sip-ua.so:net/sofia-sip \ libsrtp2.so:net/libsrtp2 \ libusrsctp.so:net/libusrsctp \ libwebsockets.so:net/libwebsockets USES= autoreconf cpe gmake gnome libtool localbase pkgconfig \ ssl USE_GNOME= glib20 USE_GITHUB= yes GH_ACCOUNT= meetecho GH_PROJECT= janus-gateway CPE_VENDOR= meetecho USE_RC_SUBR= janus CONFIGURE_ARGS+= --disable-mqtt \ --disable-rabbitmq \ --enable-data-channels \ --enable-json-logger INSTALL_TARGET= install-strip CFLAGS+= -I${OPENSSLINC} -I${LOCALBASE}/include/nice LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -L${LOCALBASE} -lnice GNU_CONFIGURE= yes USE_LDCONFIG= yes SUB_FILES= pkg-message OPTIONS_SUB= yes OPTIONS_DEFINE= JAVASCRIPT LUA NANOMSG POSTPROCESSING \ RABBITMQ JAVASCRIPT_DESC= JavaScript scripting language support #MQTT_DESC= MQTT integration NANOMSG_DESC= Nanomsg integration RABBITMQ_DESC= RabbitMQ integration POSTPROCESSING_DESC= Post processing integration JAVASCRIPT_LIB_DEPENDS= libduktape.so:lang/duktape-lib NANOMSG_LIB_DEPENDS= libnanomsg.so:net/nanomsg RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c JAVASCRIPT_CONFIGURE_ENABLE= plugin-duktape NANOMSG_CONFIGURE_ENABLE= nanomsg RABBITMQ_CONFIGURE_ENABLE= rabbitmq LUA_CONFIGURE_ENABLE= plugin-lua LUA_USES= lua LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" POSTPROCESSING_CONFIGURE_ENABLE= post-processing POSTPROCESSING_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg .include diff --git a/www/janus/distinfo b/www/janus/distinfo index 21ca6f348928..4c92a2b3da58 100644 --- a/www/janus/distinfo +++ b/www/janus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644715713 -SHA256 (meetecho-janus-gateway-v0.11.8_GH0.tar.gz) = 2b065c5feaec9e40b2310b97cf598bb53346b326bdad73f57b3de319eb0fc65f -SIZE (meetecho-janus-gateway-v0.11.8_GH0.tar.gz) = 7116815 +TIMESTAMP = 1646448604 +SHA256 (meetecho-janus-gateway-v1.0.0_GH0.tar.gz) = 8b126f554c416767b2aa4c5fe957bfd3ba9326369cf05b312ceca96cd715c310 +SIZE (meetecho-janus-gateway-v1.0.0_GH0.tar.gz) = 6230838 diff --git a/www/janus/files/patch-configure.ac b/www/janus/files/patch-configure.ac index 0e5c878d08a0..3aeb90ee511f 100644 --- a/www/janus/files/patch-configure.ac +++ b/www/janus/files/patch-configure.ac @@ -1,20 +1,20 @@ ---- configure.ac.orig 2021-09-06 10:07:06 UTC +--- configure.ac.orig 2022-03-03 10:44:38 UTC +++ configure.ac -@@ -363,8 +363,6 @@ freebsd*) +@@ -359,8 +359,6 @@ freebsd*) libconfig nice jansson >= $jansson_version - libssl >= $ssl_version - libcrypto zlib" esac PKG_CHECK_MODULES([JANUS],"$PKGCHECKMODULES") -@@ -954,8 +952,6 @@ AS_IF([test "x$enable_post_processing" = "xyes"], +@@ -963,8 +961,6 @@ AS_IF([test "x$enable_post_processing" = "xyes"], [ glib-2.0 >= $glib_version jansson >= $jansson_version - libssl >= $ssl_version - libcrypto libavutil libavcodec libavformat diff --git a/www/janus/files/patch-janus.c b/www/janus/files/patch-src__janus.c similarity index 69% rename from www/janus/files/patch-janus.c rename to www/janus/files/patch-src__janus.c index a6be811351b7..5fef7b777a47 100644 --- a/www/janus/files/patch-janus.c +++ b/www/janus/files/patch-src__janus.c @@ -1,18 +1,18 @@ ---- janus.c.orig 2022-02-11 08:56:29 UTC -+++ janus.c -@@ -4423,6 +4423,7 @@ gint main(int argc, char *argv[]) +--- src/janus.c.orig 2022-03-03 10:44:38 UTC ++++ src/janus.c +@@ -4435,6 +4435,7 @@ gint main(int argc, char *argv[]) if (exit_on_dl_error) exit(1); } else { + dlerror(); create_l *create = (create_l*) dlsym(event, "create"); const char *dlsym_error = dlerror(); if (dlsym_error) { -@@ -5447,6 +5448,7 @@ gint main(int argc, char *argv[]) +@@ -5459,6 +5460,7 @@ gint main(int argc, char *argv[]) if (exit_on_dl_error) exit(1); } else { + dlerror(); create_p *create = (create_p*) dlsym(plugin, "create"); const char *dlsym_error = dlerror(); if (dlsym_error) { diff --git a/www/janus/files/patch-transports_janus__websockets.c b/www/janus/files/patch-src_transports_janus__websockets.c similarity index 69% rename from www/janus/files/patch-transports_janus__websockets.c rename to www/janus/files/patch-src_transports_janus__websockets.c index cc641d91d7bc..0e16c6eecc17 100644 --- a/www/janus/files/patch-transports_janus__websockets.c +++ b/www/janus/files/patch-src_transports_janus__websockets.c @@ -1,22 +1,22 @@ ---- transports/janus_websockets.c.orig 2021-10-20 10:23:29 UTC -+++ transports/janus_websockets.c -@@ -383,6 +383,9 @@ static struct lws_vhost* janus_websockets_create_ws_se +--- src/transports/janus_websockets.c.orig 2022-03-03 10:44:38 UTC ++++ src/transports/janus_websockets.c +@@ -384,6 +384,9 @@ static struct lws_vhost* janus_websockets_create_ws_se { janus_config_item *item; char item_name[255]; +#ifdef __FreeBSD__ + int ipv4_only = 0; +#endif item = janus_config_get(config, config_container, janus_config_type_item, prefix); if(!item || !item->value || !janus_is_true(item->value)) { -@@ -529,9 +532,6 @@ int janus_websockets_init(janus_transport_callbacks *c +@@ -530,9 +533,6 @@ int janus_websockets_init(janus_transport_callbacks *c JANUS_LOG(LOG_WARN, "libwebsockets has been built without IPv6 support, will bind to IPv4 only\n"); #endif -#ifdef __FreeBSD__ - int ipv4_only = 0; -#endif /* This is the callback we'll need to invoke to contact the Janus core */ gateway = callback; diff --git a/www/janus/pkg-plist b/www/janus/pkg-plist index 3b63bed07b7f..129a642743ba 100644 --- a/www/janus/pkg-plist +++ b/www/janus/pkg-plist @@ -1,186 +1,190 @@ bin/janus bin/janus-cfgconv %%POSTPROCESSING%%bin/janus-pp-rec %%POSTPROCESSING%%bin/mjr2pcap @sample %%ETCDIR%%/janus.eventhandler.gelfevh.jcfg.sample %%NANOMSG%%@sample %%ETCDIR%%/janus.eventhandler.nanomsgevh.jcfg.sample %%RABBITMQ%%@sample %%ETCDIR%%/janus.eventhandler.rabbitmqevh.jcfg.sample %%JAVASCRIPT%%@sample %%ETCDIR%%/janus.plugin.duktape.jcfg.sample %%NANOMSG%%@sample %%ETCDIR%%/janus.transport.nanomsg.jcfg.sample %%RABBITMQ%%@sample %%ETCDIR%%/janus.transport.rabbitmq.jcfg.sample @sample %%ETCDIR%%/janus.eventhandler.sampleevh.jcfg.sample @sample %%ETCDIR%%/janus.eventhandler.wsevh.jcfg.sample @sample %%ETCDIR%%/janus.jcfg.sample @sample %%ETCDIR%%/janus.logger.jsonlog.jcfg.sample @sample %%ETCDIR%%/janus.plugin.audiobridge.jcfg.sample @sample %%ETCDIR%%/janus.plugin.echotest.jcfg.sample %%LUA%%@sample %%ETCDIR%%/janus.plugin.lua.jcfg.sample @sample %%ETCDIR%%/janus.plugin.nosip.jcfg.sample @sample %%ETCDIR%%/janus.plugin.recordplay.jcfg.sample @sample %%ETCDIR%%/janus.plugin.sip.jcfg.sample @sample %%ETCDIR%%/janus.plugin.streaming.jcfg.sample @sample %%ETCDIR%%/janus.plugin.textroom.jcfg.sample @sample %%ETCDIR%%/janus.plugin.videocall.jcfg.sample @sample %%ETCDIR%%/janus.plugin.videoroom.jcfg.sample @sample %%ETCDIR%%/janus.plugin.voicemail.jcfg.sample @sample %%ETCDIR%%/janus.transport.http.jcfg.sample @sample %%ETCDIR%%/janus.transport.pfunix.jcfg.sample @sample %%ETCDIR%%/janus.transport.websockets.jcfg.sample include/janus/apierror.h include/janus/config.h include/janus/debug.h include/janus/events/eventhandler.h include/janus/ip-utils.h include/janus/log.h include/janus/loggers/logger.h include/janus/mutex.h include/janus/plugins/plugin.h include/janus/record.h include/janus/refcount.h include/janus/rtcp.h include/janus/rtp.h include/janus/rtpsrtp.h include/janus/sdp-utils.h include/janus/text2pcap.h include/janus/transports/transport.h include/janus/utils.h lib/janus/events/libjanus_gelfevh.so lib/janus/events/libjanus_gelfevh.so.0 lib/janus/events/libjanus_gelfevh.so.0.0.0 %%NANOMSG%%lib/janus/events/libjanus_nanomsgevh.so %%NANOMSG%%lib/janus/events/libjanus_nanomsgevh.so.0 %%NANOMSG%%lib/janus/events/libjanus_nanomsgevh.so.0.0.0 %%RABBITMQ%%lib/janus/events/libjanus_rabbitmqevh.so %%RABBITMQ%%lib/janus/events/libjanus_rabbitmqevh.so.0 %%RABBITMQ%%lib/janus/events/libjanus_rabbitmqevh.so.0.0.0 lib/janus/events/libjanus_sampleevh.so lib/janus/events/libjanus_sampleevh.so.0 lib/janus/events/libjanus_sampleevh.so.0.0.0 lib/janus/events/libjanus_wsevh.so lib/janus/events/libjanus_wsevh.so.0 lib/janus/events/libjanus_wsevh.so.0.0.0 lib/janus/loggers/libjanus_jsonlog.so lib/janus/loggers/libjanus_jsonlog.so.0 lib/janus/loggers/libjanus_jsonlog.so.0.0.0 lib/janus/plugins/libjanus_audiobridge.so lib/janus/plugins/libjanus_audiobridge.so.0 lib/janus/plugins/libjanus_audiobridge.so.0.0.0 lib/janus/plugins/libjanus_echotest.so lib/janus/plugins/libjanus_echotest.so.0 lib/janus/plugins/libjanus_echotest.so.0.0.0 %%JAVASCRIPT%%lib/janus/plugins/libjanus_duktape.so %%JAVASCRIPT%%lib/janus/plugins/libjanus_duktape.so.0 %%JAVASCRIPT%%lib/janus/plugins/libjanus_duktape.so.0.0.0 %%LUA%%lib/janus/plugins/libjanus_lua.so %%LUA%%lib/janus/plugins/libjanus_lua.so.0 %%LUA%%lib/janus/plugins/libjanus_lua.so.0.0.0 lib/janus/plugins/libjanus_nosip.so lib/janus/plugins/libjanus_nosip.so.0 lib/janus/plugins/libjanus_nosip.so.0.0.0 lib/janus/plugins/libjanus_recordplay.so lib/janus/plugins/libjanus_recordplay.so.0 lib/janus/plugins/libjanus_recordplay.so.0.0.0 lib/janus/plugins/libjanus_sip.so lib/janus/plugins/libjanus_sip.so.0 lib/janus/plugins/libjanus_sip.so.0.0.0 lib/janus/plugins/libjanus_streaming.so lib/janus/plugins/libjanus_streaming.so.0 lib/janus/plugins/libjanus_streaming.so.0.0.0 lib/janus/plugins/libjanus_textroom.so lib/janus/plugins/libjanus_textroom.so.0 lib/janus/plugins/libjanus_textroom.so.0.0.0 lib/janus/plugins/libjanus_videocall.so lib/janus/plugins/libjanus_videocall.so.0 lib/janus/plugins/libjanus_videocall.so.0.0.0 lib/janus/plugins/libjanus_videoroom.so lib/janus/plugins/libjanus_videoroom.so.0 lib/janus/plugins/libjanus_videoroom.so.0.0.0 lib/janus/plugins/libjanus_voicemail.so lib/janus/plugins/libjanus_voicemail.so.0 lib/janus/plugins/libjanus_voicemail.so.0.0.0 lib/janus/transports/libjanus_http.so lib/janus/transports/libjanus_http.so.0 lib/janus/transports/libjanus_http.so.0.0.0 %%NANOMSG%%lib/janus/transports/libjanus_nanomsg.so %%NANOMSG%%lib/janus/transports/libjanus_nanomsg.so.0 %%NANOMSG%%lib/janus/transports/libjanus_nanomsg.so.0.0.0 lib/janus/transports/libjanus_pfunix.so lib/janus/transports/libjanus_pfunix.so.0 lib/janus/transports/libjanus_pfunix.so.0.0.0 %%RABBITMQ%%lib/janus/transports/libjanus_rabbitmq.so %%RABBITMQ%%lib/janus/transports/libjanus_rabbitmq.so.0 %%RABBITMQ%%lib/janus/transports/libjanus_rabbitmq.so.0.0.0 lib/janus/transports/libjanus_websockets.so lib/janus/transports/libjanus_websockets.so.0 lib/janus/transports/libjanus_websockets.so.0.0.0 man/man1/janus-cfgconv.1.gz %%POSTPROCESSING%%man/man1/janus-pp-rec.1.gz man/man1/janus.1.gz %%POSTPROCESSING%%man/man1/mjr2pcap.1.gz share/doc/janus-gateway/README.md %%DATADIR%%/demos/admin.html %%DATADIR%%/demos/admin.js %%DATADIR%%/demos/audiobridgetest.html %%DATADIR%%/demos/audiobridgetest.js %%DATADIR%%/demos/canvas.html %%DATADIR%%/demos/canvas.js %%DATADIR%%/demos/citeus.html %%DATADIR%%/demos/css/demo.css %%DATADIR%%/demos/demos.html %%DATADIR%%/demos/devicetest.html %%DATADIR%%/demos/devicetest.js %%DATADIR%%/demos/docs/index.html %%DATADIR%%/demos/e2etest.html %%DATADIR%%/demos/e2etest.js %%DATADIR%%/demos/echotest.html %%DATADIR%%/demos/echotest.js %%DATADIR%%/demos/favicon.ico %%DATADIR%%/demos/footer.html %%DATADIR%%/demos/index.html %%DATADIR%%/demos/janus-logo.png %%DATADIR%%/demos/janus-logo-small.png %%DATADIR%%/demos/janus.js %%DATADIR%%/demos/meetecho-logo.png %%DATADIR%%/demos/multiopus.html %%DATADIR%%/demos/multiopus.js +%%DATADIR%%/demos/mvideoroomtest.html +%%DATADIR%%/demos/mvideoroomtest.js %%DATADIR%%/demos/navbar.html %%DATADIR%%/demos/nosiptest.html %%DATADIR%%/demos/nosiptest.js %%DATADIR%%/demos/recordplaytest.html %%DATADIR%%/demos/recordplaytest.js %%DATADIR%%/demos/screensharingtest.html %%DATADIR%%/demos/screensharingtest.js %%DATADIR%%/demos/siptest.html %%DATADIR%%/demos/siptest.js %%DATADIR%%/demos/streamingtest.html %%DATADIR%%/demos/streamingtest.js %%DATADIR%%/demos/support.html %%DATADIR%%/demos/surround/ChID-BLITS-EBU.mp4 %%DATADIR%%/demos/surround/ChID-BLITS-EBU.txt %%DATADIR%%/demos/textroomtest.html %%DATADIR%%/demos/textroomtest.js %%DATADIR%%/demos/up_arrow.png %%DATADIR%%/demos/videocalltest.html %%DATADIR%%/demos/videocalltest.js %%DATADIR%%/demos/videoroomtest.html %%DATADIR%%/demos/videoroomtest.js %%DATADIR%%/demos/voicemailtest.html %%DATADIR%%/demos/voicemailtest.js %%DATADIR%%/demos/vp9svctest.html %%DATADIR%%/demos/vp9svctest.js %%JAVASCRIPT%%%%DATADIR%%/duktape/echotest.js %%JAVASCRIPT%%%%DATADIR%%/duktape/janus-sdp.js %%DATADIR%%/javascript/janus.js %%LUA%%%%DATADIR%%/lua/echotest.lua %%LUA%%%%DATADIR%%/lua/janus-logger.lua %%LUA%%%%DATADIR%%/lua/janus-sdp.lua %%LUA%%%%DATADIR%%/lua/videoroom.lua %%DATADIR%%/recordings/1234.nfo %%DATADIR%%/recordings/rec-sample-audio.mjr %%DATADIR%%/recordings/rec-sample-video.mjr %%DATADIR%%/streams/music.mulaw %%DATADIR%%/streams/radio.alaw %%DATADIR%%/streams/test_gstreamer.sh -%%DATADIR%%/streams/test_gstreamer_1.sh +%%DATADIR%%/streams/test_gstreamer1.sh +%%DATADIR%%/streams/test_gstreamer1_multistream.sh +%%DATADIR%%/streams/test_gstreamer_multistream.sh @dir %%DATADIR%%/duktape @dir %%DATADIR%%/lua