1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00

www/janus: update to 1.0.2.

This commit is contained in:
Vanilla I. Shu 2022-05-26 20:35:50 +08:00
parent d93692acad
commit 79ca5f26fc
5 changed files with 29 additions and 33 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= janus PORTNAME= janus
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 1.0.1 DISTVERSION= 1.0.2
PORTREVISION= 0 PORTREVISION= 0
CATEGORIES= www CATEGORIES= www

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1651128158 TIMESTAMP = 1653521948
SHA256 (meetecho-janus-gateway-v1.0.1_GH0.tar.gz) = c1ca94a149d8c00f980cd3c4b714720784db8c6cff6c0c11a5dcd61dc1fcb0df SHA256 (meetecho-janus-gateway-v1.0.2_GH0.tar.gz) = a1ca0ae787fa162a36b4e391c29ae81f9388c3077699fb7b7c054149a5503355
SIZE (meetecho-janus-gateway-v1.0.1_GH0.tar.gz) = 6322789 SIZE (meetecho-janus-gateway-v1.0.2_GH0.tar.gz) = 6329634

View File

@ -1,4 +1,4 @@
--- configure.ac.orig 2022-03-03 10:44:38 UTC --- configure.ac.orig 2022-05-23 09:14:54 UTC
+++ configure.ac +++ configure.ac
@@ -359,8 +359,6 @@ freebsd*) @@ -359,8 +359,6 @@ freebsd*)
libconfig libconfig
@ -9,7 +9,25 @@
zlib" zlib"
esac esac
PKG_CHECK_MODULES([JANUS],"$PKGCHECKMODULES") PKG_CHECK_MODULES([JANUS],"$PKGCHECKMODULES")
@@ -963,8 +961,6 @@ AS_IF([test "x$enable_post_processing" = "xyes"], @@ -559,7 +557,7 @@ AC_CHECK_LIB([websockets],
AS_IF([test "x$enable_websockets" != "xno"],
[
AC_DEFINE(HAVE_WEBSOCKETS)
- WS_MANUAL_LIBS="-lwebsockets -lresolv"
+ WS_MANUAL_LIBS="-lwebsockets"
enable_websockets=yes
AC_CHECK_LIB([websockets],
[lws_get_peer_simple],
@@ -569,7 +567,7 @@ AC_CHECK_LIB([websockets],
AS_IF([test "x$enable_websockets_event_handler" != "xno"],
[
AC_DEFINE(HAVE_WSEVH)
- WS_MANUAL_LIBS="-lwebsockets -lresolv"
+ WS_MANUAL_LIBS="-lwebsockets"
enable_websockets_event_handler=yes
])
],
@@ -956,8 +954,6 @@ AS_IF([test "x$enable_post_processing" = "xyes"],
[ [
glib-2.0 >= $glib_version glib-2.0 >= $glib_version
jansson >= $jansson_version jansson >= $jansson_version

View File

@ -1,6 +1,6 @@
--- src/janus.c.orig 2022-03-03 10:44:38 UTC --- src/janus.c.orig 2022-05-23 09:14:54 UTC
+++ src/janus.c +++ src/janus.c
@@ -4435,6 +4435,7 @@ gint main(int argc, char *argv[]) @@ -4449,6 +4449,7 @@ gint main(int argc, char *argv[]) {
if (exit_on_dl_error) if (exit_on_dl_error)
exit(1); exit(1);
} else { } else {
@ -8,11 +8,11 @@
create_l *create = (create_l*) dlsym(event, "create"); create_l *create = (create_l*) dlsym(event, "create");
const char *dlsym_error = dlerror(); const char *dlsym_error = dlerror();
if (dlsym_error) { if (dlsym_error) {
@@ -5459,6 +5460,7 @@ gint main(int argc, char *argv[]) @@ -5474,6 +5475,7 @@ gint main(int argc, char *argv[]) {
if (exit_on_dl_error)
exit(1); exit(1);
}
} else { } else {
+ dlerror(); + dlerror();
create_p *create = (create_p*) dlsym(plugin, "create"); create_p *create = (create_p*) dlsym(plugin, "create");
const char *dlsym_error = dlerror(); const char *dlsym_error = dlerror();
if (dlsym_error) { if(dlsym_error) {

View File

@ -1,22 +0,0 @@
--- 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)) {
@@ -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;