diff --git a/www/janus/Makefile b/www/janus/Makefile index 2674779e9b9e..5d4f5214848b 100644 --- a/www/janus/Makefile +++ b/www/janus/Makefile @@ -1,65 +1,64 @@ PORTNAME= janus DISTVERSIONPREFIX= v -DISTVERSION= 0.11.4 +DISTVERSION= 0.11.5 CATEGORIES= www MAINTAINER= vanilla@FreeBSD.org COMMENT= WebRTC gateway LICENSE= GPLv3 BUILD_DEPENDS= gengetopt>0:devel/gengetopt -LIB_DEPENDS= libsrtp2.so:net/libsrtp2 \ - libusrsctp.so:net/libusrsctp \ +LIB_DEPENDS= libconfig.so:devel/libconfig \ + libcurl.so:ftp/curl \ libjansson.so:devel/jansson \ - libnice.so:net-im/libnice \ libmicrohttpd.so:www/libmicrohttpd \ - libwebsockets.so:net/libwebsockets \ - libcurl.so:ftp/curl \ + libnice.so:net-im/libnice \ + libogg.so:audio/libogg \ libopus.so:audio/opus \ libsofia-sip-ua.so:net/sofia-sip \ - libogg.so:audio/libogg \ - libjansson.so:devel/jansson \ - libnice.so:net-im/libnice \ - libmicrohttpd.so:www/libmicrohttpd \ - libwebsockets.so:net/libwebsockets \ - libconfig.so:devel/libconfig + libsrtp2.so:net/libsrtp2 \ + libusrsctp.so:net/libusrsctp \ + libwebsockets.so:net/libwebsockets -USES= libtool pkgconfig autoreconf cpe gmake localbase gnome ssl -USE_GNOME= glib20 -USE_GITHUB= yes -GH_ACCOUNT= meetecho -GH_PROJECT= janus-gateway -CPE_VENDOR= meetecho -USE_RC_SUBR= janus +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-json-logger \ - --enable-data-channels -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 + --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 RABBITMQ POSTPROCESSING -JAVASCRIPT_DESC= JavaScript scripting language support +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}" +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 +POSTPROCESSING_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg .include diff --git a/www/janus/distinfo b/www/janus/distinfo index 8924eeee7c66..f863751c96c5 100644 --- a/www/janus/distinfo +++ b/www/janus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631004647 -SHA256 (meetecho-janus-gateway-v0.11.4_GH0.tar.gz) = baf0b0edf2031fcf0b81fd9df4bb916c061d77378f9671d1a7060bf2906af207 -SIZE (meetecho-janus-gateway-v0.11.4_GH0.tar.gz) = 7088909 +TIMESTAMP = 1634724230 +SHA256 (meetecho-janus-gateway-v0.11.5_GH0.tar.gz) = 4c80403d76365b258db930dd9c4ab8e65a2d4753309c7473bfc291ab289ce958 +SIZE (meetecho-janus-gateway-v0.11.5_GH0.tar.gz) = 7094167 diff --git a/www/janus/files/patch-janus.c b/www/janus/files/patch-janus.c index 4a1b01dfd121..6ef7380ecbcb 100644 --- a/www/janus/files/patch-janus.c +++ b/www/janus/files/patch-janus.c @@ -1,10 +1,10 @@ ---- janus.c.orig 2021-09-06 10:07:06 UTC +--- janus.c.orig 2021-10-18 15:46:53 UTC +++ janus.c -@@ -4338,6 +4338,7 @@ gint main(int argc, char *argv[]) +@@ -4359,6 +4359,7 @@ gint main(int argc, char *argv[]) if (!event) { JANUS_LOG(LOG_ERR, "\tCouldn't load logger plugin '%s': %s\n", eventent->d_name, dlerror()); } else { + dlerror(); create_l *create = (create_l*) dlsym(event, "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-transports_janus__websockets.c new file mode 100644 index 000000000000..cc641d91d7bc --- /dev/null +++ b/www/janus/files/patch-transports_janus__websockets.c @@ -0,0 +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 + { + 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 + 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; +