diff --git a/multimedia/librist/Makefile b/multimedia/librist/Makefile index 6766b5c6f90b..5c1462a27b12 100644 --- a/multimedia/librist/Makefile +++ b/multimedia/librist/Makefile @@ -1,32 +1,38 @@ PORTNAME= librist -DISTVERSION= 0.2.14 +DISTVERSION= 0.2.15 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org COMMENT= Library for Reliable Internet Stream Transport (RIST) protocol WWW= https://code.videolan.org/rist/librist LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcjson.so:devel/libcjson \ libmbedcrypto.so:security/mbedtls3 \ libmicrohttpd.so:www/libmicrohttpd +TEST_DEPENDS= cmocka>0:sysutils/cmocka USES= localbase:ldflags meson pkgconfig USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://code.videolan.org GL_ACCOUNT= rist -GL_TAGNAME= 91a88de284542ec0414e32e5b884ba33b3fd3b91 +GL_TAGNAME= 561c2536e6c8cc853a2cc7ac757589f312e5e258 MESON_ARGS= -Dtest=false do-test: @cd ${WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} --reconfigure ${CONFIGURE_ARGS} -Dtest=true && \ + ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS:N-Dtest=*} --reconfigure -Dtest=true && \ cd ${BUILD_WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} test + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test + +# tests as of 0.2.15: +# Ok: 20 +# Expected Fail: 7 +# Fail: 0 .include diff --git a/multimedia/librist/distinfo b/multimedia/librist/distinfo index 343aaae3936d..c521eeaed40f 100644 --- a/multimedia/librist/distinfo +++ b/multimedia/librist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1778380554 -SHA256 (rist-librist-91a88de284542ec0414e32e5b884ba33b3fd3b91_GL0.tar.gz) = 5d7f6d139961a7dd983aa8d100531f6fd6ea1306361cd44416b9fc967dee4b7b -SIZE (rist-librist-91a88de284542ec0414e32e5b884ba33b3fd3b91_GL0.tar.gz) = 2942011 +TIMESTAMP = 1779744865 +SHA256 (rist-librist-561c2536e6c8cc853a2cc7ac757589f312e5e258_GL0.tar.gz) = d8dd3d207b794a8dace603654a22bee25708c3fc16b4ec51ee0c67a58d959934 +SIZE (rist-librist-561c2536e6c8cc853a2cc7ac757589f312e5e258_GL0.tar.gz) = 2951863 diff --git a/multimedia/librist/files/patch-meson.build b/multimedia/librist/files/patch-meson.build index 8467e57c0141..d908fc42ae16 100644 --- a/multimedia/librist/files/patch-meson.build +++ b/multimedia/librist/files/patch-meson.build @@ -1,33 +1,33 @@ - workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280210 - code uses the c11 feature stdatomic.h while it uses --std=c99 - add FreeBSD TUN support: include src/tun_freebsd.c in the platform build ---- meson.build.orig 2026-04-25 03:38:38 UTC +--- meson.build.orig 2026-05-15 04:48:53 UTC +++ meson.build @@ -5,7 +5,7 @@ project('libRIST', 'c', project('libRIST', 'c', - version: '0.2.14', + version: '0.2.15', - default_options: ['c_std=c99', 'warning_level=3', 'libdir=lib'], + default_options: ['c_std=c11', 'warning_level=3', 'libdir=lib'], meson_version: '>= 0.51.0') cc = meson.get_compiler('c') -@@ -156,6 +156,8 @@ void test(void) { +@@ -157,6 +157,8 @@ void test(void) { platform_files += 'src/tun_darwin.c' test_args += '-D_DARWIN_C_SOURCE' add_project_arguments('-D_DARWIN_C_SOURCE', language: 'c') + elif host_machine.system() == 'freebsd' + platform_files += 'src/tun_freebsd.c' elif host_machine.system() == 'gnu' test_args += '-D_GNU_SOURCE' add_project_arguments('-D_GNU_SOURCE', language: 'c') -@@ -391,7 +393,7 @@ if get_option('static_analyze') +@@ -393,7 +395,7 @@ if get_option('static_analyze') if get_option('static_analyze') run_target('cppcheck', command : ['cppcheck', '--quiet', - '--std=c99', + '--std=c11', '--suppressions-list=' + join_paths(librist_src_root, 'common/configs/cppcheck-suppressions.txt'), '--project=' + join_paths(meson.build_root(), 'compile_commands.json')]) diff --git a/multimedia/librist/pkg-plist b/multimedia/librist/pkg-plist index daeba6f252ae..a9855b33be98 100644 --- a/multimedia/librist/pkg-plist +++ b/multimedia/librist/pkg-plist @@ -1,26 +1,26 @@ bin/rist2rist bin/ristreceiver bin/ristsender bin/ristsrppasswd bin/udp2udp include/librist/common.h include/librist/headers.h include/librist/librist.h include/librist/librist_config.h include/librist/librist_srp.h include/librist/logging.h include/librist/oob.h include/librist/opt.h include/librist/peer.h include/librist/receiver.h include/librist/sender.h include/librist/stats.h include/librist/tun.h include/librist/tunnel.h include/librist/udpsocket.h include/librist/urlparam.h include/librist/version.h lib/librist.so lib/librist.so.4 -lib/librist.so.4.6.2 +lib/librist.so.4.6.3 libdata/pkgconfig/librist.pc