diff options
| author | Jiri Slachta | 2021-08-04 10:58:22 +0000 |
|---|---|---|
| committer | GitHub | 2021-08-04 10:58:22 +0000 |
| commit | e0f93da595dc2794687225e12f5b86a7943fad27 (patch) | |
| tree | f6ca0828bafe663236f3b94ed8461b5cfd5600bf | |
| parent | a7bbc46a0230d386a55fe33c6146a12fc2a2f87e (diff) | |
| parent | db67f9b405e98f40de73c21c9c20eb3fdfb149bc (diff) | |
| download | telephony-e0f93da595dc2794687225e12f5b86a7943fad27.tar.gz | |
Merge pull request #664 from micmac1/bsipvid
baresip: allow avcodec build by default
| -rw-r--r-- | net/baresip/Config.in | 16 | ||||
| -rw-r--r-- | net/baresip/Makefile | 6 |
2 files changed, 1 insertions, 21 deletions
diff --git a/net/baresip/Config.in b/net/baresip/Config.in deleted file mode 100644 index 24efe8d..0000000 --- a/net/baresip/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -menu "bareSIP configuration" - depends on PACKAGE_baresip - -config BARESIP_WITH_FFMPEG - bool "Compile with FFmpeg support" - default y if (x86_64) - help - The sole purpose of this symbol is to prevent that the bareSIP - video modules, the ones which depend on FFmpeg, are built by - default. The reason is that FFmpeg often fails to compile for - some targets, causing the bareSIP compile to fail as well. - - If you want the modules which depend on FFmpeg to become - available, select 'y'. - -endmenu diff --git a/net/baresip/Makefile b/net/baresip/Makefile index 5e047ec..c612796 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -50,10 +50,6 @@ PKG_CONFIG_DEPENDS:= \ include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME)/config - source "$(SOURCE)/Config.in" -endef - define Package/baresip/Default SECTION:=net CATEGORY:=Network @@ -175,7 +171,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)) +$(eval $(call BuildPlugin,avcodec,Video codec using FFmpeg,avcodec,+libffmpeg-full)) $(eval $(call BuildPlugin,avformat,Video source using FFmpeg,avformat,baresip-mod-avcodec)) $(eval $(call BuildPlugin,b2bua,Back-to-Back User-Agent module,b2bua,)) $(eval $(call BuildPlugin,cons,UDP/TCP console UI driver,cons,)) |