Hi, please find attached an update for baresip.
A noteworthy change deals with the removal of the Speex codec (see https://github.com/alfredh/baresip/commit/fcfb0a5b3024d197c9603e06c272999938013a0d). The rest is straightforward. Works for me on amd64. As the maintainer (czarkoff@) has been unavailable for some time I am asking for additional OKs now. OK? Best regards, Ingo Index: Makefile =================================================================== RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile 7 May 2018 07:22:54 -0000 1.22 +++ Makefile 4 Jul 2018 18:52:47 -0000 @@ -3,15 +3,14 @@ COMMENT-main = modular SIP User-Agent with audio and video support COMMENT-gtk2 = GTK+2-based modules for baresip -V = 0.5.9 +V = 0.5.10 DISTNAME = baresip-$V -REVISION = 0 PKGNAME-main = baresip-$V PKGNAME-gtk2 = baresip-gtk2-$V WANTLIB-main += SDL2 X11 Xext avahi-client avahi-common avcodec avdevice WANTLIB-main += avformat avutil c gsm m mosquitto mpg123 opus png pthread -WANTLIB-main += re rem sndfile sndio spandsp speex speexdsp swscale +WANTLIB-main += re rem sndfile sndio spandsp speexdsp swscale WANTLIB-main += twolame v4l2 vpx x264 x265 WANTLIB-gtk2 += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama @@ -26,7 +25,6 @@ LIB_DEPENDS-main = audio/gsm \ audio/libsndfile \ audio/mpg123 \ audio/opus \ - audio/speex \ audio/twolame \ devel/sdl2 \ graphics/ffmpeg \ @@ -73,7 +71,6 @@ MAKE_FLAGS += MOD_AUTODETECT= \ USE_PLC=yes \ USE_SDL2=yes \ USE_SNDFILE=yes \ - USE_SPEEX=yes \ USE_SPEEX_AEC=yes \ USE_SPEEX_PP=yes \ USE_SRTP=yes \ Index: distinfo =================================================================== RCS file: /cvs/ports/telephony/baresip/baresip/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo 7 May 2018 07:22:54 -0000 1.15 +++ distinfo 4 Jul 2018 18:52:47 -0000 @@ -1,2 +1,2 @@ -SHA256 (baresip-0.5.9.tar.gz) = 7t3Pue+ACi2JIAi9maIj6n+pO6hYhswGPGu4HLkjbgk= -SIZE (baresip-0.5.9.tar.gz) = 589680 +SHA256 (baresip-0.5.10.tar.gz) = OT+wEEENP8akh5z9ojXw7JhDm+XR3KAsFfNBb3EQp/s= +SIZE (baresip-0.5.10.tar.gz) = 593159 Index: patches/patch-modules_zrtp_module_mk =================================================================== RCS file: /cvs/ports/telephony/baresip/baresip/patches/patch-modules_zrtp_module_mk,v retrieving revision 1.3 diff -u -p -r1.3 patch-modules_zrtp_module_mk --- patches/patch-modules_zrtp_module_mk 14 Jun 2016 16:15:55 -0000 1.3 +++ patches/patch-modules_zrtp_module_mk 4 Jul 2018 18:52:47 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-modules_zrtp_module_mk,v 1.3 2016/06/14 16:15:55 czarkoff Exp $ ---- modules/zrtp/module.mk.orig Fri May 20 17:57:56 2016 -+++ modules/zrtp/module.mk Tue Jun 14 15:16:42 2016 -@@ -6,7 +6,7 @@ +Index: modules/zrtp/module.mk +--- modules/zrtp/module.mk.orig ++++ modules/zrtp/module.mk +@@ -18,7 +18,7 @@ MOD := zrtp $(MOD)_SRCS += zrtp.c Index: patches/patch-src_config_c =================================================================== RCS file: /cvs/ports/telephony/baresip/baresip/patches/patch-src_config_c,v retrieving revision 1.14 diff -u -p -r1.14 patch-src_config_c --- patches/patch-src_config_c 7 May 2018 07:22:54 -0000 1.14 +++ patches/patch-src_config_c 4 Jul 2018 18:52:47 -0000 @@ -1,4 +1,5 @@ $OpenBSD: patch-src_config_c,v 1.14 2018/05/07 07:22:54 feinerer Exp $ + Index: src/config.c --- src/config.c.orig +++ src/config.c @@ -11,7 +12,7 @@ Index: src/config.c #endif } -@@ -761,31 +761,31 @@ int config_write_template(const char *file, const stru +@@ -761,30 +761,30 @@ int config_write_template(const char *file, const stru (void)re_fprintf(f, "module\t\t\t" MOD_PRE "stdio" MOD_EXT "\n"); #endif (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "cons" MOD_EXT "\n"); @@ -35,7 +36,6 @@ Index: src/config.c (void)re_fprintf(f, "module\t\t\t" MOD_PRE "g711" MOD_EXT "\n"); - (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "gsm" MOD_EXT "\n"); - (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "l16" MOD_EXT "\n"); -- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "speex" MOD_EXT "\n"); - (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "bv32" MOD_EXT "\n"); - (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "mpa" MOD_EXT "\n"); - (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "codec2" MOD_EXT "\n"); @@ -43,7 +43,6 @@ Index: src/config.c - (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "isac" MOD_EXT "\n"); + (void)re_fprintf(f, "module\t\t\t" MOD_PRE "gsm" MOD_EXT "\n"); + (void)re_fprintf(f, "module\t\t\t" MOD_PRE "l16" MOD_EXT "\n"); -+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "speex" MOD_EXT "\n"); +// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "bv32" MOD_EXT "\n"); + (void)re_fprintf(f, "module\t\t\t" MOD_PRE "mpa" MOD_EXT "\n"); +// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "codec2" MOD_EXT "\n"); @@ -60,7 +59,7 @@ Index: src/config.c (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "plc" MOD_EXT "\n"); (void)re_fprintf(f, "\n# Audio driver Modules\n"); -@@ -804,8 +804,8 @@ int config_write_template(const char *file, const stru +@@ -803,8 +803,8 @@ int config_write_template(const char *file, const stru (void)re_fprintf(f, "module\t\t\t" MOD_PRE "alsa" MOD_EXT "\n"); (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "pulse" MOD_EXT "\n"); #endif @@ -71,7 +70,7 @@ Index: src/config.c (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "aubridge" MOD_EXT "\n"); (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "aufile" MOD_EXT "\n"); -@@ -817,9 +817,9 @@ int config_write_template(const char *file, const stru +@@ -816,9 +816,9 @@ int config_write_template(const char *file, const stru #else (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "avcodec" MOD_EXT "\n"); #endif @@ -84,7 +83,7 @@ Index: src/config.c (void)re_fprintf(f, "\n# Video filter Modules (in encoding order)\n"); (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "selfview" MOD_EXT "\n"); -@@ -840,14 +840,14 @@ int config_write_template(const char *file, const stru +@@ -839,14 +839,14 @@ int config_write_template(const char *file, const stru (void)re_fprintf(f, "module\t\t\t" MOD_PRE "dshow" MOD_EXT "\n"); #else @@ -104,7 +103,7 @@ Index: src/config.c (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "cairo" MOD_EXT "\n"); (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "vidbridge" MOD_EXT "\n"); -@@ -858,16 +858,16 @@ int config_write_template(const char *file, const stru +@@ -857,16 +857,16 @@ int config_write_template(const char *file, const stru #ifdef LINUX (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "directfb" MOD_EXT "\n"); #endif @@ -125,7 +124,7 @@ Index: src/config.c (void)re_fprintf(f, "\n# Media NAT modules\n"); (void)re_fprintf(f, "module\t\t\t" MOD_PRE "stun" MOD_EXT "\n"); -@@ -876,8 +876,8 @@ int config_write_template(const char *file, const stru +@@ -875,8 +875,8 @@ int config_write_template(const char *file, const stru (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "natpmp" MOD_EXT "\n"); (void)re_fprintf(f, "\n# Media encryption modules\n"); @@ -136,14 +135,14 @@ Index: src/config.c (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "zrtp" MOD_EXT "\n"); (void)re_fprintf(f, "\n"); -@@ -894,6 +894,7 @@ int config_write_template(const char *file, const stru +@@ -893,6 +893,7 @@ int config_write_template(const char *file, const stru (void)re_fprintf(f, "# Application Modules\n"); (void)re_fprintf(f, "\n"); (void)re_fprintf(f, "module_app\t\t" MOD_PRE "auloop"MOD_EXT"\n"); + (void)re_fprintf(f, "#module_app\t\t" MOD_PRE "avahi"MOD_EXT"\n"); + (void)re_fprintf(f, "#module_app\t\t" MOD_PRE "b2bua"MOD_EXT"\n"); (void)re_fprintf(f, "module_app\t\t" MOD_PRE "contact"MOD_EXT"\n"); (void)re_fprintf(f, "module_app\t\t" MOD_PRE "debug_cmd"MOD_EXT"\n"); - #ifdef LINUX @@ -927,8 +928,8 @@ int config_write_template(const char *file, const stru (void)re_fprintf(f, "\n"); (void)re_fprintf(f, "ctrl_tcp_listen\t\t0.0.0.0:4444\n"); @@ -153,5 +152,5 @@ Index: src/config.c +// (void)re_fprintf(f, "\n"); +// (void)re_fprintf(f, "evdev_device\t\t/dev/input/event0\n"); - (void)re_fprintf(f, "\n# Speex codec parameters\n"); - (void)re_fprintf(f, "speex_quality\t\t7 # 0-10\n"); + (void)re_fprintf(f, "\n# Opus codec parameters\n"); + (void)re_fprintf(f, "opus_bitrate\t\t28000 # 6000-510000\n"); Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/telephony/baresip/baresip/pkg/PLIST-main,v retrieving revision 1.9 diff -u -p -r1.9 PLIST-main --- pkg/PLIST-main 11 Mar 2018 18:48:59 -0000 1.9 +++ pkg/PLIST-main 4 Jul 2018 18:52:47 -0000 @@ -11,6 +11,7 @@ lib/baresip/modules/auloop.so lib/baresip/modules/avahi.so lib/baresip/modules/avcodec.so lib/baresip/modules/avformat.so +lib/baresip/modules/b2bua.so lib/baresip/modules/cons.so lib/baresip/modules/contact.so lib/baresip/modules/ctrl_tcp.so @@ -40,7 +41,6 @@ lib/baresip/modules/selfview.so lib/baresip/modules/snapshot.so lib/baresip/modules/sndfile.so lib/baresip/modules/sndio.so -lib/baresip/modules/speex.so lib/baresip/modules/speex_aec.so lib/baresip/modules/speex_pp.so lib/baresip/modules/srtp.so
