From a442df04df8bb9c1480cd010e4993564e5106f8d Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 11 Nov 2018 11:15:36 +0100 Subject: [PATCH] baresip: remove depend on libx264 Following up the discussion in pull request #388 this commit removes the depend on libx264 and prevents baresip from linking to libx264. baresip can still use a H.264 encoder through ffmpeg, which is the preferred way anyway. Signed-off-by: Sebastian Kemper --- net/baresip/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/net/baresip/Makefile b/net/baresip/Makefile index d7efe33..7f6791c 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=baresip PKG_VERSION:=0.5.9 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub @@ -96,6 +96,9 @@ 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)" \ @@ -108,7 +111,8 @@ 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) + $(BARESIP_MOD_OPTIONS) \ + USE_X264= TARGET_CFLAGS+=-D_GNU_SOURCE @@ -186,7 +190,7 @@ $(eval $(call BuildPackage,baresip)) $(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,avcodec,Video codec using FFmpeg,avcodec,@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,)) -- 2.30.2