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

update to baresip 0.4.15

Browse Source 
- GUI
 - bugfixes
 - experimental daala support
 - GTK-dependent modules isolated in -gtk2 subpackage
 - default config now only mentions modules that are packaged

OK feinerer@, sthen@
This commit is contained in:
czarkoff 2015-10-02 19:01:24 +00:00
parent 61f252fbed
commit 956d5cd1e7
6 changed files with 219 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
telephony/baresip/baresip/Makefile
View File

@ -1,31 +1,70 @@
# $OpenBSD: Makefile,v 1.4 2015/06/21 07:40:46 czarkoff Exp $
# $OpenBSD: Makefile,v 1.5 2015/10/02 19:01:24 czarkoff Exp $
COMMENT = modular SIP User-Agent with audio and video support
SHARED_ONLY = Yes
DISTNAME = baresip-0.4.13
COMMENT-main = modular SIP User-Agent with audio and video support
COMMENT-gtk2 = GTK+2-based modules for baresip
WANTLIB += X11 Xext avcodec avdevice avformat avutil c crypto gsm
WANTLIB += m opus pthread re rem sndfile sndio spandsp speex
WANTLIB += speexdsp ssl swscale vpx x264 x265 z
V = 0.4.15
DISTNAME = baresip-$V
PKGNAME-main = baresip-$V
PKGNAME-gtk2 = baresip-gtk2-$V
BUILD_DEPENDS = telephony/libzrtp
LIB_DEPENDS = audio/gsm \
audio/libsndfile \
audio/opus \
audio/speex \
graphics/ffmpeg \
multimedia/libvpx \
telephony/baresip/rem \
telephony/spandsp
WANTLIB += X11 Xext re z
WANTLIB-main += ${WANTLIB} avcodec avdevice avformat avutil c crypto
WANTLIB-main += daalabase daaladec daalaenc gsm m opus pthread rem
WANTLIB-main += sndfile sndio spandsp speex speexdsp ssl swscale vpx
WANTLIB-main += x264 x265
WANTLIB-gtk2 += ${WANTLIB} Xcomposite Xcursor Xdamage 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 pango-1.0
WANTLIB-gtk2 += pangocairo-1.0 pangoft2-1.0
BUILD_DEPENDS-main = telephony/libzrtp
LIB_DEPENDS-main = audio/gsm \
audio/libsndfile \
audio/opus \
audio/speex \
graphics/ffmpeg \
multimedia/daala \
multimedia/libvpx \
telephony/baresip/rem \
telephony/spandsp
LIB_DEPENDS-gtk2 = multimedia/gstreamer1/plugins-base \
telephony/baresip/re \
x11/gtk+2,-main
RUN_DEPENDS-gtk2 = telephony/baresip/baresip,-main \
MAKE_FLAGS += MOD_AUTODETECT= EXTRA_MODULES="daala h265 sndio zrtp" \
HAVE_SPEEXDSP=yes LIBRE_INC=${LOCAL_BASE}/include \
LIBRE_SO=${LOCAL_BASE}/lib LIBS="-lm -lrem" \
MAKE_FLAGS += 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 \
USE_GSM=yes USE_L16=yes USE_OPUS=yes USE_PLC=yes \
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 \
USE_VPX=yes USE_X11=yes
MULTI_PACKAGES = -main -gtk2
PSEUDO_FLAVORS = no_gtk2
FLAVOR ?=
.include <bsd.port.arch.mk>
.if ${FLAVOR:L:Mno_gtk2}
BUILD_PACKAGES := ${BUILD_PACKAGES:N-gtk2}
.endif
.if ${BUILD_PACKAGES:M-gtk2}
MAKE_FLAGS += USE_GST1=yes USE_GST_VIDEO1=yes USE_GTK=yes
.endif
MAKE_FLAGS += MOD_AUTODETECT=
MAKE_FLAGS += 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 USE_GSM=yes USE_L16=yes \
USE_OPUS=yes USE_PLC=yes 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 USE_VPX=yes USE_X11=yes
# Ideally these should be enabled, but it doesn't seem to be possibe ATM, as
# the required dependencies are not in place.
@ -35,9 +74,6 @@ MAKE_FLAGS += USE_AMR=yes USE_AVCODEC=yes USE_AVFORMAT=yes USE_CONS=yes \
#MAKE_FLAGS += USE_ISAC=yes # XXX FreeSWITCH??? (was used in Google Talk)
#MAKE_FLAGS += USE_SDL2=yes # XXX Appears to be broken
MAKE_FLAGS += EXTRA_MODULES="h265 sndio zrtp" HAVE_SPEEXDSP=yes \
LIBRE_INC=${LOCAL_BASE}/include LIBRE_SO=${LOCAL_BASE}/lib \
LIBS="-lm -lrem"
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/baresip/modules \
@ -48,7 +84,3 @@ do-install:
${INSTALL_DATA} ${WRKBUILD}/share/* ${PREFIX}/share/baresip
.include <bsd.port.mk>
.if ${NO_SHARED_LIBS} == Yes
MAKE_FLAGS += STATIC=yes
.endif

4
telephony/baresip/baresip/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (baresip-0.4.13.tar.gz) = TwIHmuWAheYbuTY63HE56tWGXjwDLidLpZiVSxm7zdY=
SIZE (baresip-0.4.13.tar.gz) = 392652
SHA256 (baresip-0.4.15.tar.gz) = IxdNk7JrexflyPcfiT1Kf2zfi+CGyBPo5zMObyIV4Yw=
SIZE (baresip-0.4.15.tar.gz) = 414637

28
telephony/baresip/baresip/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
--- Makefile.orig Sat Jun 21 13:36:42 2014
+++ Makefile Thu Sep 25 10:49:52 2014
@@ -110,13 +110,8 @@ ifneq ($(LIBREM_PATH),)
$OpenBSD: patch-Makefile,v 1.2 2015/10/02 19:01:24 czarkoff Exp $
--- Makefile.orig Sat Sep 26 20:15:57 2015
+++ Makefile Sun Sep 27 14:48:17 2015
@@ -123,13 +123,8 @@ ifneq ($(LIBREM_PATH),)
LIBS += -L$(LIBREM_PATH)
endif
@ -15,15 +15,15 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
LIBS += -lrem -lm
LIBS += -L$(SYSROOT)/lib
@@ -141,37 +136,30 @@ Makefile: mk/*.mk $(MOD_MK) $(LIBRE_MK)
@@ -157,47 +152,38 @@ Makefile: mk/*.mk $(MOD_MK) $(LIBRE_MK)
$(SHARED): $(APP_OBJS)
$(SHARED): $(LIB_OBJS)
- @echo " LD $@"
- @$(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
+ $(LD) $(LFLAGS) $(SH_LFLAGS) $^ -L$(LIBRE_SO) -lre $(LIBS) -o $@
$(STATICLIB): $(APP_OBJS)
$(STATICLIB): $(LIB_OBJS)
- @echo " AR $@"
- @rm -f $@; $(AR) $(AFLAGS) $@ $^
+ rm -f $@; $(AR) $(AFLAGS) $@ $^
@ -45,6 +45,18 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
+ $(LD) $(LFLAGS) $(APP_LFLAGS) $^ -lre $(LIBS) -o $@
endif
.PHONY: test
test: $(TEST_BIN)
+ ./$(TEST_BIN)
$(TEST_BIN): $(STATICLIB) $(TEST_OBJS)
- @echo " LD $@"
- @$(LD) $(LFLAGS) $(TEST_OBJS) \
- -L$(LIBRE_SO) -L. \
- -l$(PROJECT) -lre $(LIBS) -o $@
+ $(LD) $(LFLAGS) $(TEST_OBJS) -L. -l$(PROJECT) -lre $(LIBS) -o $@
$(BUILD)/%.o: %.c $(BUILD) Makefile $(APP_MK)
- @echo " CC $@"
- @$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
@ -61,4 +73,4 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
+ $(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
$(BUILD): Makefile
@mkdir -p $(BUILD)/src $(MOD_BLD)
@mkdir -p $(BUILD)/src $(MOD_BLD) $(BUILD)/test

40
telephony/baresip/baresip/patches/patch-mk_mod_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mk_mod_mk,v 1.3 2015/05/17 21:19:23 czarkoff Exp $
--- mk/mod.mk.orig Wed Dec 24 14:19:04 2014
+++ mk/mod.mk Sat May 16 19:32:01 2015
@@ -26,33 +26,28 @@ ifeq ($(STATIC),)
$OpenBSD: patch-mk_mod_mk,v 1.4 2015/10/02 19:01:24 czarkoff Exp $
--- mk/mod.mk.orig Sat Sep 26 20:15:57 2015
+++ mk/mod.mk Sun Sep 27 10:44:40 2015
@@ -32,35 +32,30 @@ ifeq ($(STATIC),)
#
$(MOD)$(MOD_SUFFIX): $($(MOD)_OBJS)
@ -14,25 +14,27 @@ $OpenBSD: patch-mk_mod_mk,v 1.3 2015/05/17 21:19:23 czarkoff Exp $
modules/$(MOD)/module.mk mk/modules.mk
- @echo " CC [M] $@"
- @mkdir -p $(dir $@)
- @$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
- @$(CC) $(CFLAGS) $($(call modulename,$@)_CFLAGS) -c $< -o $@ $(DFLAGS)
+ mkdir -p $(dir $@)
+ $(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
+ $(CC) $(CFLAGS) $($(call modulename,$@)_CFLAGS) -c $< -o $@ $(DFLAGS)
$(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.m $(BUILD) Makefile mk/mod.mk \
modules/$(MOD)/module.mk mk/modules.mk
- @echo " OC [M] $@"
- @mkdir -p $(dir $@)
- @$(CC) $(CFLAGS) $(OBJCFLAGS) -c $< -o $@ $(DFLAGS)
- @$(CC) $(CFLAGS) $($(call modulename,$@)_CFLAGS) $(OBJCFLAGS) \
+ mkdir -p $(dir $@)
+ $(CC) $(CFLAGS) $(OBJCFLAGS) -c $< -o $@ $(DFLAGS)
+ $(CC) $(CFLAGS) $($(call modulename,$@)_CFLAGS) $(OBJCFLAGS) \
-c $< -o $@ $(DFLAGS)
$(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.cpp $(BUILD) Makefile mk/mod.mk \
modules/$(MOD)/module.mk mk/modules.mk
- @echo " CXX [M] $@"
- @mkdir -p $(dir $@)
- @$(CXX) $(CXXFLAGS) -c $< -o $@ $(DFLAGS)
- @$(CXX) $(CXXFLAGS) $($(call modulename,$@)_CXXFLAGS) \
+ mkdir -p $(dir $@)
+ $(CXX) $(CXXFLAGS) -c $< -o $@ $(DFLAGS)
+ $(CXX) $(CXXFLAGS) $($(call modulename,$@)_CXXFLAGS) \
-c $< -o $@ $(DFLAGS)
$(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.S $(BUILD) Makefile mk/mod.mk \
modules/$(MOD)/module.mk mk/modules.mk
@ -44,33 +46,35 @@ $OpenBSD: patch-mk_mod_mk,v 1.3 2015/05/17 21:19:23 czarkoff Exp $
else
@@ -66,28 +61,24 @@ MOD_LFLAGS := $(MOD_LFLAGS) $($(MOD)_LFLAGS)
@@ -74,30 +69,26 @@ MOD_LFLAGS := $(MOD_LFLAGS) $($(MOD)_LFLAGS)
$(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.c $(BUILD) Makefile mk/mod.mk \
modules/$(MOD)/module.mk mk/modules.mk
- @echo " CC [m] $@"
- @mkdir -p $(dir $@)
- @$(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
- @$(CC) $(CFLAGS) $($(call modulename,$@)_CFLAGS) \
+ mkdir -p $(dir $@)
+ $(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
+ $(CC) $(CFLAGS) $($(call modulename,$@)_CFLAGS) \
-DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
$(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.m $(BUILD) Makefile mk/mod.mk \
modules/$(MOD)/module.mk mk/modules.mk
- @echo " OC [m] $@"
- @mkdir -p $(dir $@)
- @$(CC) $(CFLAGS) $(OBJCFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ \
- @$(CC) $(CFLAGS) $($(call modulename,$@)_CFLAGS) $(OBJCFLAGS) \
+ mkdir -p $(dir $@)
+ $(CC) $(CFLAGS) $(OBJCFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ \
$(DFLAGS)
+ $(CC) $(CFLAGS) $($(call modulename,$@)_CFLAGS) $(OBJCFLAGS) \
-DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
$(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.cpp $(BUILD) Makefile mk/mod.mk \
modules/$(MOD)/module.mk mk/modules.mk
- @echo " CXX [m] $@"
- @mkdir -p $(dir $@)
- @$(CXX) $(CXXFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
- @$(CXX) $(CXXFLAGS) $($(call modulename,$@)_CXXFLAGS) \
+ mkdir -p $(dir $@)
+ $(CXX) $(CXXFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
+ $(CXX) $(CXXFLAGS) $($(call modulename,$@)_CXXFLAGS) \
-DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
$(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.S $(BUILD) Makefile mk/mod.mk \
modules/$(MOD)/module.mk mk/modules.mk

43
telephony/baresip/baresip/patches/patch-modules_daala_decode_c Normal file
View File

@ -0,0 +1,43 @@
$OpenBSD: patch-modules_daala_decode_c,v 1.1 2015/10/02 19:01:24 czarkoff Exp $
--- modules/daala/decode.c.orig Sat Sep 26 20:15:57 2015
+++ modules/daala/decode.c Sun Sep 27 14:37:55 2015
@@ -93,7 +93,7 @@ int daala_decode_update(struct viddec_state **vdsp, co
int daala_decode(struct viddec_state *vds, struct vidframe *frame,
bool marker, uint16_t seq, struct mbuf *mb)
{
- ogg_packet op;
+ daala_packet dp;
bool ishdr;
int i, r, err = 0;
(void)seq;
@@ -117,16 +117,16 @@ int daala_decode(struct viddec_state *vds, struct vidf
mbuf_get_left(mb));
#endif
- memset(&op, 0, sizeof(op));
+ memset(&dp, 0, sizeof(dp));
- op.packet = mbuf_buf(mb);
- op.bytes = mbuf_get_left(mb);
- op.b_o_s = marker;
+ dp.packet = mbuf_buf(mb);
+ dp.bytes = mbuf_get_left(mb);
+ dp.b_o_s = marker;
if (daala_packet_isheader(mbuf_buf(mb), mbuf_get_left(mb))) {
r = daala_decode_header_in(&vds->di, &vds->dc, &vds->ds,
- &op);
+ &dp);
if (r < 0) {
warning("daala: decoder: decode_header_in failed"
" (ret = %d)\n",
@@ -155,7 +155,7 @@ int daala_decode(struct viddec_state *vds, struct vidf
return EPROTO;
}
- r = daala_decode_packet_in(vds->dec, &img, &op);
+ r = daala_decode_packet_in(vds->dec, &img, &dp);
if (r < 0) {
warning("daala: decode: packet_in error (%d)\n", r);
return EPROTO;

70
telephony/baresip/baresip/patches/patch-modules_daala_encode_c Normal file
View File

@ -0,0 +1,70 @@
$OpenBSD: patch-modules_daala_encode_c,v 1.1 2015/10/02 19:01:24 czarkoff Exp $
--- modules/daala/encode.c.orig Sat Sep 26 20:15:57 2015
+++ modules/daala/encode.c Sun Sep 27 14:39:00 2015
@@ -121,7 +121,7 @@ static int open_encoder(struct videnc_state *ves, cons
{
daala_info di;
daala_comment dc;
- ogg_packet op;
+ daala_packet dp;
int err = 0;
int complexity = 0;
int video_q = 10;
@@ -171,7 +171,7 @@ static int open_encoder(struct videnc_state *ves, cons
for (;;) {
int r;
- r = daala_encode_flush_header(ves->enc, &dc, &op);
+ r = daala_encode_flush_header(ves->enc, &dc, &dp);
if (r < 0) {
warning("daala: flush_header returned %d\n", r);
break;
@@ -180,19 +180,19 @@ static int open_encoder(struct videnc_state *ves, cons
break;
debug("daala: header: %lld bytes header=%d key=%d\n",
- op.bytes,
- daala_packet_isheader(op.packet, op.bytes),
- daala_packet_iskeyframe(op.packet, op.bytes));
+ dp.bytes,
+ daala_packet_isheader(dp.packet, dp.bytes),
+ daala_packet_iskeyframe(dp.packet, dp.bytes));
#if 0
re_printf("bos=%lld, eos=%lld, granule=%lld, packetno=%lld\n",
- op.b_o_s,
- op.e_o_s,
- op.granulepos,
- op.packetno);
+ dp.b_o_s,
+ dp.e_o_s,
+ dp.granulepos,
+ dp.packetno);
#endif
- err = send_packet(ves, op.b_o_s, op.packet, op.bytes);
+ err = send_packet(ves, dp.b_o_s, dp.packet, dp.bytes);
if (err)
break;
}
@@ -256,9 +256,9 @@ int daala_encode(struct videnc_state *ves, bool update
}
for (;;) {
- ogg_packet op;
+ daala_packet dp;
- r = daala_encode_packet_out(ves->enc, 0, &op);
+ r = daala_encode_packet_out(ves->enc, 0, &dp);
if (r < 0) {
warning("daala: encoder: packet_out ret=%d\n", r);
break;
@@ -267,7 +267,7 @@ int daala_encode(struct videnc_state *ves, bool update
break;
}
- err = send_packet(ves, op.b_o_s, op.packet, op.bytes);
+ err = send_packet(ves, dp.b_o_s, dp.packet, dp.bytes);
if (err)
break;
}