telephony/baresip/baresip: major update to 2.4.0.

see https://github.com/baresip/baresip/blob/main/CHANGELOG.md#240---2022-06-01

i've been able to place calls to various sip2sip.info & other testing urls,
connect to an ippi.com account and receive calls from linphone.

disable gst modules in the default config since they trigger a crash
upon exit (cf https://github.com/baresip/baresip/issues/1928)
This commit is contained in:
landry 2022-06-28 14:13:24 +00:00
parent 94e61d56b5
commit eac7619cdf
7 changed files with 26 additions and 62 deletions

View File

@ -3,9 +3,7 @@ COMMENT-gtk = GTK+-based modules for baresip
GH_ACCOUNT = baresip
GH_PROJECT = baresip
GH_TAGNAME = v1.1.0
REVISION-gtk = 0
REVISION-main = 0
GH_TAGNAME = v2.4.0
PKGNAME-main = baresip-${GH_TAGNAME:C/^v//}
PKGNAME-gtk = baresip-gtk-${GH_TAGNAME:C/^v//}
@ -17,13 +15,12 @@ WANTLIB-main += swscale twolame v4l2 vpx opencore-amrnb
WANTLIB-gtk += atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB-gtk += glib-2.0 gobject-2.0 gstapp-1.0 gstbase-1.0 gstreamer-1.0
WANTLIB-gtk += gtk-3 harfbuzz intl mpg123 pango-1.0 pangocairo-1.0
WANTLIB-gtk += gtk-3 harfbuzz intl pango-1.0 pangocairo-1.0
WANTLIB-gtk += re
BUILD_DEPENDS = telephony/libzrtp>=0.20170512
LIB_DEPENDS-main = audio/gsm \
audio/libsndfile \
audio/mpg123 \
audio/opencore-amr \
audio/opus \
audio/twolame \
@ -32,12 +29,11 @@ LIB_DEPENDS-main = audio/gsm \
multimedia/libv4l \
multimedia/libvpx>=1.3.0 \
net/mosquitto \
telephony/baresip/re>=2.0.1 \
telephony/baresip/rem>=1.0.0 \
telephony/baresip/re>=2.4.0 \
telephony/baresip/rem>=2.4.0 \
telephony/spandsp
LIB_DEPENDS-gtk = multimedia/gstreamer1/plugins-base \
telephony/baresip/re>=2.0.1 \
audio/mpg123 \
telephony/baresip/re>=2.4.0 \
x11/gtk+3,-main
RUN_DEPENDS-gtk = telephony/baresip/baresip,-main>=1.1.0

View File

@ -1,2 +1,2 @@
SHA256 (baresip-1.1.0.tar.gz) = +SMLJ8SmLzEiOEe8SFxR89lg+KCfNpmN7bczWOF4S04=
SIZE (baresip-1.1.0.tar.gz) = 1105338
SHA256 (baresip-2.4.0.tar.gz) = WTnN1fN/Fk8sPM/fSuj0TVqkDtc8NRe92IsIDVdXhLM=
SIZE (baresip-2.4.0.tar.gz) = 1115815

View File

@ -1,7 +1,7 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -199,6 +199,7 @@ endif
@@ -260,6 +260,7 @@ endif
endif
LIBS += -lrem -lm

View File

@ -3,7 +3,7 @@ otherwise echo tries to link twice its objfile and that results in conflicting e
Index: mk/modules.mk
--- mk/modules.mk.orig
+++ mk/modules.mk
@@ -277,7 +277,6 @@ MODULES += contact
@@ -181,7 +181,6 @@ MODULES += contact
MODULES += ctrl_tcp
MODULES += debug_cmd
MODULES += ebuacip

View File

@ -1,7 +1,7 @@
Index: src/config.c
--- src/config.c.orig
+++ src/config.c
@@ -560,7 +560,7 @@ static const char *default_video_device(void)
@@ -633,7 +633,7 @@ static const char *default_video_device(void)
#elif defined (WIN32)
return "dshow,nil";
#else
@ -10,7 +10,7 @@ Index: src/config.c
#endif
}
@@ -829,26 +829,26 @@ int config_write_template(const char *file, const stru
@@ -928,19 +928,19 @@ int config_write_template(const char *file, const stru
(void)re_fprintf(f, "module\t\t\t" "stdio" MOD_EXT "\n");
#endif
(void)re_fprintf(f, "#module\t\t\t" "cons" MOD_EXT "\n");
@ -36,17 +36,9 @@ Index: src/config.c
+ (void)re_fprintf(f, "module\t\t\t" "l16" MOD_EXT "\n");
+ (void)re_fprintf(f, "module\t\t\t" "mpa" MOD_EXT "\n");
(void)re_fprintf(f, "#module\t\t\t" "codec2" MOD_EXT "\n");
(void)re_fprintf(f, "#module\t\t\t" "ilbc" MOD_EXT "\n");
(void)re_fprintf(f, "\n# Audio filter Modules (in encoding order)\n");
(void)re_fprintf(f, "#module\t\t\t" "vumeter" MOD_EXT "\n");
(void)re_fprintf(f, "#module\t\t\t" "sndfile" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" "speex_pp" MOD_EXT "\n");
+ (void)re_fprintf(f, "module\t\t\t" "speex_pp" MOD_EXT "\n");
(void)re_fprintf(f, "#module\t\t\t" "plc" MOD_EXT "\n");
(void)re_fprintf(f, "#module\t\t\t" "webrtc_aec" MOD_EXT "\n");
@@ -880,16 +880,16 @@ int config_write_template(const char *file, const stru
@@ -979,16 +979,16 @@ int config_write_template(const char *file, const stru
(void)re_fprintf(f, "#module\t\t\t" "pulse" MOD_EXT "\n");
}
#endif
@ -68,16 +60,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" "selfview" MOD_EXT "\n");
@@ -910,7 +910,7 @@ int config_write_template(const char *file, const stru
(void)re_fprintf(f, "#module\t\t\t" "v4l2" MOD_EXT "\n");
(void)re_fprintf(f, "#module\t\t\t" "v4l2_codec" MOD_EXT "\n");
#endif
- (void)re_fprintf(f, "#module\t\t\t" "x11grab" MOD_EXT "\n");
+ (void)re_fprintf(f, "module\t\t\t" "x11grab" MOD_EXT "\n");
(void)re_fprintf(f, "#module\t\t\t" "cairo" MOD_EXT "\n");
(void)re_fprintf(f, "#module\t\t\t" "vidbridge" MOD_EXT "\n");
@@ -918,16 +918,16 @@ int config_write_template(const char *file, const stru
@@ -1014,7 +1014,7 @@ int config_write_template(const char *file, const stru
#ifdef LINUX
(void)re_fprintf(f, "#module\t\t\t" "directfb" MOD_EXT "\n");
#endif
@ -86,19 +69,7 @@ Index: src/config.c
(void)re_fprintf(f, "#module\t\t\t" "sdl" MOD_EXT "\n");
(void)re_fprintf(f, "#module\t\t\t" "fakevideo" MOD_EXT "\n");
(void)re_fprintf(f, "\n# Audio/Video source modules\n");
(void)re_fprintf(f, "#module\t\t\t" "avformat" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" "rst" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" "gst" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" "gst_video" MOD_EXT "\n");
+ (void)re_fprintf(f, "module\t\t\t" "rst" MOD_EXT "\n");
+ (void)re_fprintf(f, "module\t\t\t" "gst" MOD_EXT "\n");
+ (void)re_fprintf(f, "module\t\t\t" "gst_video" MOD_EXT "\n");
(void)re_fprintf(f, "\n# Compatibility modules\n");
(void)re_fprintf(f, "#module\t\t\t" "ebuacip" MOD_EXT "\n");
@@ -940,8 +940,8 @@ int config_write_template(const char *file, const stru
@@ -1036,8 +1036,8 @@ int config_write_template(const char *file, const stru
(void)re_fprintf(f, "#module\t\t\t" "pcp" MOD_EXT "\n");
(void)re_fprintf(f, "\n# Media encryption modules\n");
@ -109,15 +80,16 @@ Index: src/config.c
(void)re_fprintf(f, "#module\t\t\t" "zrtp" MOD_EXT "\n");
(void)re_fprintf(f, "\n");
@@ -958,6 +958,7 @@ int config_write_template(const char *file, const stru
(void)re_fprintf(f, "# Application Modules\n");
@@ -1060,7 +1060,7 @@ int config_write_template(const char *file, const stru
(void)re_fprintf(f, "#module_app\t\t" "ctrl_dbus"MOD_EXT"\n");
(void)re_fprintf(f, "#module_app\t\t" "httpreq"MOD_EXT"\n");
(void)re_fprintf(f, "#module_app\t\t" "multicast"MOD_EXT"\n");
- (void)re_fprintf(f, "module_app\t\t" "netroam"MOD_EXT"\n");
+ (void)re_fprintf(f, "#module_app\t\t" "netroam"MOD_EXT"\n");
(void)re_fprintf(f, "\n");
(void)re_fprintf(f, "module_app\t\t" "auloop"MOD_EXT"\n");
+ (void)re_fprintf(f, "#module_app\t\t" "avahi"MOD_EXT"\n");
(void)re_fprintf(f, "#module_app\t\t" "b2bua"MOD_EXT"\n");
(void)re_fprintf(f, "module_app\t\t" "contact"MOD_EXT"\n");
(void)re_fprintf(f, "module_app\t\t" "debug_cmd"MOD_EXT"\n");
@@ -993,8 +994,8 @@ int config_write_template(const char *file, const stru
(void)re_fprintf(f, "\n#------------------------------------"
@@ -1084,8 +1084,8 @@ int config_write_template(const char *file, const stru
(void)re_fprintf(f, "ctrl_tcp_listen\t\t0.0.0.0:4444 # ctrl_tcp - "
"TCP interface JSON\n");

View File

@ -1,8 +1,6 @@
@conflict baresip-gtk2-*
@pkgpath telephony/baresip/baresip,-gtk2
@so lib/baresip/modules/cairo.so
@so lib/baresip/modules/gst.so
@so lib/baresip/modules/gst_video.so
@so lib/baresip/modules/gtk.so
@so lib/baresip/modules/rst.so
@so lib/baresip/modules/vidinfo.so

View File

@ -5,12 +5,12 @@ lib/baresip/modules/
@so lib/baresip/modules/account.so
@so lib/baresip/modules/amr.so
@so lib/baresip/modules/aubridge.so
@so lib/baresip/modules/auconv.so
@so lib/baresip/modules/aufile.so
@so lib/baresip/modules/auloop.so
@so lib/baresip/modules/auresamp.so
@so lib/baresip/modules/ausine.so
@so lib/baresip/modules/avcodec.so
@so lib/baresip/modules/avformat.so
@so lib/baresip/modules/b2bua.so
@so lib/baresip/modules/cons.so
@so lib/baresip/modules/contact.so
@so lib/baresip/modules/ctrl_tcp.so
@ -28,6 +28,7 @@ lib/baresip/modules/
@so lib/baresip/modules/l16.so
@so lib/baresip/modules/menu.so
@so lib/baresip/modules/mixausrc.so
@so lib/baresip/modules/mixminus.so
@so lib/baresip/modules/mpa.so
@so lib/baresip/modules/mqtt.so
@so lib/baresip/modules/multicast.so
@ -42,7 +43,6 @@ lib/baresip/modules/
@so lib/baresip/modules/snapshot.so
@so lib/baresip/modules/sndfile.so
@so lib/baresip/modules/sndio.so
@so lib/baresip/modules/speex_pp.so
@so lib/baresip/modules/srtp.so
@so lib/baresip/modules/stdio.so
@so lib/baresip/modules/stun.so
@ -53,12 +53,10 @@ lib/baresip/modules/
@so lib/baresip/modules/v4l2.so
@comment lib/baresip/modules/v4l2_codec.so
@so lib/baresip/modules/vidbridge.so
@so lib/baresip/modules/vidloop.so
@so lib/baresip/modules/vp8.so
@so lib/baresip/modules/vp9.so
@so lib/baresip/modules/vumeter.so
@so lib/baresip/modules/x11.so
@so lib/baresip/modules/x11grab.so
@so lib/baresip/modules/zrtp.so
share/baresip/
share/baresip/autoanswer.wav