cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to baresip-0.4.17

Browse Source 
OK and fix from feinerer@
This commit is contained in:
czarkoff 2016-01-19 23:00:40 +00:00
parent e4a4da6a74
commit cbec59e15f
8 changed files with 56 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
telephony/baresip/baresip/Makefile
View File

@ -1,23 +1,23 @@
# $OpenBSD: Makefile,v 1.8 2016/01/12 09:22:07 czarkoff Exp $
# $OpenBSD: Makefile,v 1.9 2016/01/19 23:00:40 czarkoff Exp $
SHARED_ONLY = Yes
COMMENT-main = modular SIP User-Agent with audio and video support
COMMENT-gtk2 = GTK+2-based modules for baresip
V = 0.4.16
V = 0.4.17
DISTNAME = baresip-$V
PKGNAME-main = baresip-$V
PKGNAME-gtk2 = baresip-gtk2-$V
WANTLIB-main += X11 Xext avcodec avdevice avformat avutil c daalabase
WANTLIB-main += daaladec daalaenc gsm m opus png pthread re rem sndfile
WANTLIB-main += sndio spandsp speex swscale v4l2 vpx x264 x265
WANTLIB-main += sndio spandsp speex speexdsp swscale 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 intl notify pango-1.0
WANTLIB-gtk2 += gstbase-1.0 gstreamer-1.0 gtk-x11-2.0 intl pango-1.0
WANTLIB-gtk2 += pangocairo-1.0 pangoft2-1.0 re z
BUILD_DEPENDS = telephony/libzrtp
@ -42,7 +42,7 @@ MAKE_ENV += LIBRE_INC=${LOCALBASE}/include/re \
LIBRE_SO=${LOCALBASE}/lib LIBS="-lm -lrem" \
MAKE_FLAGS += MOD_AUTODETECT= \
EXTRA_MODULES="daala h265 snapshot sndio zrtp" \
EXTRA_MODULES="echo daala h265 snapshot sndio zrtp" \
USE_AMR=yes USE_AVCODEC=yes USE_AVFORMAT=yes \
USE_CONS=yes USE_DTLS=yes USE_DTLS_SRTP=yes \
USE_FFMPEG=yes USE_G711=yes USE_G722=yes USE_G726=yes \
@ -50,7 +50,8 @@ MAKE_FLAGS += MOD_AUTODETECT= \
USE_SNDFILE=yes USE_SNDIO=yes USE_SPEEX=yes \
USE_SPEEX_AEC=yes USE_SPEEX_PP=yes USE_SRTP=yes \
USE_STDIO=yes USE_SYSLOG=yes USE_UUID=yes USE_V4L2=yes \
HAVE_LIBV4L2=yes USE_VPX=yes USE_X11=yes
USE_VPX=yes USE_X11=yes \
HAVE_LIBV4L2=yes HAVE_SPEEXDSP=yes
MULTI_PACKAGES = -main -gtk2
PSEUDO_FLAVORS = no_gtk2
@ -64,7 +65,6 @@ BUILD_PACKAGES := ${BUILD_PACKAGES:N-gtk2}
.if ${BUILD_PACKAGES:M-gtk2}
MAKE_FLAGS += USE_GST1=yes USE_GST_VIDEO1=yes USE_GTK=yes
MAKE_FLAGS += USE_LIBNOTIFY=yes
.endif

4
telephony/baresip/baresip/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (baresip-0.4.16.tar.gz) = 5qC5P8Ual0tzj/OhLh+8UIyNMHiAqgOxm2GlQeNpSRE=
SIZE (baresip-0.4.16.tar.gz) = 428284
SHA256 (baresip-0.4.17.tar.gz) = 3n5v8BhSkOtQ8pVtgaD83PKir3ZDL2TwkN175dtT1oA=
SIZE (baresip-0.4.17.tar.gz) = 433989

20
telephony/baresip/baresip/patches/patch-modules_daala_decode_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-modules_daala_decode_c,v 1.2 2016/01/12 09:22:07 czarkoff Exp $
--- modules/daala/decode.c.orig Tue Dec 1 13:09:48 2015
+++ modules/daala/decode.c Thu Jan 7 18:57:18 2016
@@ -150,9 +150,15 @@ int daala_decode(struct viddec_state *vds, struct vidf
return EPROTO;
}
- r = daala_decode_packet_in(vds->dec, &img, &dp);
+ r = daala_decode_packet_in(vds->dec, &dp);
if (r < 0) {
warning("daala: decode: packet_in error (%d)\n", r);
+ return EPROTO;
+ }
+
+ r = daala_decode_img_out(vds->dec, &img);
+ if (r != 1) {
+ warning("daala: decode: img_out error (%d)\n", r);
return EPROTO;
}

20
telephony/baresip/baresip/patches/patch-modules_gtk_gtk_mod_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-modules_gtk_gtk_mod_c,v 1.1 2016/01/12 09:22:07 czarkoff Exp $
--- modules/gtk/gtk_mod.c.orig Thu Jan 7 18:05:52 2016
+++ modules/gtk/gtk_mod.c Thu Jan 7 18:10:09 2016
@@ -724,6 +724,7 @@ static void *gtk_thread(void *arg)
GtkMenuShell *app_menu;
GtkWidget *item;
GError *err = NULL;
+ struct le *le;
gdk_threads_init();
gtk_init(0, NULL);
@@ -770,7 +771,7 @@ static void *gtk_thread(void *arg)
mod->accounts_menu);
/* Add accounts to submenu */
- for (struct le *le = list_head(uag_list()); le; le = le->next) {
+ for (le = list_head(uag_list()); le; le = le->next) {
struct ua *ua = le->data;
accounts_menu_add_item(mod, ua);
}

12
telephony/baresip/baresip/patches/patch-modules_h265_h265_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-modules_h265_h265_c,v 1.1 2016/01/19 23:00:40 czarkoff Exp $
--- modules/h265/h265.c.orig Mon Jan 18 08:58:53 2016
+++ modules/h265/h265.c Mon Jan 18 08:59:02 2016
@@ -54,8 +54,6 @@ static int module_close(void)
{
vidcodec_unregister(&h265);
- x265_cleanup();
-
return 0;
}

14
telephony/baresip/baresip/patches/patch-modules_sndio_sndio_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-modules_sndio_sndio_c,v 1.1 2016/01/12 09:22:07 czarkoff Exp $
--- modules/sndio/sndio.c.orig Tue Dec 1 13:09:48 2015
+++ modules/sndio/sndio.c Thu Jan 7 19:49:39 2016
@@ -268,7 +268,9 @@ static int play_alloc(struct auplay_st **stp, const st
st->run = false;
out:
- mem_deref(par);
+ if (par)
+ mem_deref(par);
+
if (err)
mem_deref(st);
else

47
telephony/baresip/baresip/patches/patch-src_config_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_config_c,v 1.4 2016/01/12 09:22:07 czarkoff Exp $
--- src/config.c.orig Tue Dec 1 13:09:48 2015
+++ src/config.c Thu Jan 7 21:34:41 2016
@@ -552,21 +552,17 @@ int config_write_template(const char *file, const stru
$OpenBSD: patch-src_config_c,v 1.5 2016/01/19 23:00:40 czarkoff Exp $
--- src/config.c.orig Sun Jan 17 13:17:04 2016
+++ src/config.c Sun Jan 17 19:04:50 2016
@@ -552,27 +552,23 @@ 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");
@ -30,20 +30,31 @@ $OpenBSD: patch-src_config_c,v 1.4 2016/01/12 09:22:07 czarkoff Exp $
(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");
@@ -591,7 +587,6 @@ int config_write_template(const char *file, const stru
(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");
@@ -590,8 +586,8 @@ int config_write_template(const char *file, const stru
#else
(void)re_fprintf(f, "module\t\t\t" MOD_PRE "alsa" MOD_EXT "\n");
#endif
- (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");
#ifdef USE_VIDEO
@@ -601,10 +596,12 @@ int config_write_template(const char *file, const stru
@@ -601,10 +597,13 @@ 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 "vpx" MOD_EXT "\n");
+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "daala" 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 "vpx" MOD_EXT "\n");
(void)re_fprintf(f, "\n# Video filter Modules (in encoding order)\n");
@ -53,7 +64,7 @@ $OpenBSD: patch-src_config_c,v 1.4 2016/01/12 09:22:07 czarkoff Exp $
(void)re_fprintf(f, "\n# Video source modules\n");
#if defined (DARWIN)
@@ -616,38 +613,30 @@ int config_write_template(const char *file, const stru
@@ -616,38 +615,33 @@ int config_write_template(const char *file, const stru
#endif
#else
@ -68,6 +79,7 @@ $OpenBSD: patch-src_config_c,v 1.4 2016/01/12 09:22:07 czarkoff Exp $
- (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 "x11grab" MOD_EXT "\n");
+ (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "vidbridge" MOD_EXT "\n");
(void)re_fprintf(f, "\n# Video display modules\n");
#ifdef DARWIN
@ -76,6 +88,7 @@ $OpenBSD: patch-src_config_c,v 1.4 2016/01/12 09:22:07 czarkoff Exp $
- (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 "x11" MOD_EXT "\n");
+ (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "fakevideo" MOD_EXT "\n");
#endif /* USE_VIDEO */
@ -96,10 +109,15 @@ $OpenBSD: patch-src_config_c,v 1.4 2016/01/12 09:22:07 czarkoff Exp $
- (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, "\n");
(void)re_fprintf(f, "\n#------------------------------------"
@@ -667,11 +656,17 @@ int config_write_template(const char *file, const stru
@@ -664,14 +658,22 @@ int config_write_template(const char *file, const stru
(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 "contact"MOD_EXT"\n");
+ (void)re_fprintf(f, "#module_app\t\t" MOD_PRE "echo"MOD_EXT"\n");
(void)re_fprintf(f, "module_app\t\t" MOD_PRE "menu"MOD_EXT"\n");
(void)re_fprintf(f, "#module_app\t\t" MOD_PRE "mwi"MOD_EXT"\n");
(void)re_fprintf(f, "#module_app\t\t" MOD_PRE "natbd"MOD_EXT"\n");
@ -110,15 +128,16 @@ $OpenBSD: patch-src_config_c,v 1.4 2016/01/12 09:22:07 czarkoff Exp $
(void)re_fprintf(f, "module_app\t\t" MOD_PRE "vidloop"MOD_EXT"\n");
#endif
+
+ (void)re_fprintf(f,
+ "\n# These modules are in baresip-gtk2 package:\n"
+ "#module\t\tgst1.so\n"
+ "#module\t\tgst1_video.so\n"
+ "#module_app\t\tgtk.so\n");
+ (void)re_fprintf(f, "\n#------------------------------------"
+ "------------------------------------------\n");
+ (void)re_fprintf(f, "# These modules are in baresip-gtk2 package:\n");
+ (void)re_fprintf(f, "#module\t\t" MOD_PRE "gst1" MOD_EXT"\n");
+ (void)re_fprintf(f, "#module\t\t" MOD_PRE "gst_video1" MOD_EXT"\n");
+ (void)re_fprintf(f, "#module_app\t" MOD_PRE "gtk" MOD_EXT"\n");
(void)re_fprintf(f, "\n");
(void)re_fprintf(f, "\n#------------------------------------"
@@ -684,9 +679,6 @@ int config_write_template(const char *file, const stru
@@ -684,9 +686,6 @@ 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");

3
telephony/baresip/baresip/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2016/01/12 09:22:08 czarkoff Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2016/01/19 23:00:40 czarkoff Exp $
@pkgpath telephony/baresip/baresip
@bin bin/baresip
lib/baresip/
@ -14,6 +14,7 @@ lib/baresip/modules/cons.so
lib/baresip/modules/contact.so
lib/baresip/modules/daala.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