All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adam Duskett <aduskett@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [V3 03/10] janus-gateway: Make audio bridge plugin optional.
Date: Wed, 25 Jan 2017 08:42:38 -0500	[thread overview]
Message-ID: <20170125134245.12920-3-aduskett@codeblue.com> (raw)
In-Reply-To: <20170125134245.12920-1-aduskett@codeblue.com>

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>
---
v2 -> v3:
  - Removed 'PLUGIN' from the name; as this is implied.
  - Removed 'default n' from the config file, as this is the default.
  - Selecting the audio bridge plugin now adds opus to the dependencies in the
    make file and selects the opus package in the config file.
  - remove unecessary check for opus in the make file as the package is now
    selected by default if the user chooses to enable the audiobridge plugin.
v1 -> v2: 
  - Fixed patch so that this patch adds the plugin to both the
    Config.in and the .mk file.

 package/janus-gateway/Config.in        |  4 ++++
 package/janus-gateway/janus-gateway.mk | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in
index b0a2e5d..c89c723 100644
--- a/package/janus-gateway/Config.in
+++ b/package/janus-gateway/Config.in
@@ -19,6 +19,10 @@ if BR2_PACKAGE_JANUS_GATEWAY
 
 comment "janus-gateway plugins"
 
+config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
+	select BR2_PACKAGE_OPUS
+	bool "audio bridge"
+
 config BR2_PACKAGE_JANUS_SIP_GATEWAY
 	select BR2_PACKAGE_SOFIA_SIP
 	bool "sip gateway"
diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
index dac324f..1f9ba49 100644
--- a/package/janus-gateway/janus-gateway.mk
+++ b/package/janus-gateway/janus-gateway.mk
@@ -26,6 +26,13 @@ JANUS_GATEWAY_CONF_OPTS = \
 	--disable-data-channels \
 	--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)
 JANUS_GATEWAY_DEPENDENCIES += sofia-sip
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-sip
@@ -40,13 +47,6 @@ else
 JANUS_GATEWAY_CONF_OPTS += --disable-websockets
 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)
 JANUS_GATEWAY_DEPENDENCIES += libogg
 JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail
-- 
2.9.3

  parent reply	other threads:[~2017-01-25 13:42 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-25 13:42 [Buildroot] [V3 01/10] janus-gateway: remove unessasary dependencies Adam Duskett
2017-01-25 13:42 ` [Buildroot] [V3 02/10] janus-gateway: Make sofia-sip a optional dependency Adam Duskett
2017-01-25 13:42 ` Adam Duskett [this message]
2017-01-25 13:42 ` [Buildroot] [V3 04/10] janus-gateway: Make echo test plugin optional Adam Duskett
2017-01-25 13:42 ` [Buildroot] [V3 05/10] janus-gateway: Make recordplay " Adam Duskett
2017-01-25 13:42 ` [Buildroot] [V3 06/10] janus-gateway: Make streaming " Adam Duskett
2017-01-25 13:42 ` [Buildroot] [V3 07/10] janus-gateway: Make text room " Adam Duskett
2017-01-25 13:42 ` [Buildroot] [V3 08/10] janus-gateway: Make video call " Adam Duskett
2017-01-25 13:42 ` [Buildroot] [V3 09/10] janus-gateway: Make video room " Adam Duskett
2017-01-25 13:42 ` [Buildroot] [V3 10/10] janus-gateway: Make voicemail " Adam Duskett
2017-01-28  8:46 ` [Buildroot] [V3 01/10] janus-gateway: remove unessasary dependencies Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170125134245.12920-3-aduskett@codeblue.com \
    --to=aduskett@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.