From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Sun, 21 Apr 2019 13:27:21 +0000 (+0200)
Subject: baresip: update to 0.6.2
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F420%2Fhead;p=feed%2Ftelephony.git

baresip: update to 0.6.2

- echo module is now built by default
- natbd, v4l, x264 don't exist anymore

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/net/baresip/Makefile b/net/baresip/Makefile
index 888fea9..a8cafca 100644
--- a/net/baresip/Makefile
+++ b/net/baresip/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=baresip
-PKG_VERSION:=0.6.0
+PKG_VERSION:=0.6.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub
-PKG_HASH:=ab3dd329599e4df83eeeb5451b42811598e0171a45a90b34006c5628b61d0764
+PKG_HASH:=e1fae11ea9e6dc861bb2c43d6bef641778945aad86581d58bc4b0ea64b8d28e2
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=docs/COPYING
@@ -27,7 +27,6 @@ baresip-mods:= \
 	avcodec \
 	avformat \
 	cons \
-	echo \
 	evdev \
 	g711 \
 	g722 \
@@ -41,7 +40,6 @@ baresip-mods:= \
 	sndfile \
 	srtp \
 	stdio \
-	v4l \
 	v4l2
 
 PKG_CONFIG_DEPENDS:= \
@@ -72,7 +70,6 @@ baresip-mod-alsa        := USE_ALSA
 baresip-mod-avcodec     := USE_AVCODEC
 baresip-mod-avformat    := USE_AVFORMAT
 baresip-mod-cons        := USE_CONS
-baresip-mod-echo        := USE_ECHO
 baresip-mod-evdev       := USE_EVDEV
 baresip-mod-g711        := USE_G711
 baresip-mod-g722        := USE_G722
@@ -86,7 +83,6 @@ baresip-mod-rtcpsummary := USE_RTCPSUMMARY
 baresip-mod-sndfile     := USE_SNDFILE
 baresip-mod-srtp        := USE_SRTP
 baresip-mod-stdio       := USE_STDIO
-baresip-mod-v4l         := USE_V4L
 baresip-mod-v4l2        := USE_V4L2
 
 BARESIP_MOD_OPTIONS:= \
@@ -94,9 +90,6 @@ BARESIP_MOD_OPTIONS:= \
 	EXTRA_MODULES="dtmfio" \
 	$(foreach m,$(baresip-mods),$(baresip-mod-$(m))=$(if $(CONFIG_PACKAGE_baresip-mod-$(subst _,-,$(m))),1))
 
-# According to upstream baresip can use x264 directly or through ffmpeg. ffmpeg
-# is preferred. The possibility to use it directly might even go away in the
-# future. So prevent baresip from linking directly to x264.
 MAKE_FLAGS+= \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \
@@ -109,8 +102,7 @@ MAKE_FLAGS+= \
 	RELEASE=1 \
 	SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \
 	SYSROOT_ALT="$(STAGING_DIR)/usr" \
-	$(BARESIP_MOD_OPTIONS) \
-	USE_X264=
+	$(BARESIP_MOD_OPTIONS)
 
 TARGET_CFLAGS+=-D_GNU_SOURCE
 
@@ -201,7 +193,6 @@ $(eval $(call BuildPlugin,g722,G.722 audio codec,g722,+libspandsp))
 $(eval $(call BuildPlugin,g726,G.726 audio codec,g726,+libspandsp))
 $(eval $(call BuildPlugin,httpd,HTTP webserver UI-module,httpd,))
 $(eval $(call BuildPlugin,mwi,Message Waiting Indication,mwi,))
-$(eval $(call BuildPlugin,natbd,NAT Behavior Discovery Module,natbd,))
 $(eval $(call BuildPlugin,natpmp,NAT Port Mapping Protocol module,natpmp,))
 $(eval $(call BuildPlugin,opus,OPUS Interactive audio codec,opus,+libopus))
 $(eval $(call BuildPlugin,oss,OSS audio driver,oss,))
@@ -215,7 +206,6 @@ $(eval $(call BuildPlugin,sndfile,Audio dumper using libsndfile,sndfile,+libsndf
 $(eval $(call BuildPlugin,srtp,Secure RTP module using libre,srtp,))
 $(eval $(call BuildPlugin,stdio,Standard input/output UI driver,stdio,))
 $(eval $(call BuildPlugin,uuid,UUID generator and loader,uuid,))
-$(eval $(call BuildPlugin,v4l,Video4Linux video source,v4l,+libv4l))
 $(eval $(call BuildPlugin,v4l2,Video4Linux2 video source,v4l2,+libv4l))
 $(eval $(call BuildPlugin,v4l2_codec,Video4Linux2 video codec module,v4l2_codec,))
 $(eval $(call BuildPlugin,vidbridge,Video bridge module,vidbridge,))