summaryrefslogtreecommitdiff
path: root/net/baresip
diff options
context:
space:
mode:
authorSebastian Kemper <sebastian_ml@gmx.net>2021-07-31 11:49:01 +0200
committerSebastian Kemper <sebastian_ml@gmx.net>2021-07-31 11:49:03 +0200
commitdb67f9b405e98f40de73c21c9c20eb3fdfb149bc (patch)
treea35ef839cbe52446210c69bdc1cc632b4acadb75 /net/baresip
parent492c89974b467d4c54e5219fa37a3a360c381a03 (diff)
baresip: allow avcodec build by default
ffmpeg hasn't been failing for a while now it seems. And on the forum a topic was raised regarding the unavailability of the video modules (see [1]). [1] https://forum.openwrt.org/t/cant-download-baresip-mod-avcodec-and-baresip-mod-avformat-no-video-with-v4l2-codec-in-baresip-to-baresip-video-call/101037 Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Diffstat (limited to 'net/baresip')
-rw-r--r--net/baresip/Config.in16
-rw-r--r--net/baresip/Makefile6
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,))