Le Fri, Jun 04, 2021 at 07:33:31PM +0200, Landry Breuil a écrit :
> Hi,
>
> here's an update for telephony/baresip dir, upstream at creytiv.com is
> dead so there's a new upstream alive at github. for restund i found
> another fork dead since 5 years so i dunno if its worth updating to it
> (https://github.com/otalk/restund)
Now with 100% more testing with accounts from sip2sip.info and ippi.com,
and against freepbx too. As good as it can get.. video untested. Enabled
avcodec module so that gstreamer finds the x264dec codec otherwise it
complains.
baresip/patches/patch-src_stream_c is a test to try fixing dtls_srtp at
runtime (cf https://github.com/baresip/baresip/issues/763) so unneeded
for now in cvs, same thing for re/patch-src_rtmp_conn_c which is fixed
by the mk/re.mk chunk added.
Renamed the gtk2 subpackage to -gtk with the necessary bits for the
upgrade path (quirks diff needed attached).
Now looking for okays.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1267
diff -u -r1.1267 Makefile
--- Makefile 12 Jun 2021 05:40:15 -0000 1.1267
+++ Makefile 14 Jun 2021 10:17:32 -0000
@@ -5,7 +5,7 @@
DISTFILES =
# API.rev
-PKGNAME = quirks-4.20
+PKGNAME = quirks-4.21
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1283
diff -u -r1.1283 Quirks.pm
--- files/Quirks.pm 12 Jun 2021 05:40:15 -0000 1.1283
+++ files/Quirks.pm 14 Jun 2021 10:17:32 -0000
@@ -468,6 +468,7 @@
'py-pyRFC3339' => 'py3-pyRFC3339',
'py-libarchive-c' => 'py3-libarchive-c',
'py-minimalmodbus' => 'py3-minimalmodbus',
+ 'baresip-gtk2' => 'baresip-gtk',
};
my $obsolete_reason = {};
? libre
? librem
? baresip/notes.txt
? baresip/patches/patch-src_stream_c
? re/patch-src_rtmp_conn_c
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/telephony/baresip/Makefile.inc,v
retrieving revision 1.10
diff -u -r1.10 Makefile.inc
--- Makefile.inc 12 Jul 2019 20:49:55 -0000 1.10
+++ Makefile.inc 14 Jun 2021 09:42:02 -0000
@@ -2,9 +2,6 @@
CATEGORIES = telephony
-HOMEPAGE = http://www.creytiv.com/
-MASTER_SITES ?= ${HOMEPAGE:=pub/}
-
# Code is BSD-licensed, but zrtp.so module is statically linked to AGPLv3-
# licensed libzrtp. As a result, main baresip package is subject to AGPLv3.
PERMIT_PACKAGE = Yes
Index: baresip/Makefile
===================================================================
RCS file: /cvs/ports/telephony/baresip/baresip/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- baresip/Makefile 31 Jan 2021 08:57:06 -0000 1.27
+++ baresip/Makefile 14 Jun 2021 09:42:02 -0000
@@ -1,26 +1,23 @@
# $OpenBSD: Makefile,v 1.27 2021/01/31 08:57:06 ajacoutot Exp $
COMMENT-main = modular SIP User-Agent with audio and video support
-COMMENT-gtk2 = GTK+2-based modules for baresip
-
-V = 0.5.11
-DISTNAME = baresip-$V
-PKGNAME-main = baresip-$V
-PKGNAME-gtk2 = baresip-gtk2-$V
-REVISION-gtk2 = 1
-REVISION-main = 0
-
-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 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
-WANTLIB-gtk2 += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gstapp-1.0
-WANTLIB-gtk2 += gstbase-1.0 gstreamer-1.0 gtk-x11-2.0 harfbuzz intl mpg123
-WANTLIB-gtk2 += pango-1.0 pangocairo-1.0 pangoft2-1.0 re z
+COMMENT-gtk = GTK+2-based modules for baresip
+GH_ACCOUNT = baresip
+GH_PROJECT = baresip
+GH_TAGNAME = v1.1.0
+PKGNAME-main = baresip-${GH_TAGNAME:C/^v//}
+PKGNAME-gtk = baresip-gtk-${GH_TAGNAME:C/^v//}
+
+WANTLIB-main += X11 Xext avcodec avdevice avfilter avformat avutil
+WANTLIB-main += c gsm m mosquitto mp3lame mpg123 opus png postproc
+WANTLIB-main += pthread re rem sndfile sndio spandsp speexdsp swresample
+WANTLIB-main += swscale twolame v4l2 vpx
+
+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 += re
BUILD_DEPENDS = telephony/libzrtp>=0.20170512
LIB_DEPENDS-main = audio/gsm \
@@ -28,27 +25,27 @@
audio/mpg123 \
audio/opus \
audio/twolame \
- devel/sdl2 \
graphics/ffmpeg \
graphics/png \
multimedia/libv4l \
multimedia/libvpx>=1.3.0 \
- net/avahi \
net/mosquitto \
- telephony/baresip/re>=0.5.7 \
- telephony/baresip/rem>=0.5.3 \
+ telephony/baresip/re>=2.0.1 \
+ telephony/baresip/rem>=1.0.0 \
telephony/spandsp
-LIB_DEPENDS-gtk2 = multimedia/gstreamer1/plugins-base \
- telephony/baresip/re>=0.5.7 \
- x11/gtk+2,-main
-RUN_DEPENDS-gtk2 = telephony/baresip/baresip,-main>=$V \
+LIB_DEPENDS-gtk = multimedia/gstreamer1/plugins-base \
+ telephony/baresip/re>=2.0.1 \
+ audio/mpg123 \
+ x11/gtk+3,-main
+RUN_DEPENDS-gtk = telephony/baresip/baresip,-main>=1.1.0 \
+ multimedia/gstreamer1/plugins-ugly
MAKE_ENV += LIBRE_INC=${LOCALBASE}/include/re \
LIBRE_SO=${LOCALBASE}/lib LIBS="-lm -lrem" \
MAKE_FLAGS += MOD_AUTODETECT= \
EXTRA_MODULES="echo snapshot sndio swscale" \
- HAVE_LIBMQTT=yes \
+ USE_MQTT=yes \
HAVE_LIBV4L2=yes \
HAVE_SPEEXDSP=yes \
USE_AMR=yes \
@@ -84,20 +81,20 @@
USE_X11=yes \
USE_ZRTP=yes
-MULTI_PACKAGES = -main -gtk2
-PSEUDO_FLAVORS = no_gtk2
+MULTI_PACKAGES = -main -gtk
+PSEUDO_FLAVORS = no_gtk
FLAVOR ?=
.include <bsd.port.arch.mk>
-.if ${FLAVOR:L:Mno_gtk2}
-BUILD_PACKAGES := ${BUILD_PACKAGES:N-gtk2}
+.if ${FLAVOR:L:Mno_gtk}
+BUILD_PACKAGES := ${BUILD_PACKAGES:N-gtk}
.endif
-.if ${BUILD_PACKAGES:M-gtk2}
+.if ${BUILD_PACKAGES:M-gtk}
MAKE_FLAGS += USE_CAIRO=yes \
- USE_GST1=yes \
- USE_GST_VIDEO1=yes \
+ USE_GST=yes \
+ USE_GST_VIDEO=yes \
USE_GTK=yes
.endif
Index: baresip/distinfo
===================================================================
RCS file: /cvs/ports/telephony/baresip/baresip/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- baresip/distinfo 28 Oct 2018 10:46:02 -0000 1.17
+++ baresip/distinfo 14 Jun 2021 09:42:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (baresip-0.5.11.tar.gz) = BPj9xg7DFrHNRelh2QVcRqoZSOXYtzOJKNj88ih1Yt8=
-SIZE (baresip-0.5.11.tar.gz) = 599165
+SHA256 (baresip-1.1.0.tar.gz) = +SMLJ8SmLzEiOEe8SFxR89lg+KCfNpmN7bczWOF4S04=
+SIZE (baresip-1.1.0.tar.gz) = 1105338
Index: baresip/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/baresip/baresip/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile
--- baresip/patches/patch-Makefile 2 May 2018 19:21:53 -0000 1.4
+++ baresip/patches/patch-Makefile 14 Jun 2021 09:42:02 -0000
@@ -3,11 +3,11 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -146,6 +146,7 @@ MOD_LFLAGS += -L$(SYSROOT)/local/lib
+@@ -199,6 +199,7 @@ endif
endif
LIBS += -lrem -lm
-+LIBS += -lpthread
- LIBS += -L$(SYSROOT)/lib
++LIBS += -pthread
+ #LIBS += -L$(SYSROOT)/lib
ifeq ($(OS),win32)
Index: baresip/patches/patch-mk_modules_mk
===================================================================
RCS file: baresip/patches/patch-mk_modules_mk
diff -N baresip/patches/patch-mk_modules_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ baresip/patches/patch-mk_modules_mk 14 Jun 2021 09:42:02 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+otherwise echo tries to link twice its objfile and that results in conflicting
exports
+
+Index: mk/modules.mk
+--- mk/modules.mk.orig
++++ mk/modules.mk
+@@ -277,7 +277,6 @@ MODULES += contact
+ MODULES += ctrl_tcp
+ MODULES += debug_cmd
+ MODULES += ebuacip
+-MODULES += echo
+ MODULES += fakevideo
+ MODULES += httpd
+ MODULES += ice
Index: baresip/patches/patch-modules_zrtp_module_mk
===================================================================
RCS file:
/cvs/ports/telephony/baresip/baresip/patches/patch-modules_zrtp_module_mk,v
retrieving revision 1.4
diff -u -r1.4 patch-modules_zrtp_module_mk
--- baresip/patches/patch-modules_zrtp_module_mk 3 Aug 2018 12:20:06
-0000 1.4
+++ baresip/patches/patch-modules_zrtp_module_mk 14 Jun 2021 09:42:02
-0000
@@ -9,5 +9,5 @@
-$(MOD)_LFLAGS += -lzrtp -lbn
+$(MOD)_LFLAGS += -lzrtp
$(MOD)_CFLAGS += -isystem /usr/local/include/libzrtp
- $(MOD)_CFLAGS += -Wno-strict-prototypes
+ $(MOD)_CFLAGS += -Wno-strict-prototypes -Wno-zero-length-array
Index: baresip/patches/patch-src_config_c
===================================================================
RCS file: /cvs/ports/telephony/baresip/baresip/patches/patch-src_config_c,v
retrieving revision 1.16
diff -u -r1.16 patch-src_config_c
--- baresip/patches/patch-src_config_c 28 Oct 2018 10:46:02 -0000 1.16
+++ baresip/patches/patch-src_config_c 14 Jun 2021 09:42:02 -0000
@@ -3,7 +3,7 @@
Index: src/config.c
--- src/config.c.orig
+++ src/config.c
-@@ -503,7 +503,7 @@ static const char *default_video_device(void)
+@@ -560,7 +560,7 @@ static const char *default_video_device(void)
#elif defined (WIN32)
return "dshow,nil";
#else
@@ -12,140 +12,116 @@
#endif
}
-@@ -748,30 +748,30 @@ int config_write_template(const char *file, const stru
- (void)re_fprintf(f, "module\t\t\t" MOD_PRE "stdio" MOD_EXT "\n");
+@@ -829,26 +829,26 @@ 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" MOD_PRE "cons" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "evdev" MOD_EXT "\n");
-+// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "evdev" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "httpd" MOD_EXT "\n");
+ (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");
+ (void)re_fprintf(f, "#module\t\t\t" "httpd" MOD_EXT "\n");
(void)re_fprintf(f, "\n# Audio codec Modules (in order)\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "opus" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "silk" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "amr" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "g7221" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "g722" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "g726" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "opus" MOD_EXT "\n");
-+// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "silk" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "amr" MOD_EXT "\n");
-+// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "g7221" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "g722" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "g726" MOD_EXT "\n");
- (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 "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");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "ilbc" MOD_EXT "\n");
-- (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 "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");
-+// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "ilbc" MOD_EXT "\n");
-+// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "isac" MOD_EXT "\n");
+- (void)re_fprintf(f, "#module\t\t\t" "opus" MOD_EXT "\n");
+- (void)re_fprintf(f, "#module\t\t\t" "amr" MOD_EXT "\n");
++ (void)re_fprintf(f, "module\t\t\t" "opus" MOD_EXT "\n");
++ (void)re_fprintf(f, "module\t\t\t" "amr" MOD_EXT "\n");
+ (void)re_fprintf(f, "#module\t\t\t" "g7221" MOD_EXT "\n");
+- (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" "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");
+ (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" MOD_PRE "vumeter" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "sndfile" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "speex_aec" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "speex_pp" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "speex_aec" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "speex_pp" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "plc" MOD_EXT "\n");
-
- (void)re_fprintf(f, "\n# Audio driver Modules\n");
-@@ -790,8 +790,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
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "jack" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "portaudio" MOD_EXT "\n");
-+// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "jack" MOD_EXT "\n");
-+// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "portaudio" MOD_EXT "\n");
- (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");
-
-@@ -803,9 +803,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
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "vp8" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "vp9" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "h265" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "vp8" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "vp9" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "h265" MOD_EXT "\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
+ (void)re_fprintf(f, "#module\t\t\t" "pulse" MOD_EXT "\n");
+ }
+ #endif
+- (void)re_fprintf(f, "#module\t\t\t" "jack" MOD_EXT "\n");
+- (void)re_fprintf(f, "#module\t\t\t" "portaudio" MOD_EXT "\n");
++// (void)re_fprintf(f, "#module\t\t\t" "jack" MOD_EXT "\n");
++// (void)re_fprintf(f, "#module\t\t\t" "portaudio" MOD_EXT "\n");
+ (void)re_fprintf(f, "#module\t\t\t" "aubridge" MOD_EXT "\n");
+ (void)re_fprintf(f, "#module\t\t\t" "aufile" MOD_EXT "\n");
+ (void)re_fprintf(f, "#module\t\t\t" "ausine" MOD_EXT "\n");
+
+ (void)re_fprintf(f, "\n# Video codec Modules (in order)\n");
+- (void)re_fprintf(f, "#module\t\t\t" "avcodec" MOD_EXT "\n");
+- (void)re_fprintf(f, "#module\t\t\t" "vp8" MOD_EXT "\n");
+- (void)re_fprintf(f, "#module\t\t\t" "vp9" MOD_EXT "\n");
++ (void)re_fprintf(f, "module\t\t\t" "avcodec" MOD_EXT "\n");
++ (void)re_fprintf(f, "module\t\t\t" "vp8" MOD_EXT "\n");
++ (void)re_fprintf(f, "module\t\t\t" "vp9" MOD_EXT "\n");
(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");
-@@ -826,14 +826,14 @@ int config_write_template(const char *file, const stru
- (void)re_fprintf(f, "module\t\t\t" MOD_PRE "dshow" MOD_EXT "\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");
- #else
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "v4l" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "v4l2" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "v4l2_codec" MOD_EXT "\n");
-+// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "v4l" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "v4l2" MOD_EXT "\n");
-+// (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "v4l2_codec" MOD_EXT "\n");
- #endif
- #ifdef USE_AVFORMAT
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "avformat" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "avformat" MOD_EXT "\n");
- #endif
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "x11grab" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "x11grab" MOD_EXT "\n");
- (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");
-
-@@ -844,16 +844,16 @@ int config_write_template(const char *file, const stru
+@@ -918,16 +918,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");
+ (void)re_fprintf(f, "#module\t\t\t" "directfb" MOD_EXT "\n");
#endif
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "x11" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "x11" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "sdl2" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "fakevideo" MOD_EXT "\n");
+- (void)re_fprintf(f, "#module\t\t\t" "x11" MOD_EXT "\n");
++ (void)re_fprintf(f, "module\t\t\t" "x11" MOD_EXT "\n");
+ (void)re_fprintf(f, "#module\t\t\t" "sdl" MOD_EXT "\n");
+ (void)re_fprintf(f, "#module\t\t\t" "fakevideo" MOD_EXT "\n");
- #endif /* USE_VIDEO */
(void)re_fprintf(f, "\n# Audio/Video source modules\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "rst" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "gst1" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "gst_video1" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "rst" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "gst1" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "gst_video1" MOD_EXT "\n");
-
- (void)re_fprintf(f, "\n# Media NAT modules\n");
- (void)re_fprintf(f, "module\t\t\t" MOD_PRE "stun" MOD_EXT "\n");
-@@ -862,8 +862,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, "#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
+ (void)re_fprintf(f, "#module\t\t\t" "pcp" MOD_EXT "\n");
(void)re_fprintf(f, "\n# Media encryption modules\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "srtp" MOD_EXT "\n");
-- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "dtls_srtp" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "srtp" MOD_EXT "\n");
-+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "dtls_srtp" MOD_EXT "\n");
- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "zrtp" MOD_EXT "\n");
+- (void)re_fprintf(f, "#module\t\t\t" "srtp" MOD_EXT "\n");
+- (void)re_fprintf(f, "#module\t\t\t" "dtls_srtp" MOD_EXT "\n");
++ (void)re_fprintf(f, "module\t\t\t" "srtp" MOD_EXT "\n");
++ (void)re_fprintf(f, "module\t\t\t" "dtls_srtp" MOD_EXT "\n");
+ (void)re_fprintf(f, "#module\t\t\t" "zrtp" MOD_EXT "\n");
(void)re_fprintf(f, "\n");
-@@ -880,6 +880,7 @@ int config_write_template(const char *file, const stru
+@@ -958,6 +958,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");
-@@ -914,8 +915,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");
+ (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, "ctrl_tcp_listen\t\t0.0.0.0:4444 # ctrl_tcp - "
+ "TCP interface JSON\n");
- (void)re_fprintf(f, "\n");
- (void)re_fprintf(f, "evdev_device\t\t/dev/input/event0\n");
Index: baresip/pkg/DESCR-gtk
===================================================================
RCS file: baresip/pkg/DESCR-gtk
diff -N baresip/pkg/DESCR-gtk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ baresip/pkg/DESCR-gtk 14 Jun 2021 09:42:02 -0000
@@ -0,0 +1 @@
+GTK+-based user interface and GStreamer modules for baresip.
Index: baresip/pkg/DESCR-gtk2
===================================================================
RCS file: baresip/pkg/DESCR-gtk2
diff -N baresip/pkg/DESCR-gtk2
--- baresip/pkg/DESCR-gtk2 2 Oct 2015 19:32:08 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-GTK+2-based user interface and GStreamer modules for baresip.
Index: baresip/pkg/PLIST-gtk
===================================================================
RCS file: baresip/pkg/PLIST-gtk
diff -N baresip/pkg/PLIST-gtk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ baresip/pkg/PLIST-gtk 14 Jun 2021 09:42:02 -0000
@@ -0,0 +1,9 @@
+@comment $OpenBSD$
+@conflict baresip-gtk2-*
+@pkgpath telephony/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
Index: baresip/pkg/PLIST-gtk2
===================================================================
RCS file: baresip/pkg/PLIST-gtk2
diff -N baresip/pkg/PLIST-gtk2
--- baresip/pkg/PLIST-gtk2 26 Dec 2016 14:53:25 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PLIST-gtk2,v 1.2 2016/12/26 14:53:25 czarkoff Exp $
-lib/baresip/modules/cairo.so
-lib/baresip/modules/gst1.so
-lib/baresip/modules/gst_video1.so
-lib/baresip/modules/gtk.so
-lib/baresip/modules/rst.so
-lib/baresip/modules/vidinfo.so
Index: baresip/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/baresip/baresip/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -r1.10 PLIST-main
--- baresip/pkg/PLIST-main 3 Aug 2018 12:20:06 -0000 1.10
+++ baresip/pkg/PLIST-main 14 Jun 2021 09:42:02 -0000
@@ -3,64 +3,66 @@
@bin bin/baresip
lib/baresip/
lib/baresip/modules/
-lib/baresip/modules/account.so
-lib/baresip/modules/amr.so
-lib/baresip/modules/aubridge.so
-lib/baresip/modules/aufile.so
-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
-lib/baresip/modules/debug_cmd.so
-lib/baresip/modules/dtls_srtp.so
-lib/baresip/modules/echo.so
-lib/baresip/modules/fakevideo.so
-lib/baresip/modules/g711.so
-lib/baresip/modules/g722.so
-lib/baresip/modules/g726.so
-lib/baresip/modules/gsm.so
-lib/baresip/modules/h265.so
-lib/baresip/modules/httpd.so
-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
-lib/baresip/modules/opus.so
-lib/baresip/modules/plc.so
-lib/baresip/modules/presence.so
-lib/baresip/modules/sdl2.so
-lib/baresip/modules/selfview.so
-lib/baresip/modules/snapshot.so
-lib/baresip/modules/sndfile.so
-lib/baresip/modules/sndio.so
-lib/baresip/modules/speex_aec.so
-lib/baresip/modules/speex_pp.so
-lib/baresip/modules/srtp.so
-lib/baresip/modules/stdio.so
-lib/baresip/modules/stun.so
-lib/baresip/modules/swscale.so
-lib/baresip/modules/syslog.so
-lib/baresip/modules/turn.so
-lib/baresip/modules/uuid.so
-lib/baresip/modules/v4l2.so
+@so lib/baresip/modules/account.so
+@so lib/baresip/modules/amr.so
+@so lib/baresip/modules/aubridge.so
+@so lib/baresip/modules/aufile.so
+@so lib/baresip/modules/auloop.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
+@so lib/baresip/modules/debug_cmd.so
+@so lib/baresip/modules/dtls_srtp.so
+@so lib/baresip/modules/ebuacip.so
+@so lib/baresip/modules/echo.so
+@so lib/baresip/modules/fakevideo.so
+@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
+@so lib/baresip/modules/menu.so
+@so lib/baresip/modules/mixausrc.so
+@so lib/baresip/modules/mpa.so
+@so lib/baresip/modules/mqtt.so
+@so lib/baresip/modules/multicast.so
+@so lib/baresip/modules/mwi.so
+@so lib/baresip/modules/natpmp.so
+@so lib/baresip/modules/opus.so
+@so lib/baresip/modules/plc.so
+@so lib/baresip/modules/presence.so
+@so lib/baresip/modules/rtcpsummary.so
+@so lib/baresip/modules/selfview.so
+@so lib/baresip/modules/serreg.so
+@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
+@so lib/baresip/modules/swscale.so
+@so lib/baresip/modules/syslog.so
+@so lib/baresip/modules/turn.so
+@so lib/baresip/modules/uuid.so
+@so lib/baresip/modules/v4l2.so
@comment lib/baresip/modules/v4l2_codec.so
-lib/baresip/modules/vidbridge.so
-lib/baresip/modules/vidloop.so
-lib/baresip/modules/vp8.so
-lib/baresip/modules/vp9.so
-lib/baresip/modules/vumeter.so
-lib/baresip/modules/x11.so
-lib/baresip/modules/x11grab.so
-lib/baresip/modules/zrtp.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
share/baresip/busy.wav
share/baresip/callwaiting.wav
share/baresip/error.wav
@@ -69,3 +71,19 @@
share/baresip/notfound.wav
share/baresip/ring.wav
share/baresip/ringback.wav
+share/baresip/sound0.wav
+share/baresip/sound1.wav
+share/baresip/sound2.wav
+share/baresip/sound3.wav
+share/baresip/sound4.wav
+share/baresip/sound5.wav
+share/baresip/sound6.wav
+share/baresip/sound7.wav
+share/baresip/sound8.wav
+share/baresip/sound9.wav
+share/baresip/sounda.wav
+share/baresip/soundb.wav
+share/baresip/soundc.wav
+share/baresip/soundd.wav
+share/baresip/soundroute.wav
+share/baresip/soundstar.wav
Index: re/Makefile
===================================================================
RCS file: /cvs/ports/telephony/baresip/re/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- re/Makefile 24 Apr 2019 16:26:57 -0000 1.21
+++ re/Makefile 14 Jun 2021 09:42:02 -0000
@@ -2,11 +2,11 @@
COMMENT = portable library for real-time communications
-V = 0.5.9
-DISTNAME = re-${V}
-SHARED_LIBS = re 5.1
+GH_ACCOUNT = baresip
+GH_PROJECT = re
+GH_TAGNAME = v2.0.1
+SHARED_LIBS = re 6.0
CATEGORIES += devel
-REVISION = 0
WANTLIB = crypto pthread ssl z
Index: re/distinfo
===================================================================
RCS file: /cvs/ports/telephony/baresip/re/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- re/distinfo 28 Oct 2018 10:46:02 -0000 1.16
+++ re/distinfo 14 Jun 2021 09:42:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (re-0.5.9.tar.gz) = iCugXK534HCZrdHSQZWGPQj83f72LRWG2NB/FyG1lhI=
-SIZE (re-0.5.9.tar.gz) = 301753
+SHA256 (re-2.0.1.tar.gz) = Q6pDm5av91/ldoufnUneqXBC5C52R99Hs0VGV2Pi9+0=
+SIZE (re-2.0.1.tar.gz) = 342897
Index: re/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/baresip/re/patches/patch-Makefile,v
retrieving revision 1.10
diff -u -r1.10 patch-Makefile
--- re/patches/patch-Makefile 28 Oct 2018 10:46:02 -0000 1.10
+++ re/patches/patch-Makefile 14 Jun 2021 09:42:02 -0000
@@ -2,9 +2,9 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -12,10 +12,6 @@ VER_PATCH := 9
+@@ -20,10 +20,6 @@ ABI_MAJOR := $(shell expr $(ABI_CUR) - $(ABI_AGE))
PROJECT := re
- VERSION := 0.5.9
+ VERSION := $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
-MK := mk/re.mk
-
@@ -13,7 +13,18 @@
# List of modules
MODULES += sip sipevent sipreg sipsess
MODULES += uri http httpauth msg websock
-@@ -63,13 +59,11 @@ all: $(SHARED) $(STATIC)
+@@ -54,6 +50,10 @@ endif
+ INCDIR := $(PREFIX)/include/re
+ MKDIR := $(PREFIX)/share/re
+ CFLAGS += -Iinclude
++CFLAGS += \
++ -DVER_MAJOR=$(VER_MAJOR) \
++ -DVER_MINOR=$(VER_MINOR) \
++ -DVER_PATCH=$(VER_PATCH)
+
+ MODMKS := $(patsubst %,src/%/mod.mk,$(MODULES))
+ SHARED := libre$(LIB_SUFFIX)
+@@ -78,13 +78,11 @@ all: $(SHARED) $(STATIC)
$(SHARED): $(OBJS)
@@ -29,7 +40,7 @@
ifneq ($(RANLIB),)
@$(RANLIB) $@
endif
-@@ -88,12 +82,11 @@ libre.pc:
+@@ -103,12 +101,11 @@ libre.pc:
@echo 'Libs.private: -L$${libdir} -lre ${LIBS}' >> libre.pc
@echo 'Cflags: -I$${includedir}' >> libre.pc
@@ -45,15 +56,15 @@
@mkdir -p $(patsubst %,$(BUILD)/%,$(sort $(dir $(SRCS))))
@touch $@
-@@ -111,7 +104,6 @@ install: $(SHARED) $(STATIC) libre.pc
- $(INSTALL) -m 0755 $(SHARED) $(DESTDIR)$(LIBDIR)
+@@ -132,7 +129,6 @@ else
+ endif
$(INSTALL) -m 0755 $(STATIC) $(DESTDIR)$(LIBDIR)
$(INSTALL) -m 0644 libre.pc $(DESTDIR)$(LIBDIR)/pkgconfig
- $(INSTALL) -m 0644 $(MK) $(DESTDIR)$(MKDIR)
uninstall:
@rm -rf $(DESTDIR)$(INCDIR)
-@@ -122,13 +114,11 @@ uninstall:
+@@ -144,13 +140,11 @@ uninstall:
-include test.d
Index: re/pkg/PLIST
===================================================================
RCS file: /cvs/ports/telephony/baresip/re/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- re/pkg/PLIST 12 Jan 2016 09:22:08 -0000 1.2
+++ re/pkg/PLIST 14 Jun 2021 09:42:02 -0000
@@ -29,6 +29,7 @@
include/re/re_natbd.h
include/re/re_net.h
include/re/re_odict.h
+include/re/re_rtmp.h
include/re/re_rtp.h
include/re/re_sa.h
include/re/re_sdp.h
@@ -44,10 +45,11 @@
include/re/re_telev.h
include/re/re_tls.h
include/re/re_tmr.h
+include/re/re_trace.h
include/re/re_turn.h
include/re/re_types.h
include/re/re_udp.h
include/re/re_uri.h
include/re/re_websock.h
-lib/libre.a
+@static-lib lib/libre.a
@lib lib/libre.so.${LIBre_VERSION}
Index: rem/Makefile
===================================================================
RCS file: /cvs/ports/telephony/baresip/rem/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- rem/Makefile 24 Apr 2019 16:26:57 -0000 1.10
+++ rem/Makefile 14 Jun 2021 09:42:02 -0000
@@ -2,11 +2,11 @@
COMMENT = library for real-time audio and video processing
-V = 0.5.3
-DISTNAME = rem-${V}
-SHARED_LIBS = rem 0.4
+GH_ACCOUNT = baresip
+GH_PROJECT = rem
+GH_TAGNAME = v1.0.0
+SHARED_LIBS = rem 1.0
CATEGORIES += multimedia devel
-REVISION = 0
WANTLIB += m re
Index: rem/distinfo
===================================================================
RCS file: /cvs/ports/telephony/baresip/rem/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- rem/distinfo 7 May 2018 07:20:16 -0000 1.6
+++ rem/distinfo 14 Jun 2021 09:42:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (rem-0.5.3.tar.gz) = n5inmUfUcJKCpXkaww8O2gPV00CG8233S/9PiqwOgFA=
-SIZE (rem-0.5.3.tar.gz) = 40417
+SHA256 (rem-1.0.0.tar.gz) = vMkbtSH64YM1f7QisAo5gUd6IumdOv4WXE7FCmu+2do=
+SIZE (rem-1.0.0.tar.gz) = 47190
Index: rem/pkg/PLIST
===================================================================
RCS file: /cvs/ports/telephony/baresip/rem/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- rem/pkg/PLIST 30 Oct 2017 17:22:21 -0000 1.3
+++ rem/pkg/PLIST 14 Jun 2021 09:42:02 -0000
@@ -1,22 +1,27 @@
@comment $OpenBSD: PLIST,v 1.3 2017/10/30 17:22:21 feinerer Exp $
include/rem/
include/rem/rem.h
+include/rem/rem_aac.h
include/rem/rem_au.h
include/rem/rem_aubuf.h
include/rem/rem_auconv.h
include/rem/rem_audio.h
include/rem/rem_aufile.h
+include/rem/rem_aulevel.h
include/rem/rem_aumix.h
include/rem/rem_auresamp.h
include/rem/rem_autone.h
+include/rem/rem_avc.h
include/rem/rem_dsp.h
include/rem/rem_dtmf.h
include/rem/rem_fir.h
+include/rem/rem_flv.h
include/rem/rem_g711.h
include/rem/rem_goertzel.h
+include/rem/rem_h264.h
include/rem/rem_vid.h
include/rem/rem_vidconv.h
include/rem/rem_video.h
include/rem/rem_vidmix.h
-lib/librem.a
+@static-lib lib/librem.a
@lib lib/librem.so.${LIBrem_VERSION}
Index: restund/Makefile
===================================================================
RCS file: /cvs/ports/telephony/baresip/restund/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- restund/Makefile 24 Apr 2019 16:26:57 -0000 1.9
+++ restund/Makefile 14 Jun 2021 09:42:02 -0000
@@ -2,15 +2,17 @@
COMMENT = modular and flexible STUN and TURN Server
-V = 0.4.12
+GH_ACCOUNT = otalk
+GH_PROJECT = restund
+GH_COMMIT = c0ad4cc81fe534f9fbd9cf738a645a6e50120c69
+V = 0.4.12.0.20170302
DISTNAME = restund-${V}
-REVISION = 2
-WANTLIB = c crypto mysqlclient pthread re ssl z
+WANTLIB = c crypto mariadb pthread re ssl z
LIB_DEPENDS = telephony/baresip/re \
databases/mariadb,-main
-MAKE_FLAGS += USE_MYSQL=1 LIBS="-lc -lre -lpthread"
+MAKE_FLAGS += USE_MYSQL=1 LIBS="-lcrypto -lssl -lz -lc -lre -lpthread"
NO_TEST = Yes
Index: restund/distinfo
===================================================================
RCS file: /cvs/ports/telephony/baresip/restund/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- restund/distinfo 6 Oct 2015 22:47:29 -0000 1.3
+++ restund/distinfo 14 Jun 2021 09:42:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (restund-0.4.12.tar.gz) = MXBEHciCNSqwJ1VWtvyImzixQgPZNgcbX6EvOaXIbUc=
-SIZE (restund-0.4.12.tar.gz) = 183127
+SHA256 (restund-0.4.12.0.20170302-c0ad4cc8.tar.gz) =
dEIenGmBWiOy/JFnSTVDwWlias9XRtr5IQuFtazuBDM=
+SIZE (restund-0.4.12.0.20170302-c0ad4cc8.tar.gz) = 179379
Index: restund/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/baresip/restund/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile
--- restund/patches/patch-Makefile 11 Dec 2014 13:48:42 -0000 1.2
+++ restund/patches/patch-Makefile 14 Jun 2021 09:42:02 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile,v 1.2 2014/12/11 13:48:42 sthen Exp $
---- Makefile.orig Wed Dec 10 09:39:12 2014
-+++ Makefile Thu Dec 11 08:25:18 2014
-@@ -97,16 +97,14 @@ all: $(MOD_BINS) $(BIN)
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -79,16 +79,14 @@ all: $(MOD_BINS) $(BIN)
# GPROF requires static linking
$(BIN): $(OBJS)
Index: restund/patches/patch-mk_mod_mk
===================================================================
RCS file: /cvs/ports/telephony/baresip/restund/patches/patch-mk_mod_mk,v
retrieving revision 1.1
diff -u -r1.1 patch-mk_mod_mk
--- restund/patches/patch-mk_mod_mk 11 Dec 2014 13:48:42 -0000 1.1
+++ restund/patches/patch-mk_mod_mk 14 Jun 2021 09:42:02 -0000
@@ -1,10 +1,11 @@
$OpenBSD: patch-mk_mod_mk,v 1.1 2014/12/11 13:48:42 sthen Exp $
---- mk/mod.mk.orig Thu Dec 11 08:26:15 2014
-+++ mk/mod.mk Thu Dec 11 08:27:30 2014
-@@ -19,15 +19,13 @@ ifeq ($(STATIC),)
- #
+Index: mk/mod.mk
+--- mk/mod.mk.orig
++++ mk/mod.mk
+@@ -9,11 +9,9 @@ $(MOD)_OBJS := $(patsubst %.c,$(BUILD)/modules/$(M
+ -include $($(MOD)_OBJS:.o=.d)
- $(MOD)$(MOD_SUFFIX): $($(MOD)_OBJS)
+ $(MOD).so: $($(MOD)_OBJS)
- @echo " LD [M] $@"
- @$(LD) $(LFLAGS) $(SH_LFLAGS) $(MOD_LFLAGS) $($(basename $@)_OBJS) \
+ $(LD) $(LFLAGS) $(SH_LFLAGS) $(MOD_LFLAGS) $($(basename $@)_OBJS) \
@@ -13,21 +14,5 @@
$(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.c $(BUILD) Makefile mk/mod.mk \
modules/$(MOD)/module.mk
- @echo " CC [M] $@"
-- @mkdir -p $(dir $@)
- @$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
-+ mkdir -p $(dir $@)
+ $(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
-
- else
-
-@@ -41,8 +39,7 @@ APP_LFLAGS := $(APP_LFLAGS) $($(MOD)_LFLAGS)
-
- $(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.c $(BUILD) Makefile mk/mod.mk \
- modules/$(MOD)/module.mk
-- @echo " CC [m] $@"
-- @mkdir -p $(dir $@)
-- @$(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
-+ mkdir -p $(dir $@)
-+ $(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
-
- endif
Index: restund/pkg/PLIST
===================================================================
RCS file: /cvs/ports/telephony/baresip/restund/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- restund/pkg/PLIST 11 Dec 2014 13:48:42 -0000 1.2
+++ restund/pkg/PLIST 14 Jun 2021 09:42:02 -0000
@@ -1,17 +1,18 @@
@comment $OpenBSD: PLIST,v 1.2 2014/12/11 13:48:42 sthen Exp $
@newgroup _restund:742
@newuser _restund:742:742:daemon:restund user:/var/empty:/sbin/nologin
+@rcscript ${RCDIR}/restund
lib/restund/
lib/restund/modules/
-lib/restund/modules/auth.so
-lib/restund/modules/binding.so
-lib/restund/modules/filedb.so
-lib/restund/modules/mysql_ser.so
-lib/restund/modules/restauth.so
-lib/restund/modules/stat.so
-lib/restund/modules/status.so
-lib/restund/modules/syslog.so
-lib/restund/modules/turn.so
+@so lib/restund/modules/auth.so
+@so lib/restund/modules/binding.so
+@so lib/restund/modules/cpuusage.so
+@so lib/restund/modules/influxdb.so
+@so lib/restund/modules/mysql_ser.so
+@so lib/restund/modules/stat.so
+@so lib/restund/modules/status.so
+@so lib/restund/modules/syslog.so
+@so lib/restund/modules/turn.so
@bin sbin/restund
share/doc/restund/
share/doc/restund/README
@@ -23,4 +24,3 @@
share/examples/restund/munin/restund_turn_bytes
share/examples/restund/restund.conf
@sample ${SYSCONFDIR}/restund.conf
-@rcscript ${RCDIR}/restund
