Date: Sun, 21 May 2023 04:04:56 GMT From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8dee6f574b13 - main - www/janus: update to 1.1.4, also add option for MQTT event handler. Message-ID: <202305210404.34L44uD4048031@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=8dee6f574b13fd741b55bc39368e3d8ac3bc53be commit 8dee6f574b13fd741b55bc39368e3d8ac3bc53be Author: Vanilla I. Shu <vanilla@FreeBSD.org> AuthorDate: 2023-05-21 04:04:02 +0000 Commit: Vanilla I. Shu <vanilla@FreeBSD.org> CommitDate: 2023-05-21 04:04:44 +0000 www/janus: update to 1.1.4, also add option for MQTT event handler. --- www/janus/Makefile | 11 ++++---- www/janus/distinfo | 6 ++--- www/janus/files/patch-configure.ac | 6 ++--- www/janus/files/patch-src__janus.c | 6 ++--- www/janus/files/patch-src_rtp.h | 11 ++++++++ www/janus/pkg-plist | 51 ++++++++++++++++++++------------------ 6 files changed, 53 insertions(+), 38 deletions(-) diff --git a/www/janus/Makefile b/www/janus/Makefile index dff00adac28a..40de1674116c 100644 --- a/www/janus/Makefile +++ b/www/janus/Makefile @@ -1,7 +1,7 @@ PORTNAME= janus DISTVERSIONPREFIX= v -DISTVERSION= 1.1.3 -PORTREVISION= 1 +DISTVERSION= 1.1.4 +PORTREVISION= 0 CATEGORIES= www MAINTAINER= vanilla@FreeBSD.org @@ -44,14 +44,15 @@ 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 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,6 +1,6 @@ ---- 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 @@ -9,7 +9,7 @@ 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 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,6 +1,6 @@ ---- 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 { @@ -8,7 +8,7 @@ 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 { 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 <arpa/inet.h> + #if defined (__MACH__) || defined(__FreeBSD__) ++#include <sys/socket.h> ++#include <netinet/in.h> + #include <machine/endian.h> + #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 @@ -3,6 +3,7 @@ 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 @@ -45,70 +46,73 @@ 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 @@ -133,6 +137,7 @@ share/doc/janus-gateway/README.md %%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 @@ -166,8 +171,6 @@ share/doc/janus-gateway/README.md %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305210404.34L44uD4048031>