[Pkg-voip-commits] [janus] 145/282: Fixed conflicts introduced after merge of NoSIP branch
Jonas Smedegaard
dr at jones.dk
Wed Dec 20 21:53:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.
commit 20ebfe3900c4fd0d36f642f82d094752f9d9d959
Merge: 969ecd8 5cbe556
Author: Lorenzo Miniero <lminiero at gmail.com>
Date: Mon Oct 23 19:11:44 2017 +0200
Fixed conflicts introduced after merge of NoSIP branch
Makefile.am | 14 +-
README.md | 2 +-
conf/janus.plugin.nosip.cfg.sample | 10 +
configure.ac | 15 +-
docs/janus-doxygen.cfg | 2 +-
html/demos.html | 4 +
html/navbar.html | 3 +-
html/nosiptest.html | 102 ++
html/nosiptest.js | 406 ++++++++
janus.c | 16 +-
janus.ggo | 2 +-
plugins/janus_nosip.c | 2008 ++++++++++++++++++++++++++++++++++++
12 files changed, 2569 insertions(+), 15 deletions(-)
diff --cc Makefile.am
index aef7d5e,0c3dcb4..53cc180
--- a/Makefile.am
+++ b/Makefile.am
@@@ -339,16 -339,16 +339,26 @@@ conf_DATA += conf/janus.plugin.sip.cfg.
EXTRA_DIST += conf/janus.plugin.sip.cfg.sample
endif
+if ENABLE_PLUGIN_SIPRE
+plugin_LTLIBRARIES += plugins/libjanus_sipre.la
+plugins_libjanus_sipre_la_SOURCES = plugins/janus_sipre.c
+plugins_libjanus_sipre_la_CFLAGS = $(plugins_cflags) $(LIBRE_CFLAGS)
+plugins_libjanus_sipre_la_LDFLAGS = $(plugins_ldflags) $(LIBRE_LDFLAGS) $(LIBRE_LIBS)
+plugins_libjanus_sipre_la_LIBADD = $(plugins_libadd) $(LIBRE_LIBADD)
+conf_DATA += conf/janus.plugin.sipre.cfg.sample
+EXTRA_DIST += conf/janus.plugin.sipre.cfg.sample
+endif
+
+ if ENABLE_PLUGIN_NOSIP
+ plugin_LTLIBRARIES += plugins/libjanus_nosip.la
+ plugins_libjanus_nosip_la_SOURCES = plugins/janus_nosip.c
+ plugins_libjanus_nosip_la_CFLAGS = $(plugins_cflags)
+ plugins_libjanus_nosip_la_LDFLAGS = $(plugins_ldflags)
+ plugins_libjanus_nosip_la_LIBADD = $(plugins_libadd)
+ conf_DATA += conf/janus.plugin.nosip.cfg.sample
+ EXTRA_DIST += conf/janus.plugin.nosip.cfg.sample
+ endif
+
if ENABLE_PLUGIN_STREAMING
plugin_LTLIBRARIES += plugins/libjanus_streaming.la
plugins_libjanus_streaming_la_SOURCES = plugins/janus_streaming.c
diff --cc configure.ac
index b572565,9367559..e29b4dc
--- a/configure.ac
+++ b/configure.ac
@@@ -88,8 -88,8 +88,10 @@@ AC_ARG_ENABLE([all-plugins]
[enable_plugin_recordplay=no])
AS_IF([test "x$enable_plugin_sip" != "xyes"],
[enable_plugin_sip=no])
+ AS_IF([test "x$enable_plugin_sipre" != "xyes"],
+ [enable_plugin_sipre=no])
+ AS_IF([test "x$enable_plugin_nosip" != "xyes"],
+ [enable_plugin_nosip=no])
AS_IF([test "x$enable_plugin_streaming" != "xyes"],
[enable_plugin_streaming=no])
AS_IF([test "x$enable_plugin_textroom" != "xyes"],
@@@ -478,13 -478,13 +480,20 @@@ AC_ARG_ENABLE([plugin-sip]
[enable_plugin_sip=no])],
[enable_plugin_sip=maybe])
+AC_ARG_ENABLE([plugin-sipre],
+ [AS_HELP_STRING([--disable-plugin-sipre],
+ [Disable sipre plugin])],
+ [AS_IF([test "x$enable_plugin_sipre" != "xyes"],
+ [enable_plugin_sipre=no])],
+ [enable_plugin_sipre=maybe])
+
+ AC_ARG_ENABLE([plugin-nosip],
+ [AS_HELP_STRING([--disable-plugin-nosip],
+ [Disable nosip plugin])],
+ [AS_IF([test "x$enable_plugin_nosip" != "xyes"],
+ [enable_plugin_nosip=no])],
+ [enable_plugin_nosip=yes])
+
AC_ARG_ENABLE([plugin-streaming],
[AS_HELP_STRING([--disable-plugin-streaming],
[Disable streaming plugin])],
@@@ -583,7 -563,7 +592,8 @@@ AM_CONDITIONAL([ENABLE_PLUGIN_AUDIOBRID
AM_CONDITIONAL([ENABLE_PLUGIN_ECHOTEST], [test "x$enable_plugin_echotest" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_RECORDPLAY], [test "x$enable_plugin_recordplay" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_SIP], [test "x$enable_plugin_sip" = "xyes"])
+AM_CONDITIONAL([ENABLE_PLUGIN_SIPRE], [test "x$enable_plugin_sipre" = "xyes"])
+ AM_CONDITIONAL([ENABLE_PLUGIN_NOSIP], [test "x$enable_plugin_nosip" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_STREAMING], [test "x$enable_plugin_streaming" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_VIDEOCALL], [test "x$enable_plugin_videocall" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_VIDEOROOM], [test "x$enable_plugin_videoroom" = "xyes"])
@@@ -747,11 -727,11 +757,14 @@@ AM_COND_IF([ENABLE_PLUGIN_VIDEOCALL]
[echo " Video Call: yes"],
[echo " Video Call: no"])
AM_COND_IF([ENABLE_PLUGIN_SIP],
- [echo " SIP Gateway: yes"],
- [echo " SIP Gateway: no"])
+ [echo " SIP Gateway (Sofia): yes"],
+ [echo " SIP Gateway (Sofia): no"])
+AM_COND_IF([ENABLE_PLUGIN_SIPRE],
+ [echo " SIP Gateway (libre): yes"],
+ [echo " SIP Gateway (libre): no"])
+ AM_COND_IF([ENABLE_PLUGIN_NOSIP],
+ [echo " NoSIP (RTP Bridge): yes"],
+ [echo " NoSIP (RTP Bridge): no"])
AM_COND_IF([ENABLE_PLUGIN_AUDIOBRIDGE],
[echo " Audio Bridge: yes"],
[echo " Audio Bridge: no"])
diff --cc html/demos.html
index 7e51635,94fa116..4db72f8
--- a/html/demos.html
+++ b/html/demos.html
@@@ -82,9 -82,9 +82,13 @@@
<td colspan=2><h3>Other legacy demos</h3></td>
</tr>
<tr>
+ <td><a href="sipretest.html">SIP Gateway (libre)</a></td>
+ <td>Same as the SIP demo above, but using the libre-based plugin instead of the Sofia-based one.</td>
+ </tr>
++ <tr>
+ <td><a href="nosiptest.html">NoSIP (SDP/RTP)</a></td>
+ <td>A legacy interop demo (e.g., with a SIP peer) where signalling is up to the application.</td>
+ </tr>
</table>
<table class="table table-striped">
<tr>
diff --cc html/navbar.html
index 9ec12e9,508a19a..42f0439
--- a/html/navbar.html
+++ b/html/navbar.html
@@@ -25,7 -25,7 +25,8 @@@
<li><a href="recordplaytest.html">Recorder/Playout</a></li>
<li><a href="screensharingtest.html">Screen Sharing</a></li>
<li class="divider"></li>
+ <li><a href="sipretest.html">SIP Gateway (libre)</a></li>
+ <li><a href="nosiptest.html">NoSIP (SDP/RTP)</a></li>
<li class="divider"></li>
<li><a href="devicetest.html">Device Selection</a></li>
<li><a href="vp9svctest.html">VP9-SVC Video Room</a></li>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git
More information about the Pkg-voip-commits
mailing list