telephony/baresip: update to 2.6.0

see
https://github.com/baresip/re/blob/main/CHANGELOG.md#v260---2022-08-01
https://github.com/baresip/rem/releases/tag/v2.6.0
https://github.com/baresip/baresip/releases/tag/v2.6.0

drops gsm & gstreamer1-plugins-base dependency.

note that upstream started adding cmake support, will be used in
the port when the last modules we're using are switched over (gtk)
This commit is contained in:
landry 2022-08-09 06:24:01 +00:00
parent ee058049b6
commit d57c28ae21
11 changed files with 22 additions and 35 deletions

View File

@ -3,7 +3,7 @@ COMMENT-gtk = GTK+-based modules for baresip
GH_ACCOUNT = baresip
GH_PROJECT = baresip
GH_TAGNAME = v2.4.0
GH_TAGNAME = v2.6.0
PKGNAME-main = baresip-${GH_TAGNAME:C/^v//}
PKGNAME-gtk = baresip-gtk-${GH_TAGNAME:C/^v//}
@ -13,18 +13,17 @@ COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
WANTLIB-main += X11 Xext avcodec avdevice avfilter avformat avutil
WANTLIB-main += c gsm m mosquitto mp3lame mpg123 opus png postproc
WANTLIB-main += c m mosquitto mp3lame mpg123 opus png postproc
WANTLIB-main += pthread re rem sndfile sndio spandsp speexdsp swresample
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 += glib-2.0 gobject-2.0 gstreamer-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 \
LIB_DEPENDS-main = audio/libsndfile \
audio/opencore-amr \
audio/opus \
audio/twolame \
@ -36,7 +35,7 @@ LIB_DEPENDS-main = audio/gsm \
telephony/baresip/re>=2.4.0 \
telephony/baresip/rem>=2.4.0 \
telephony/spandsp
LIB_DEPENDS-gtk = multimedia/gstreamer1/plugins-base \
LIB_DEPENDS-gtk = multimedia/gstreamer1/core \
telephony/baresip/re>=2.4.0 \
x11/gtk+3,-main
RUN_DEPENDS-gtk = telephony/baresip/baresip,-main>=1.1.0
@ -62,7 +61,6 @@ MAKE_FLAGS += MOD_AUTODETECT= \
USE_G726=yes \
USE_GSM=yes \
USE_GST= \
USE_GST_VIDEO= \
USE_H265=yes \
USE_L16=yes \
USE_MPA=yes \
@ -95,7 +93,6 @@ BUILD_PACKAGES := ${BUILD_PACKAGES:N-gtk}
.if ${BUILD_PACKAGES:M-gtk}
MAKE_FLAGS += USE_CAIRO=yes \
USE_GST=yes \
USE_GST_VIDEO=yes \
USE_GTK=yes
.endif

View File

@ -1,2 +1,2 @@
SHA256 (baresip-2.4.0.tar.gz) = WTnN1fN/Fk8sPM/fSuj0TVqkDtc8NRe92IsIDVdXhLM=
SIZE (baresip-2.4.0.tar.gz) = 1115815
SHA256 (baresip-2.6.0.tar.gz) = huBM7wiChRXMnmkM8PN9iw8facbYS9jup6cN8FsKynY=
SIZE (baresip-2.6.0.tar.gz) = 1126329

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
@@ -181,7 +181,6 @@ MODULES += contact
@@ -175,7 +175,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
@@ -633,7 +633,7 @@ static const char *default_video_device(void)
@@ -634,7 +634,7 @@ static const char *default_video_device(void)
#elif defined (WIN32)
return "dshow,nil";
#else
@ -10,12 +10,7 @@ Index: src/config.c
#endif
}
@@ -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");
- (void)re_fprintf(f, "#module\t\t\t" "evdev" MOD_EXT "\n");
+// (void)re_fprintf(f, "#module\t\t\t" "evdev" MOD_EXT "\n");
@@ -933,14 +933,14 @@ int config_write_template(const char *file, const stru
(void)re_fprintf(f, "#module\t\t\t" "httpd" MOD_EXT "\n");
(void)re_fprintf(f, "\n# Audio codec Modules (in order)\n");
@ -29,10 +24,8 @@ Index: src/config.c
+ (void)re_fprintf(f, "module\t\t\t" "g722" MOD_EXT "\n");
+ (void)re_fprintf(f, "module\t\t\t" "g726" MOD_EXT "\n");
(void)re_fprintf(f, "module\t\t\t" "g711" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" "gsm" MOD_EXT "\n");
- (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" "gsm" MOD_EXT "\n");
+ (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");
@ -69,7 +62,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");
@@ -1036,8 +1036,8 @@ int config_write_template(const char *file, const stru
@@ -1035,8 +1035,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");
@ -80,7 +73,7 @@ Index: src/config.c
(void)re_fprintf(f, "#module\t\t\t" "zrtp" MOD_EXT "\n");
(void)re_fprintf(f, "\n");
@@ -1060,7 +1060,7 @@ int config_write_template(const char *file, const stru
@@ -1059,7 +1059,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");
@ -89,7 +82,7 @@ Index: src/config.c
(void)re_fprintf(f, "\n");
(void)re_fprintf(f, "\n#------------------------------------"
@@ -1084,8 +1084,8 @@ int config_write_template(const char *file, const stru
@@ -1083,8 +1083,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,6 +1,5 @@
@conflict baresip-gtk2-*
@pkgpath telephony/baresip/baresip,-gtk2
@so lib/baresip/modules/gst.so
@so lib/baresip/modules/gst_video.so
@so lib/baresip/modules/gtk.so
@so lib/baresip/modules/vidinfo.so

View File

@ -22,7 +22,6 @@ lib/baresip/modules/
@so lib/baresip/modules/g711.so
@so lib/baresip/modules/g722.so
@so lib/baresip/modules/g726.so
@so lib/baresip/modules/gsm.so
@so lib/baresip/modules/httpd.so
@so lib/baresip/modules/ice.so
@so lib/baresip/modules/l16.so

View File

@ -2,13 +2,13 @@ COMMENT = portable library for real-time communications
GH_ACCOUNT = baresip
GH_PROJECT = re
GH_TAGNAME = v2.4.0
GH_TAGNAME = v2.6.1
# C11
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
SHARED_LIBS = re 7.0
SHARED_LIBS = re 8.0
CATEGORIES += devel
WANTLIB = crypto pthread ssl z

View File

@ -1,2 +1,2 @@
SHA256 (re-2.4.0.tar.gz) = 8rgH9tTND/c+gjPUT4FyfAExYMCzm1KLBWwtL5Oo+ic=
SIZE (re-2.4.0.tar.gz) = 376983
SHA256 (re-2.6.1.tar.gz) = Zlyd5RgdTBk9Zn6ZqiPZyTA+DuRY6X6TgGpaXrSaLYE=
SIZE (re-2.6.1.tar.gz) = 388318

View File

@ -23,7 +23,6 @@ include/re/re_ice.h
include/re/re_jbuf.h
include/re/re_json.h
include/re/re_list.h
include/re/re_lock.h
include/re/re_main.h
include/re/re_mbuf.h
include/re/re_md5.h

View File

@ -2,13 +2,13 @@ COMMENT = library for real-time audio and video processing
GH_ACCOUNT = baresip
GH_PROJECT = rem
GH_TAGNAME = v2.4.0
SHARED_LIBS = rem 2.0
GH_TAGNAME = v2.6.0
SHARED_LIBS = rem 3.0
CATEGORIES += multimedia devel
WANTLIB += m re
LIB_DEPENDS = telephony/baresip/re>=2.4.0
LIB_DEPENDS = telephony/baresip/re>=2.6.0
MAKE_FLAGS = LIB_SUFFIX=.so.${LIBrem_VERSION}
MAKE_ENV += LIBS="-lm -lre" V=1

View File

@ -1,2 +1,2 @@
SHA256 (rem-2.4.0.tar.gz) = 6cTrtj/jfc93Y48oDmGXdtTpOITZBjCEQy8Yv/ICDP4=
SIZE (rem-2.4.0.tar.gz) = 53683
SHA256 (rem-2.6.0.tar.gz) = 0lt+fhCd4UEjCg8tUMKDaHFgxPaHjchS2e0Pz8Z642k=
SIZE (rem-2.6.0.tar.gz) = 54566