Bump buildroot to version 2017-02

TG-3 #closed
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
--- a/bsp/buildroot/package/janus-gateway/Config.in
+++ b/bsp/buildroot/package/janus-gateway/Config.in
@@ -1,14 +1,11 @@
-config BR2_PACKAGE_JANUS_GATEWAY
+menuconfig BR2_PACKAGE_JANUS_GATEWAY
 	bool "janus-gateway"
-	select BR2_PACKAGE_LIBMICROHTTPD
 	select BR2_PACKAGE_JANSSON
+	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBNICE
-	select BR2_PACKAGE_SOFIA_SIP
 	select BR2_PACKAGE_LIBSRTP
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_DING_LIBS
-	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libmicrohttpd
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_WCHAR # libnice -> libglib2
 	depends on BR2_USE_MMU # libnice
 	depends on !BR2_STATIC_LIBS # dlopen
@@ -18,6 +15,47 @@ config BR2_PACKAGE_JANUS_GATEWAY

 	  https://github.com/meetecho/janus-gateway

+if BR2_PACKAGE_JANUS_GATEWAY
+
+comment "plugins"
+
+config BR2_PACKAGE_JANUS_AUDIO_BRIDGE
+	bool "audio bridge"
+	select BR2_PACKAGE_OPUS
+
+config BR2_PACKAGE_JANUS_ECHO_TEST
+	bool "echo test"
+
+config BR2_PACKAGE_JANUS_RECORDPLAY
+	bool "record and play"
+
+config BR2_PACKAGE_JANUS_SIP_GATEWAY
+	bool "sip gateway"
+	select BR2_PACKAGE_SOFIA_SIP
+
+config  BR2_PACKAGE_JANUS_STREAMING
+	bool "streaming"
+	# SO_REUSEPORT
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
+
+comment "streaming plugin needs a toolchain w/ headers >= 3.9"
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
+
+config BR2_PACKAGE_JANUS_TEXT_ROOM
+	bool "text room"
+
+config BR2_PACKAGE_JANUS_VIDEO_CALL
+	bool "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"
 	depends on BR2_USE_MMU
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
--- a/bsp/buildroot/package/janus-gateway/janus-gateway.hash
+++ b/bsp/buildroot/package/janus-gateway/janus-gateway.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 4d341a54d3eae5506c3e2409f4a6e4f5159dc4ece3197aaf077d3eb997e69a10 janus-gateway-v0.1.0.tar.gz
+sha256 5d071592faca2a1574b996b4ca07b6c9e02cd42a719b0dbb4bfb5dfde8d55ff3 janus-gateway-v0.2.1.tar.gz
--- a/bsp/buildroot/package/janus-gateway/janus-gateway.mk
+++ b/bsp/buildroot/package/janus-gateway/janus-gateway.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################

-JANUS_GATEWAY_VERSION = v0.1.0
+JANUS_GATEWAY_VERSION = v0.2.1
 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,$(JANUS_GATEWAY_VERSION))
 JANUS_GATEWAY_LICENSE = GPLv3
 JANUS_GATEWAY_LICENSE_FILES = COPYING

 # ding-libs provides the ini_config library
-JANUS_GATEWAY_DEPENDENCIES = host-pkgconf libmicrohttpd jansson \
-	libnice sofia-sip libsrtp host-gengetopt openssl ding-libs
+JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \
+	libsrtp host-gengetopt libglib2 openssl 

 # Straight out of the repository, no ./configure, and we also patch
 # configure.ac.
@@ -26,6 +26,63 @@ 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_ECHO_TEST),y)
+JANUS_GATEWAY_CONF_OPTS += --enable-plugin-echotest
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-plugin-echotest
+endif
+
+ifeq ($(BR2_PACKAGE_JANUS_RECORDPLAY),y)
+JANUS_GATEWAY_CONF_OPTS += --enable-plugin-recordplay
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-plugin-recordplay
+endif
+
+ifeq ($(BR2_PACKAGE_JANUS_SIP_GATEWAY),y)
+JANUS_GATEWAY_DEPENDENCIES += sofia-sip
+JANUS_GATEWAY_CONF_OPTS += --enable-plugin-sip
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-plugin-sip
+endif
+
+ifeq ($(BR2_PACKAGE_JANUS_STREAMING),y)
+JANUS_GATEWAY_CONF_OPTS += --enable-plugin-streaming
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-plugin-streaming
+endif
+
+ifeq ($(BR2_PACKAGE_JANUS_TEXT_ROOM),y)
+JANUS_GATEWAY_CONF_OPTS += --enable-plugin-textroom
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-plugin-textroom
+endif
+
+ifeq ($(BR2_PACKAGE_JANUS_VIDEO_CALL),y)
+JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videocall
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videocall
+endif
+
+ifeq ($(BR2_PACKAGE_JANUS_VIDEO_ROOM),y)
+JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videoroom
+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
@@ -33,20 +90,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
-else
-JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail
-endif
-
 # Parallel build broken
 JANUS_GATEWAY_MAKE = $(MAKE1)