Hi, update telephony/baresip/baresip 0.5.6 -> 0.5.8
There are two new modules (ctrl_tcp and mqtt; see http://lists.creytiv.com/pipermail/re-devel/2018-February/001159.html for change log). mqtt needs net/mosquitto as dependency, so register it in LIB_DEPENDS and WANTLIB. Moreover, baresip 0.5.8 requires libre v0.5.7 or later and librem v0.5.2 or later, so update the minimal required versions as well. Also regenerate a patch for the config file template to handle the new modules. Note: this needs the libre update to 0.5.7 on ports@ (https://marc.info/?l=openbsd-ports&m=152068247013771&w=2). Works fine on amd64. OK? Best regards, Ingo Index: Makefile =================================================================== RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile 30 Oct 2017 17:24:36 -0000 1.19 +++ Makefile 11 Mar 2018 08:50:55 -0000 @@ -3,15 +3,15 @@ COMMENT-main = modular SIP User-Agent with audio and video support COMMENT-gtk2 = GTK+2-based modules for baresip -V = 0.5.6 +V = 0.5.8 DISTNAME = baresip-$V 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 mpg123 opus png pthread re -WANTLIB-main += rem sndfile sndio spandsp speex speexdsp swscale twolame -WANTLIB-main += v4l2 vpx x264 x265 +WANTLIB-main += avformat avutil c gsm m mosquitto mpg123 opus png pthread +WANTLIB-main += re rem sndfile sndio spandsp speex speexdsp swscale +WANTLIB-main += twolame v4l2 vpx x264 x265 WANTLIB-gtk2 += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama WANTLIB-gtk2 += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0 @@ -33,11 +33,12 @@ LIB_DEPENDS-main = audio/gsm \ multimedia/libv4l \ multimedia/libvpx>=1.3.0 \ net/avahi \ - telephony/baresip/re>=0.5.4 \ - telephony/baresip/rem>=0.5.0 \ + net/mosquitto \ + telephony/baresip/re>=0.5.7 \ + telephony/baresip/rem>=0.5.2 \ telephony/spandsp LIB_DEPENDS-gtk2 = multimedia/gstreamer1/plugins-base \ - telephony/baresip/re>=0.5.4 \ + telephony/baresip/re>=0.5.7 \ x11/gtk+2,-main RUN_DEPENDS-gtk2 = telephony/baresip/baresip,-main>=$V \ @@ -46,6 +47,7 @@ MAKE_ENV += LIBRE_INC=${LOCALBASE}/incl MAKE_FLAGS += MOD_AUTODETECT= \ EXTRA_MODULES="echo snapshot sndio swscale" \ + HAVE_LIBMQTT=yes \ HAVE_LIBV4L2=yes \ HAVE_SPEEXDSP=yes \ USE_AMR=yes \ Index: distinfo =================================================================== RCS file: /cvs/ports/telephony/baresip/baresip/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 30 Oct 2017 17:24:36 -0000 1.13 +++ distinfo 11 Mar 2018 08:50:55 -0000 @@ -1,2 +1,2 @@ -SHA256 (baresip-0.5.6.tar.gz) = FI3v7xYIQuAkevkshLsMjeSzb/pozzqHxM1+UQzd0Aw= -SIZE (baresip-0.5.6.tar.gz) = 554503 +SHA256 (baresip-0.5.8.tar.gz) = 2fEdpQ/WyTWatHhhi108EyR0qDj+n2aMJJ+dWgfyZmI= +SIZE (baresip-0.5.8.tar.gz) = 584406 Index: patches/patch-src_config_c =================================================================== RCS file: /cvs/ports/telephony/baresip/baresip/patches/patch-src_config_c,v retrieving revision 1.12 diff -u -p -r1.12 patch-src_config_c --- patches/patch-src_config_c 30 Oct 2017 17:24:36 -0000 1.12 +++ patches/patch-src_config_c 11 Mar 2018 08:50:55 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-src_config_c,v 1.12 2017 Index: src/config.c --- src/config.c.orig +++ src/config.c -@@ -390,7 +390,7 @@ static const char *default_video_device(void) +@@ -505,7 +505,7 @@ static const char *default_video_device(void) #endif #else @@ -11,7 +11,7 @@ Index: src/config.c #endif } -@@ -617,31 +617,31 @@ int config_write_template(const char *file, const stru +@@ -753,31 +753,31 @@ 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"); @@ -60,7 +60,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"); -@@ -660,8 +660,8 @@ int config_write_template(const char *file, const stru +@@ -796,8 +796,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 +71,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"); -@@ -673,9 +673,9 @@ int config_write_template(const char *file, const stru +@@ -809,9 +809,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 +84,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"); -@@ -696,14 +696,14 @@ int config_write_template(const char *file, const stru +@@ -832,14 +832,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 +104,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"); -@@ -714,16 +714,16 @@ int config_write_template(const char *file, const stru +@@ -850,16 +850,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 +125,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"); -@@ -732,8 +732,8 @@ int config_write_template(const char *file, const stru +@@ -868,8 +868,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,7 +136,7 @@ Index: src/config.c (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "zrtp" MOD_EXT "\n"); (void)re_fprintf(f, "\n"); -@@ -750,6 +750,7 @@ int config_write_template(const char *file, const stru +@@ -886,6 +886,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"); @@ -144,9 +144,9 @@ Index: src/config.c (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 -@@ -778,8 +779,8 @@ int config_write_template(const char *file, const stru +@@ -919,8 +920,8 @@ int config_write_template(const char *file, const stru (void)re_fprintf(f, "\n"); - (void)re_fprintf(f, "http_listen\t\t0.0.0.0:8000\n"); + (void)re_fprintf(f, "ctrl_tcp_listen\t\t0.0.0.0:4444\n"); - (void)re_fprintf(f, "\n"); - (void)re_fprintf(f, "evdev_device\t\t/dev/input/event0\n"); Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/telephony/baresip/baresip/pkg/PLIST-main,v retrieving revision 1.8 diff -u -p -r1.8 PLIST-main --- pkg/PLIST-main 30 Oct 2017 17:24:36 -0000 1.8 +++ pkg/PLIST-main 11 Mar 2018 08:50:55 -0000 @@ -13,6 +13,7 @@ lib/baresip/modules/avcodec.so lib/baresip/modules/avformat.so lib/baresip/modules/cons.so lib/baresip/modules/contact.so +lib/baresip/modules/ctrl_tcp.so lib/baresip/modules/debug_cmd.so lib/baresip/modules/dtls_srtp.so lib/baresip/modules/echo.so @@ -27,6 +28,7 @@ lib/baresip/modules/ice.so lib/baresip/modules/l16.so lib/baresip/modules/menu.so lib/baresip/modules/mpa.so +lib/baresip/modules/mqtt.so lib/baresip/modules/mwi.so lib/baresip/modules/natbd.so lib/baresip/modules/natpmp.so
