Update to baresip-0.4.12, removing patches and libuuid dep.
From Dmitrij D. Czarkoff.
This commit is contained in:
jca
parent
a583f24b11
commit
3d85f1dfc6
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2014/12/29 20:40:27 jca Exp $
|
||||
|
||||
COMMENT = modular SIP User-Agent with audio and video support
|
||||
|
||||
DISTNAME = baresip-0.4.11
|
||||
DISTNAME = baresip-0.4.12
|
||||
|
||||
WANTLIB += X11 Xext avcodec avdevice avformat avutil c crypto gsm
|
||||
WANTLIB += m opus pthread re rem sndfile sndio spandsp speex
|
||||
WANTLIB += speexdsp ssl swscale uuid vpx x264 z
|
||||
WANTLIB += speexdsp ssl swscale vpx x264 z
|
||||
|
||||
BUILD_DEPENDS = telephony/libzrtp
|
||||
LIB_DEPENDS = audio/gsm \
|
||||
@ -15,13 +15,12 @@ LIB_DEPENDS = audio/gsm \
|
||||
audio/speex \
|
||||
graphics/ffmpeg \
|
||||
multimedia/libvpx \
|
||||
sysutils/e2fsprogs \
|
||||
telephony/baresip/rem \
|
||||
telephony/spandsp
|
||||
|
||||
MAKE_FLAGS += MOD_AUTODETECT=
|
||||
MAKE_FLAGS += USE_AMR=yes USE_CONS=yes USE_DTLS=yes USE_DTLS_SRTP=yes \
|
||||
USE_FFMPEG=yes USE_FFMPEG_AVFORMAT=yes USE_G711=yes \
|
||||
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 \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (baresip-0.4.11.tar.gz) = hS2DUdUQWQo22Jh+YNgcwfRGxRpbgMHTZVYmT2OCheI=
|
||||
SIZE (baresip-0.4.11.tar.gz) = 366207
|
||||
SHA256 (baresip-0.4.12.tar.gz) = IiZc4ZIhLUMhOHFi1T0QzLSb1xzaDwX9IXg/uv11kjg=
|
||||
SIZE (baresip-0.4.12.tar.gz) = 369557
|
||||
|
||||
@ -1,41 +1,46 @@
|
||||
$OpenBSD: patch-mk_mod_mk,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
|
||||
--- mk/mod.mk.orig Thu Sep 25 10:53:31 2014
|
||||
+++ mk/mod.mk Thu Sep 25 10:53:47 2014
|
||||
$OpenBSD: patch-mk_mod_mk,v 1.2 2014/12/29 20:40:27 jca Exp $
|
||||
--- mk/mod.mk.orig Wed Dec 24 14:19:04 2014
|
||||
+++ mk/mod.mk Fri Dec 26 22:51:37 2014
|
||||
@@ -26,33 +26,28 @@ ifeq ($(STATIC),)
|
||||
#
|
||||
|
||||
$(MOD)$(MOD_SUFFIX): $($(MOD)_OBJS)
|
||||
- @echo " LD [M] $@"
|
||||
- @$(LD) $(LFLAGS) $(SH_LFLAGS) $(MOD_LFLAGS) $($(basename $@)_OBJS) \
|
||||
- $($(basename $@)_LFLAGS) -L$(LIBRE_SO) -lre -o $@
|
||||
+ $(LD) $(LFLAGS) $(SH_LFLAGS) $(MOD_LFLAGS) $($(basename $@)_OBJS) \
|
||||
$($(basename $@)_LFLAGS) -L$(LIBRE_SO) -lre -o $@
|
||||
+ $($(basename $@)_LFLAGS) -L$(LIBRE_SO) -lre -o $@
|
||||
|
||||
$(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 $@)
|
||||
- @mkdir -p $(dir $@)
|
||||
- @$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
|
||||
+ mkdir -p $(dir $@)
|
||||
+ $(CC) $(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 $@)
|
||||
- @mkdir -p $(dir $@)
|
||||
- @$(CC) $(CFLAGS) $(OBJCFLAGS) -c $< -o $@ $(DFLAGS)
|
||||
+ mkdir -p $(dir $@)
|
||||
+ $(CC) $(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 $@)
|
||||
- @mkdir -p $(dir $@)
|
||||
- @$(CXX) $(CXXFLAGS) -c $< -o $@ $(DFLAGS)
|
||||
+ mkdir -p $(dir $@)
|
||||
+ $(CXX) $(CXXFLAGS) -c $< -o $@ $(DFLAGS)
|
||||
|
||||
$(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.S $(BUILD) Makefile mk/mod.mk \
|
||||
modules/$(MOD)/module.mk mk/modules.mk
|
||||
- @echo " AS [M] $@"
|
||||
@mkdir -p $(dir $@)
|
||||
- @mkdir -p $(dir $@)
|
||||
- @$(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
|
||||
+ mkdir -p $(dir $@)
|
||||
+ $(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
|
||||
|
||||
else
|
||||
@ -45,15 +50,17 @@ $OpenBSD: patch-mk_mod_mk,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
|
||||
$(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 $@)
|
||||
- @mkdir -p $(dir $@)
|
||||
- @$(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
|
||||
+ mkdir -p $(dir $@)
|
||||
+ $(CC) $(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 $@)
|
||||
- @mkdir -p $(dir $@)
|
||||
- @$(CC) $(CFLAGS) $(OBJCFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ \
|
||||
+ mkdir -p $(dir $@)
|
||||
+ $(CC) $(CFLAGS) $(OBJCFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ \
|
||||
$(DFLAGS)
|
||||
|
||||
@ -61,15 +68,17 @@ $OpenBSD: patch-mk_mod_mk,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
|
||||
$(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 $@)
|
||||
- @mkdir -p $(dir $@)
|
||||
- @$(CXX) $(CXXFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
|
||||
+ mkdir -p $(dir $@)
|
||||
+ $(CXX) $(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
|
||||
- @echo " AS [m] $@"
|
||||
@mkdir -p $(dir $@)
|
||||
- @mkdir -p $(dir $@)
|
||||
- @$(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
|
||||
+ mkdir -p $(dir $@)
|
||||
+ $(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
|
||||
|
||||
endif
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
$OpenBSD: patch-src_config_c,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
|
||||
--- src/config.c.orig Sat Jun 21 14:36:42 2014
|
||||
+++ src/config.c Tue Sep 9 21:45:13 2014
|
||||
@@ -20,7 +20,7 @@
|
||||
static struct config core_config = {
|
||||
/* Input */
|
||||
{
|
||||
- "/dev/event0",
|
||||
+ "/dev/wskbd",
|
||||
5555
|
||||
},
|
||||
|
||||
@@ -332,6 +332,8 @@ static const char *default_audio_device(void)
|
||||
return "coreaudio,nil";
|
||||
#elif defined (FREEBSD)
|
||||
return "oss,/dev/dsp";
|
||||
+#elif defined (OPENBSD)
|
||||
+ return "sndio,default";
|
||||
#elif defined (WIN32)
|
||||
return "winwave,nil";
|
||||
#elif defined (ANDROID)
|
||||
@@ -391,7 +393,7 @@ static int core_config_template(struct re_printf *pf,
|
||||
|
||||
err |= re_hprintf(pf,
|
||||
"\n# Core\n"
|
||||
- "poll_method\t\t%s\t\t# poll, select, epoll ..\n"
|
||||
+ "poll_method\t\t%s\t\t# poll, select ..\n"
|
||||
"\n# Input\n"
|
||||
"input_device\t\t/dev/event0\n"
|
||||
"input_port\t\t5555\n"
|
||||
@@ -561,21 +563,17 @@ 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");
|
||||
- (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, "\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 "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 "speex" MOD_EXT "\n");
|
||||
- (void)re_fprintf(f, "#module\t\t\t" MOD_PRE "bv32" 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");
|
||||
@@ -593,11 +591,12 @@ int config_write_template(const char *file, const stru
|
||||
(void)re_fprintf(f, "module\t\t\t" MOD_PRE "coreaudio" MOD_EXT "\n");
|
||||
#elif defined (ANDROID)
|
||||
(void)re_fprintf(f, "module\t\t\t" MOD_PRE "opensles" MOD_EXT "\n");
|
||||
+#elif defined (OPENBSD)
|
||||
+ (void)re_fprintf(f, "module\t\t\t" MOD_PRE "sndio" MOD_EXT "\n");
|
||||
#else
|
||||
(void)re_fprintf(f, "module\t\t\t" MOD_PRE "oss" MOD_EXT "\n");
|
||||
(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");
|
||||
|
||||
#ifdef USE_VIDEO
|
||||
|
||||
@@ -629,21 +628,17 @@ int config_write_template(const char *file, const stru
|
||||
(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 "cairo" MOD_EXT "\n");
|
||||
|
||||
(void)re_fprintf(f, "\n# Video display modules\n");
|
||||
#ifdef DARWIN
|
||||
(void)re_fprintf(f, "module\t\t\t" MOD_PRE "opengl" 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 "sdl2" MOD_EXT "\n");
|
||||
|
||||
#endif /* USE_VIDEO */
|
||||
|
||||
(void)re_fprintf(f,
|
||||
- "\n# Audio/Video source modules\n"
|
||||
- "#module\t\t\t" MOD_PRE "rst" MOD_EXT "\n"
|
||||
- "#module\t\t\t" MOD_PRE "gst" MOD_EXT "\n");
|
||||
+ "\n# Audio/Video source modules\n");
|
||||
|
||||
(void)re_fprintf(f, "\n# Media NAT modules\n");
|
||||
(void)re_fprintf(f, "module\t\t\t" MOD_PRE "stun" MOD_EXT "\n");
|
||||
@@ -654,6 +649,7 @@ int config_write_template(const char *file, const stru
|
||||
(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 "zrtp" MOD_EXT "\n");
|
||||
(void)re_fprintf(f, "\n");
|
||||
|
||||
(void)re_fprintf(f, "\n#------------------------------------"
|
||||
Loading…
Reference in New Issue
Block a user