From: Sebastian Kemper Date: Sat, 24 Mar 2018 08:41:40 +0000 (+0100) Subject: baresip: fix mod-avformat DEPENDS X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=66d0d185dfd4a3d3a43f27594078a0866916267b;p=feed%2Ftelephony.git baresip: fix mod-avformat DEPENDS mod-avformat is only built when mod-avcodec is selected. baresip sets it up like that in mk/modules.mk: ifneq ($(USE_AVCODEC),) MODULES += avcodec ifneq ($(USE_AVFORMAT),) MODULES += avformat endif endif This commit updates the mod-avformat DEPENDS accordingly. Signed-off-by: Sebastian Kemper --- diff --git a/net/baresip/Makefile b/net/baresip/Makefile index b676888..c99665e 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=baresip PKG_VERSION:=0.5.8 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub @@ -187,7 +187,7 @@ $(eval $(call BuildPlugin,alsa,ALSA audio driver,alsa,+alsa-lib)) $(eval $(call BuildPlugin,aubridge,Audio bridge module,aubridge,)) $(eval $(call BuildPlugin,aufile,Audio module for using a WAV-file as audio input,aufile,)) $(eval $(call BuildPlugin,avcodec,Video codec using FFmpeg,avcodec,@BARESIP_WITH_FFMPEG +libffmpeg-full +libx264)) -$(eval $(call BuildPlugin,avformat,Video source using FFmpeg,avformat,@BARESIP_WITH_FFMPEG +libffmpeg-full)) +$(eval $(call BuildPlugin,avformat,Video source using FFmpeg,avformat,baresip-mod-avcodec)) $(eval $(call BuildPlugin,cons,UDP/TCP console UI driver,cons,)) $(eval $(call BuildPlugin,ctrl_tcp,TCP control interface,ctrl_tcp,)) $(eval $(call BuildPlugin,debug_cmd,Debug commands,debug_cmd,))