janus-gateway: bump to version 0.2.3

PATCH New Adam Duskett 2 participants 9 messages Jun 15, 2017 – Jun 20, 2017

lore

Share & tools

lore

Adam Duskett

author

2017-06-15 12:13 UTC #0 lore raw

PATCH 1/7 janus-gateway: bump to version 0.2.3

Signed-off-by Adam Duskett <[email protected]>

---
 package/janus-gateway/janus-gateway.hash | 2 +-
 package/janus-gateway/janus-gateway.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/janus-gateway/janus-gateway.hash +1 -1

index 546aff9..75c25fc 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 f5b1909fd9b8546f8be518f7c682b80916a8204c95f23a95c720524df62cca34 janus-gateway-v0.2.2.tar.gz
+sha256 95d24024e4854a43fdc44b422e5472eb298d840abc3260b94a3623eb9e3d300b janus-gateway-v0.2.3.tar.gz

package/janus-gateway/janus-gateway.mk +1 -1

index 7c35bfb..b79e340 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JANUS_GATEWAY_VERSION = v0.2.2
+JANUS_GATEWAY_VERSION = v0.2.3
 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,$(JANUS_GATEWAY_VERSION))
 JANUS_GATEWAY_LICENSE = GPL-3.0
 JANUS_GATEWAY_LICENSE_FILES = COPYING

Signature · 1 line

2.9.4

Adam Duskett

author

2017-06-15 12:13 UTC #1 lore raw

PATCH 2/7 janus-gateway: add transports section to config.

janus-gateway supports many different transports, and currently there is no implicit way to turn them off or on. Instead, if the dependency happens to be built, then the transport is enabled.

Create a transports section in the config file and add BR2_PACKAGE_JANUS_REST as the first transport.

Signed-off-by Adam Duskett <[email protected]>

---
 package/janus-gateway/Config.in        | 6 ++++++
 package/janus-gateway/janus-gateway.mk | 7 +++++++
 2 files changed, 13 insertions(+)

package/janus-gateway/Config.in +6 -0

index e07b4ad..7fc213f 100644
@@ -54,6 +54,12 @@ config BR2_PACKAGE_JANUS_VOICE_MAIL
 	bool "voice mail"
 	select BR2_PACKAGE_LIBOGG
 
+comment "transports"
+
+config BR2_PACKAGE_JANUS_REST
+	bool "REST (HTTP/HTTPS)"
+	select BR2_PACKAGE_LIBMICROHTTPD
+
 endif
 
 comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"

package/janus-gateway/janus-gateway.mk +7 -0

index b79e340..01021f8 100644
@@ -91,6 +91,13 @@ else
 JANUS_GATEWAY_CONF_OPTS += --disable-websockets
 endif
 
+ifeq ($(BR2_PACKAGE_JANUS_REST),y)
+JANUS_GATEWAY_DEPENDENCIES += libmicrohttpd
+JANUS_GATEWAY_CONF_OPTS += --enable-rest
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-rest
+endif
+
 # Parallel build broken
 JANUS_GATEWAY_MAKE = $(MAKE1)

Signature · 1 line

2.9.4

Thomas Petazzoni

Applied

2017-06-20 21:13 UTC #2 lore raw

PATCH 2/7 janus-gateway: add transports section to config.

Hello,

Quoted 4 lines · Adam Duskett

janus-gateway supports many different transports, and currently there is no implicit way to turn them off or on. Instead, if the dependency happens to be built, then the transport is enabled.

Quoted 8 lines

Create a transports section in the config file and add BR2_PACKAGE_JANUS_REST as the first transport.
Signed-off-by Adam Duskett <[email protected]>
---
 package/janus-gateway/Config.in        | 6 ++++++
 package/janus-gateway/janus-gateway.mk | 7 +++++++
 2 files changed, 13 insertions(+)

I've applied patches 2 to 7. However, it would be nice to be a little bit more careful in the patches. I had to fix a few things:

* The title had a typo in most of the commits: gatway -> gateway

* Inconsistent ending of the titles: some ending with a final dot, some not. The latter being the preferred choice.

* You forgot to propagate the dependencies of the packages being selected, and adding the corresponding Config.in comment.

* You forgot to use alphabetic ordering where appropriate.

All those are minor nits, but they add up, and need to be fixed before applying the patches.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Adam Duskett

author

2017-06-15 12:13 UTC #3 lore raw

PATCH 3/7 janus-gatway: add websockets to transport section.

In reply to Adam Duskett

Signed-off-by Adam Duskett <[email protected]>

---
 package/janus-gateway/Config.in        | 4 ++++
 package/janus-gateway/janus-gateway.mk | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

package/janus-gateway/Config.in +4 -0

index 7fc213f..eaec8a1 100644
@@ -60,6 +60,10 @@ config BR2_PACKAGE_JANUS_REST
 	bool "REST (HTTP/HTTPS)"
 	select BR2_PACKAGE_LIBMICROHTTPD
 
+config BR2_PACKAGE_JANUS_WEBSOCKETS
+	bool "WebSockets"
+	select BR2_PACKAGE_LIBWEBSOCKETS
+
 endif
 
 comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"

package/janus-gateway/janus-gateway.mk +1 -1

index 01021f8..4a13199 100644
@@ -84,7 +84,7 @@ else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail
 endif
 
-ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y)
+ifeq ($(BR2_PACKAGE_JANUS_WEBSOCKETS),y)
 JANUS_GATEWAY_DEPENDENCIES += libwebsockets
 JANUS_GATEWAY_CONF_OPTS += --enable-websockets
 else

Signature · 1 line

2.9.4

Adam Duskett

author

2017-06-15 12:13 UTC #4 lore raw

PATCH 4/7 janus-gatway: add rabbitmq to transports section

In reply to Adam Duskett

Signed-off-by Adam Duskett <[email protected]>

---
 package/janus-gateway/Config.in        | 4 ++++
 package/janus-gateway/janus-gateway.mk | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

package/janus-gateway/Config.in +4 -0

index eaec8a1..3b3d148 100644
@@ -64,6 +64,10 @@ config BR2_PACKAGE_JANUS_WEBSOCKETS
 	bool "WebSockets"
 	select BR2_PACKAGE_LIBWEBSOCKETS
 
+config BR2_PACKAGE_JANUS_RABBITMQ
+	bool "RabbitMQ"
+	select BR2_PACKAGE_RABBITMQ_C
+
 endif
 
 comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"

package/janus-gateway/janus-gateway.mk +7 -1

index 4a13199..6aa824e 100644
@@ -24,7 +24,6 @@ JANUS_GATEWAY_POST_PATCH_HOOKS += JANUS_GATEWAY_M4
 
 JANUS_GATEWAY_CONF_OPTS = \
 	--disable-data-channels \
-	--disable-rabbitmq \
 	--disable-sample-event-handler
 
 ifeq ($(BR2_PACKAGE_JANUS_AUDIO_BRIDGE),y)

@@ -98,6 +97,13 @@ else
 JANUS_GATEWAY_CONF_OPTS += --disable-rest
 endif
 
+ifeq ($(BR2_PACKAGE_JANUS_RABBITMQ),y)
+JANUS_GATEWAY_DEPENDENCIES += rabbitmq-c
+JANUS_GATEWAY_CONF_OPTS += --enable-rabbitmq
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-rabbitmq
+endif
+
 # Parallel build broken
 JANUS_GATEWAY_MAKE = $(MAKE1)

Signature · 1 line

2.9.4

Adam Duskett

author

2017-06-15 12:13 UTC #5 lore raw

PATCH 5/7 janus-gatway: add mqtt to transport section

In reply to Adam Duskett

Signed-off-by Adam Duskett <[email protected]>

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

package/janus-gateway/Config.in +4 -0

index 3b3d148..4122708 100644
@@ -68,6 +68,10 @@ config BR2_PACKAGE_JANUS_RABBITMQ
 	bool "RabbitMQ"
 	select BR2_PACKAGE_RABBITMQ_C
 
+config BR2_PACKAGE_JANUS_MQTT
+	bool "MQTT"
+	select BR2_PACKAGE_PAHO_MQTT_C
+
 endif
 
 comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"

package/janus-gateway/janus-gateway.mk +7 -0

index 6aa824e..915f812 100644
@@ -104,6 +104,13 @@ else
 JANUS_GATEWAY_CONF_OPTS += --disable-rabbitmq
 endif
 
+ifeq ($(BR2_PACKAGE_JANUS_MQTT),y)
+JANUS_GATEWAY_DEPENDENCIES += paho-mqtt-c
+JANUS_GATEWAY_CONF_OPTS += --enable-mqtt
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-mqtt
+endif
+
 # Parallel build broken
 JANUS_GATEWAY_MAKE = $(MAKE1)

Signature · 1 line

2.9.4

Adam Duskett

author

2017-06-15 12:13 UTC #6 lore raw

PATCH 6/7 janus-gatway: add unix-sockets to transport section

In reply to Adam Duskett

Signed-off-by Adam Duskett <[email protected]>

---
 package/janus-gateway/Config.in        | 3 +++
 package/janus-gateway/janus-gateway.mk | 6 ++++++
 2 files changed, 9 insertions(+)

package/janus-gateway/Config.in +3 -0

index 4122708..fcc4717 100644
@@ -72,6 +72,9 @@ config BR2_PACKAGE_JANUS_MQTT
 	bool "MQTT"
 	select BR2_PACKAGE_PAHO_MQTT_C
 
+config BR2_PACKAGE_JANUS_UNIX_SOCKETS
+	bool "Unix Sockets"
+	default y
 endif
 
 comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"

package/janus-gateway/janus-gateway.mk +6 -0

index 915f812..94fc9a4 100644
@@ -111,6 +111,12 @@ else
 JANUS_GATEWAY_CONF_OPTS += --disable-mqtt
 endif
 
+ifeq ($(BR2_PACKAGE_JANUS_UNIX_SOCKETS),y)
+JANUS_GATEWAY_CONF_OPTS += --enable-unix-sockets
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-unix-sockets
+endif
+
 # Parallel build broken
 JANUS_GATEWAY_MAKE = $(MAKE1)

Signature · 1 line

2.9.4

Adam Duskett

author

2017-06-15 12:13 UTC #7 lore raw

PATCH 7/7 DEVELOPERS: Add janus-gateway to Adam Duskett

In reply to Adam Duskett

Signed-off-by Adam Duskett <[email protected]>

---
 DEVELOPERS | 1 +
 1 file changed, 1 insertion(+)

DEVELOPERS +1 -0

index 9a11f8b..c99c398 100644
@@ -33,6 +33,7 @@ N:	Adam Duskett <[email protected]>
 F:	package/audit/
 F:	package/checkpolicy/
 F:	package/gstreamer1/gst1-vaapi/
+F:	package/janus-gateway/
 F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/

Signature · 1 line

2.9.4

Thomas Petazzoni

Applied

2017-06-15 21:34 UTC #8 lore raw

PATCH 1/7 janus-gateway: bump to version 0.2.3

In reply to Adam Duskett

Hello,

Quoted 5 lines · Adam Duskett

Signed-off-by Adam Duskett <[email protected]>

---
 package/janus-gateway/janus-gateway.hash | 2 +-
 package/janus-gateway/janus-gateway.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com