diff --git a/www/janus/Makefile b/www/janus/Makefile index dff00adac28a..40de1674116c 100644 --- a/www/janus/Makefile +++ b/www/janus/Makefile @@ -1,67 +1,68 @@ PORTNAME= janus DISTVERSIONPREFIX= v -DISTVERSION= 1.1.3 -PORTREVISION= 1 +DISTVERSION= 1.1.4 +PORTREVISION= 0 CATEGORIES= www MAINTAINER= vanilla@FreeBSD.org COMMENT= WebRTC gateway WWW= https://github.com/meetecho/janus-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 \ --libdir=${PREFIX}/libexec 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 +OPTIONS_DEFINE= JAVASCRIPT LUA MQTT NANOMSG \ + POSTPROCESSING RABBITMQ JAVASCRIPT_DESC= JavaScript scripting language support -#MQTT_DESC= MQTT integration +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 +MQTT_LIB_DEPENDS= libpaho-mqtt3c.so:net/libpaho-mqtt3 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 1e9630db1890..57be9b0b7d13 100644 --- a/www/janus/distinfo +++ b/www/janus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678608734 -SHA256 (meetecho-janus-gateway-v1.1.3_GH0.tar.gz) = f87d322cbe0cd8a7f1e83082445e4d62106a42ca5cfa8b636df1eb5ab8b1ce7b -SIZE (meetecho-janus-gateway-v1.1.3_GH0.tar.gz) = 6340130 +TIMESTAMP = 1684633125 +SHA256 (meetecho-janus-gateway-v1.1.4_GH0.tar.gz) = 292397ee925b957fec3e946b8b40d559fcdfc80d171ab9618f10df0e1ebe800f +SIZE (meetecho-janus-gateway-v1.1.4_GH0.tar.gz) = 6372310 diff --git a/www/janus/files/patch-configure.ac b/www/janus/files/patch-configure.ac index c4e817d056f1..0d307eb5a356 100644 --- a/www/janus/files/patch-configure.ac +++ b/www/janus/files/patch-configure.ac @@ -1,20 +1,20 @@ ---- configure.ac.orig 2022-06-20 10:25:02 UTC +--- configure.ac.orig 2023-05-20 12:59:00 UTC +++ configure.ac -@@ -359,8 +359,6 @@ freebsd*) +@@ -358,8 +358,6 @@ freebsd*) libconfig nice jansson >= $jansson_version - libssl >= $ssl_version - libcrypto zlib" esac PKG_CHECK_MODULES([JANUS],"$PKGCHECKMODULES") -@@ -956,8 +954,6 @@ AS_IF([test "x$enable_post_processing" = "xyes"], +@@ -940,8 +938,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-src__janus.c b/www/janus/files/patch-src__janus.c index 160951012a30..26975b9fe243 100644 --- a/www/janus/files/patch-src__janus.c +++ b/www/janus/files/patch-src__janus.c @@ -1,18 +1,18 @@ ---- src/janus.c.orig 2022-05-23 09:14:54 UTC +--- src/janus.c.orig 2023-05-20 12:59:00 UTC +++ src/janus.c -@@ -4449,6 +4449,7 @@ gint main(int argc, char *argv[]) { +@@ -4618,6 +4618,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) { -@@ -5474,6 +5475,7 @@ gint main(int argc, char *argv[]) { +@@ -5649,6 +5650,7 @@ gint main(int argc, char *argv[]) { 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-src_rtp.h b/www/janus/files/patch-src_rtp.h new file mode 100644 index 000000000000..62746ed5c382 --- /dev/null +++ b/www/janus/files/patch-src_rtp.h @@ -0,0 +1,11 @@ +--- src/rtp.h.orig 2023-05-21 03:47:10 UTC ++++ src/rtp.h +@@ -15,6 +15,8 @@ + + #include + #if defined (__MACH__) || defined(__FreeBSD__) ++#include ++#include + #include + #define __BYTE_ORDER BYTE_ORDER + #define __BIG_ENDIAN BIG_ENDIAN diff --git a/www/janus/pkg-plist b/www/janus/pkg-plist index c47ed88e6a9c..2d2b33d9309b 100644 --- a/www/janus/pkg-plist +++ b/www/janus/pkg-plist @@ -1,190 +1,193 @@ bin/janus bin/janus-cfgconv %%POSTPROCESSING%%bin/janus-pp-rec %%POSTPROCESSING%%bin/mjr2pcap @sample %%ETCDIR%%/janus.eventhandler.gelfevh.jcfg.sample +%%MQTT%%%%ETCDIR%%/janus.eventhandler.mqttevh.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.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 libexec/janus/events/libjanus_gelfevh.so libexec/janus/events/libjanus_gelfevh.so.1 -libexec/janus/events/libjanus_gelfevh.so.1.1.3 +libexec/janus/events/libjanus_gelfevh.so.1.1.4 +%%MQTT%%libexec/janus/events/libjanus_mqttevh.so +%%MQTT%%libexec/janus/events/libjanus_mqttevh.so.1 +%%MQTT%%libexec/janus/events/libjanus_mqttevh.so.1.1.4 %%NANOMSG%%libexec/janus/events/libjanus_nanomsgevh.so %%NANOMSG%%libexec/janus/events/libjanus_nanomsgevh.so.1 -%%NANOMSG%%libexec/janus/events/libjanus_nanomsgevh.so.1.1.3 +%%NANOMSG%%libexec/janus/events/libjanus_nanomsgevh.so.1.1.4 %%RABBITMQ%%libexec/janus/events/libjanus_rabbitmqevh.so %%RABBITMQ%%libexec/janus/events/libjanus_rabbitmqevh.so.1 -%%RABBITMQ%%libexec/janus/events/libjanus_rabbitmqevh.so.1.1.3 +%%RABBITMQ%%libexec/janus/events/libjanus_rabbitmqevh.so.1.1.4 libexec/janus/events/libjanus_sampleevh.so libexec/janus/events/libjanus_sampleevh.so.1 -libexec/janus/events/libjanus_sampleevh.so.1.1.3 +libexec/janus/events/libjanus_sampleevh.so.1.1.4 libexec/janus/events/libjanus_wsevh.so libexec/janus/events/libjanus_wsevh.so.1 -libexec/janus/events/libjanus_wsevh.so.1.1.3 +libexec/janus/events/libjanus_wsevh.so.1.1.4 libexec/janus/loggers/libjanus_jsonlog.so libexec/janus/loggers/libjanus_jsonlog.so.1 -libexec/janus/loggers/libjanus_jsonlog.so.1.1.3 +libexec/janus/loggers/libjanus_jsonlog.so.1.1.4 libexec/janus/plugins/libjanus_audiobridge.so libexec/janus/plugins/libjanus_audiobridge.so.1 -libexec/janus/plugins/libjanus_audiobridge.so.1.1.3 +libexec/janus/plugins/libjanus_audiobridge.so.1.1.4 libexec/janus/plugins/libjanus_echotest.so libexec/janus/plugins/libjanus_echotest.so.1 -libexec/janus/plugins/libjanus_echotest.so.1.1.3 +libexec/janus/plugins/libjanus_echotest.so.1.1.4 %%JAVASCRIPT%%libexec/janus/plugins/libjanus_duktape.so %%JAVASCRIPT%%libexec/janus/plugins/libjanus_duktape.so.1 -%%JAVASCRIPT%%libexec/janus/plugins/libjanus_duktape.so.1.1.3 +%%JAVASCRIPT%%libexec/janus/plugins/libjanus_duktape.so.1.1.4 %%LUA%%libexec/janus/plugins/libjanus_lua.so %%LUA%%libexec/janus/plugins/libjanus_lua.so.1 -%%LUA%%libexec/janus/plugins/libjanus_lua.so.1.1.3 +%%LUA%%libexec/janus/plugins/libjanus_lua.so.1.1.4 libexec/janus/plugins/libjanus_nosip.so libexec/janus/plugins/libjanus_nosip.so.1 -libexec/janus/plugins/libjanus_nosip.so.1.1.3 +libexec/janus/plugins/libjanus_nosip.so.1.1.4 libexec/janus/plugins/libjanus_recordplay.so libexec/janus/plugins/libjanus_recordplay.so.1 -libexec/janus/plugins/libjanus_recordplay.so.1.1.3 +libexec/janus/plugins/libjanus_recordplay.so.1.1.4 libexec/janus/plugins/libjanus_sip.so libexec/janus/plugins/libjanus_sip.so.1 -libexec/janus/plugins/libjanus_sip.so.1.1.3 +libexec/janus/plugins/libjanus_sip.so.1.1.4 libexec/janus/plugins/libjanus_streaming.so libexec/janus/plugins/libjanus_streaming.so.1 -libexec/janus/plugins/libjanus_streaming.so.1.1.3 +libexec/janus/plugins/libjanus_streaming.so.1.1.4 libexec/janus/plugins/libjanus_textroom.so libexec/janus/plugins/libjanus_textroom.so.1 -libexec/janus/plugins/libjanus_textroom.so.1.1.3 +libexec/janus/plugins/libjanus_textroom.so.1.1.4 libexec/janus/plugins/libjanus_videocall.so libexec/janus/plugins/libjanus_videocall.so.1 -libexec/janus/plugins/libjanus_videocall.so.1.1.3 +libexec/janus/plugins/libjanus_videocall.so.1.1.4 libexec/janus/plugins/libjanus_videoroom.so libexec/janus/plugins/libjanus_videoroom.so.1 -libexec/janus/plugins/libjanus_videoroom.so.1.1.3 +libexec/janus/plugins/libjanus_videoroom.so.1.1.4 libexec/janus/transports/libjanus_http.so libexec/janus/transports/libjanus_http.so.1 -libexec/janus/transports/libjanus_http.so.1.1.3 +libexec/janus/transports/libjanus_http.so.1.1.4 %%NANOMSG%%libexec/janus/transports/libjanus_nanomsg.so %%NANOMSG%%libexec/janus/transports/libjanus_nanomsg.so.1 -%%NANOMSG%%libexec/janus/transports/libjanus_nanomsg.so.1.1.3 +%%NANOMSG%%libexec/janus/transports/libjanus_nanomsg.so.1.1.4 libexec/janus/transports/libjanus_pfunix.so libexec/janus/transports/libjanus_pfunix.so.1 -libexec/janus/transports/libjanus_pfunix.so.1.1.3 +libexec/janus/transports/libjanus_pfunix.so.1.1.4 %%RABBITMQ%%libexec/janus/transports/libjanus_rabbitmq.so %%RABBITMQ%%libexec/janus/transports/libjanus_rabbitmq.so.1 -%%RABBITMQ%%libexec/janus/transports/libjanus_rabbitmq.so.1.1.3 +%%RABBITMQ%%libexec/janus/transports/libjanus_rabbitmq.so.1.1.4 libexec/janus/transports/libjanus_websockets.so libexec/janus/transports/libjanus_websockets.so.1 -libexec/janus/transports/libjanus_websockets.so.1.1.3 +libexec/janus/transports/libjanus_websockets.so.1.1.4 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/background/retro.webp %%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/forkme_left_darkblue_121621.png %%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/settings.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/virtualbg.html %%DATADIR%%/demos/virtualbg.js -%%DATADIR%%/demos/vp9svctest.html -%%DATADIR%%/demos/vp9svctest.js %%DATADIR%%/demos/webaudio.html %%DATADIR%%/demos/webaudio.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_gstreamer1.sh %%DATADIR%%/streams/test_gstreamer1_multistream.sh %%DATADIR%%/streams/test_gstreamer_multistream.sh @dir %%DATADIR%%/duktape @dir %%DATADIR%%/lua