update buildroot to 2017.02.11
This commit is contained in:
jbnadal
@@ -0,0 +1,38 @@
|
||||
From 26f884bf977977041fe6f98a0af186be1580bf22 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Morlat <simon.morlat@linphone.org>
|
||||
Date: Thu, 29 Sep 2016 15:26:18 +0200
|
||||
Subject: [PATCH] fix compilation issue with latest bctoobox
|
||||
|
||||
[Upstream commit https://github.com/BelledonneCommunications/mediastreamer2/commit/26f884bf977977041fe6f98a0af186be1580bf22]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
src/crypto/dtls_srtp.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7ab20a08f..244d87275 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1116,7 +1116,7 @@ fi
|
||||
|
||||
|
||||
dnl check bctoolbox library
|
||||
-PKG_CHECK_MODULES(BCTOOLBOX, bctoolbox >= 0.0.0, found_bctoolbox=true, found_bctoolbox=false)
|
||||
+PKG_CHECK_MODULES(BCTOOLBOX, bctoolbox >= 0.4.0, found_bctoolbox=true, found_bctoolbox=false)
|
||||
if test "$found_bctoolbox" = "true" ; then
|
||||
LIBS="$LIBS $BCTOOLBOX_LIBS"
|
||||
CFLAGS="$CFLAGS $BCTOOLBOX_CFLAGS"
|
||||
diff --git a/src/crypto/dtls_srtp.c b/src/crypto/dtls_srtp.c
|
||||
index e2c8e1c44..fd37eb5cb 100644
|
||||
--- a/src/crypto/dtls_srtp.c
|
||||
+++ b/src/crypto/dtls_srtp.c
|
||||
@@ -705,7 +705,7 @@ static int ms_dtls_srtp_initialise_bctbx_dtls_context(DtlsBcToolBoxContext *dtls
|
||||
bctbx_ssl_config_set_authmode(dtlsContext->ssl_config, BCTBX_SSL_VERIFY_OPTIONAL);
|
||||
bctbx_ssl_config_set_own_cert( dtlsContext->ssl_config, dtlsContext->crt, dtlsContext->pkey );
|
||||
/* This is useless as peer would certainly be a self signed certificate and we won't verify it but avoid runtime warnings */
|
||||
- bctbx_ssl_config_set_ca_chain(dtlsContext->ssl_config, dtlsContext->crt, NULL);
|
||||
+ bctbx_ssl_config_set_ca_chain(dtlsContext->ssl_config, dtlsContext->crt);
|
||||
|
||||
/* we are not ready yet to actually start the ssl context, this will be done by calling bctbx_ssl_setup when stream starts */
|
||||
return 0;
|
||||
17
bsp/buildroot-2017.02.11/package/mediastreamer/Config.in
Normal file
17
bsp/buildroot-2017.02.11/package/mediastreamer/Config.in
Normal file
@@ -0,0 +1,17 @@
|
||||
config BR2_PACKAGE_MEDIASTREAMER
|
||||
bool "mediastreamer"
|
||||
select BR2_PACKAGE_ORTP
|
||||
depends on BR2_INSTALL_LIBSTDCPP # ortp
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
|
||||
help
|
||||
Mediastreamer is a powerful and lightweighted streaming
|
||||
engine specialized for voice/video telephony applications.
|
||||
|
||||
It is the library that is responsible for all the receiving
|
||||
and sending of multimedia streams in linphone, including
|
||||
voice/video capture, encoding and decoding, and rendering.
|
||||
|
||||
http://www.linphone.org/eng/documentation/dev/mediastreamer2.html
|
||||
|
||||
comment "mediastreamer needs a toolchain w/ threads, C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 1144849c0c96abafb1153adf56109f0f195a9e4a53cf28cb611bbca7a9012c1a mediastreamer-2.14.0.tar.gz
|
||||
113
bsp/buildroot-2017.02.11/package/mediastreamer/mediastreamer.mk
Normal file
113
bsp/buildroot-2017.02.11/package/mediastreamer/mediastreamer.mk
Normal file
@@ -0,0 +1,113 @@
|
||||
################################################################################
|
||||
#
|
||||
# mediastreamer
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MEDIASTREAMER_VERSION = 2.14.0
|
||||
MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer
|
||||
MEDIASTREAMER_INSTALL_STAGING = YES
|
||||
# host-vim needed for the xxd utility
|
||||
MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext host-vim
|
||||
# tests fail linking on some architectures, so disable them
|
||||
MEDIASTREAMER_CONF_OPTS = --disable-tests --disable-glx --disable-strict
|
||||
MEDIASTREAMER_LICENSE = GPLv2+
|
||||
MEDIASTREAMER_LICENSE_FILES = COPYING
|
||||
|
||||
# patching configure.ac
|
||||
MEDIASTREAMER_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-alsa
|
||||
MEDIASTREAMER_DEPENDENCIES += alsa-lib
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-alsa
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUPNP),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-upnp
|
||||
MEDIASTREAMER_DEPENDENCIES += libupnp
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-upnp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVPX),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-vp8
|
||||
MEDIASTREAMER_DEPENDENCIES += libvpx
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-vp8
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPUS),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-opus
|
||||
MEDIASTREAMER_DEPENDENCIES += opus
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-opus
|
||||
endif
|
||||
|
||||
# portaudio backend needs speex as well
|
||||
ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEX),yy)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-portaudio
|
||||
MEDIASTREAMER_DEPENDENCIES += portaudio speex
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-portaudio
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-pulseaudio
|
||||
MEDIASTREAMER_DEPENDENCIES += pulseaudio
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-pulseaudio
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SPEEX),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-speex
|
||||
MEDIASTREAMER_DEPENDENCIES += speex
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-speex
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-ffmpeg
|
||||
MEDIASTREAMER_DEPENDENCIES += ffmpeg
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-ffmpeg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SDL),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-sdl
|
||||
MEDIASTREAMER_DEPENDENCIES += sdl
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-sdl
|
||||
endif
|
||||
|
||||
# mediastreamer assumes SDL has X11 support if --enable-x11 (and X11 support
|
||||
# is only used for SDL output)
|
||||
ifeq ($(BR2_PACKAGE_SDL_X11),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-x11
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-x11
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-xv
|
||||
MEDIASTREAMER_DEPENDENCIES += xlib_libXv
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-xv
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-theora
|
||||
MEDIASTREAMER_DEPENDENCIES += libtheora
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-theora
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBV4L),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-libv4l1 --enable-libv4l2
|
||||
MEDIASTREAMER_DEPENDENCIES += libv4l
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-libv4l1 --disable-libv4l2
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user