NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

janus-gateway: make audio bridge plugin optional

Browse Source 
Currently janus-gateway is built by default with the audio bridge plugin.
This causes a example config file to be placed on the target filing system
that the user may not need or want, creates a 119K .so
file on the target directory, adds the dependency of opus for this
plugin, and janus will also create a warning when ran if the plugin does
not have a matching configuration file setup by the user, as it will not use
the example config file by default.

This patch makes the audio bridge plugin a option, removes the check for opus,
adds opus as a dependency to the audio bridge plugin, and selects the opus
package automatically when the user selects the plugin.

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Adam Duskett 2017-01-25 08:42:38 -05:00 committed by Thomas Petazzoni
parent 7d34cbe938
commit 6f8f669341
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/janus-gateway/Config.in
View File

@ -19,6 +19,10 @@ if BR2_PACKAGE_JANUS_GATEWAY
comment "plugins" comment "plugins"
config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
bool "audio bridge"
select BR2_PACKAGE_OPUS
config BR2_PACKAGE_JANUS_SIP_GATEWAY config BR2_PACKAGE_JANUS_SIP_GATEWAY
bool "sip gateway" bool "sip gateway"
select BR2_PACKAGE_SOFIA_SIP select BR2_PACKAGE_SOFIA_SIP

14
package/janus-gateway/janus-gateway.mk
View File

@ -26,6 +26,13 @@ JANUS_GATEWAY_CONF_OPTS = \
--disable-data-channels \ --disable-data-channels \
--disable-rabbitmq --disable-rabbitmq
ifeq ($(BR2_PACKAGE_JANUS_AUDIO_BRIDGE),y)
JANUS_GATEWAY_DEPENDENCIES += opus
JANUS_GATEWAY_CONF_OPTS += --enable-plugin-audiobridge
else
JANUS_GATEWAY_CONF_OPTS += --disable-plugin-audiobridge
endif
ifeq ($(BR2_PACKAGE_JANUS_SIP_GATEWAY),y) ifeq ($(BR2_PACKAGE_JANUS_SIP_GATEWAY),y)
JANUS_GATEWAY_DEPENDENCIES += sofia-sip JANUS_GATEWAY_DEPENDENCIES += sofia-sip
JANUS_GATEWAY_CONF_OPTS += --enable-plugin-sip JANUS_GATEWAY_CONF_OPTS += --enable-plugin-sip
@ -40,13 +47,6 @@ else
JANUS_GATEWAY_CONF_OPTS += --disable-websockets JANUS_GATEWAY_CONF_OPTS += --disable-websockets
endif endif
ifeq ($(BR2_PACKAGE_OPUS),y)
JANUS_GATEWAY_DEPENDENCIES += opus
JANUS_GATEWAY_CONF_OPTS += --enable-plugin-audiobridge
else
JANUS_GATEWAY_CONF_OPTS += --disable-plugin-audiobridge
endif
ifeq ($(BR2_PACKAGE_LIBOGG),y) ifeq ($(BR2_PACKAGE_LIBOGG),y)
JANUS_GATEWAY_DEPENDENCIES += libogg JANUS_GATEWAY_DEPENDENCIES += libogg
JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail