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

janus-gateway: make voicemail plugin optional

Browse Source 
Currently janus-gateway's voicemail plugin is only built if
libogg is selected, and even then there is no way to disable the plugin from
being built. This causes a example config file to be placed on
the target filing system that the user may not need or want, creates a 33K .so
file on the target directory, and janus will also generate 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 voicemail plugin optional, removes the check for libogg,
adds libogg as a dependency to the voicemail plugin, and selects the libogg
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:45 -05:00 committed by Thomas Petazzoni
parent 955f2e6d1c
commit 7ea01e10ee
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

@ -45,6 +45,10 @@ config BR2_PACKAGE_JANUS_VIDEO_CALL
config BR2_PACKAGE_JANUS_VIDEO_ROOM
bool "video room"
config BR2_PACKAGE_JANUS_VOICE_MAIL
bool "voice mail"
select BR2_PACKAGE_LIBOGG
endif
comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"

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

@ -76,6 +76,13 @@ else
JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videoroom
endif
ifeq ($(BR2_PACKAGE_JANUS_VOICE_MAIL),y)
JANUS_GATEWAY_DEPENDENCIES += libogg
JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail
else
JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail
endif
ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y)
JANUS_GATEWAY_DEPENDENCIES += libwebsockets
JANUS_GATEWAY_CONF_OPTS += --enable-websockets
@ -83,13 +90,6 @@ else
JANUS_GATEWAY_CONF_OPTS += --disable-websockets
endif
ifeq ($(BR2_PACKAGE_LIBOGG),y)
JANUS_GATEWAY_DEPENDENCIES += libogg
JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail
else
JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail
endif
# Parallel build broken
JANUS_GATEWAY_MAKE = $(MAKE1)