Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
@@ -11,6 +11,7 @@ source "package/gstreamer1/gst1-imx/Config.in"
|
||||
source "package/gstreamer1/gst1-interpipe/Config.in"
|
||||
source "package/gstreamer1/gst1-libav/Config.in"
|
||||
source "package/gstreamer1/gst1-rtsp-server/Config.in"
|
||||
source "package/gstreamer1/gst1-shark/Config.in"
|
||||
source "package/gstreamer1/gst1-validate/Config.in"
|
||||
source "package/gstreamer1/gst1-vaapi/Config.in"
|
||||
source "package/gstreamer1/gst-omx/Config.in"
|
||||
|
||||
@@ -12,26 +12,26 @@ GST_OMX_LICENSE = LGPL-2.1
|
||||
GST_OMX_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
|
||||
GST_OMX_CONF_OPTS = \
|
||||
--with-omx-target=rpi
|
||||
GST_OMX_VARIANT = rpi
|
||||
GST_OMX_CONF_ENV = \
|
||||
CFLAGS="$(TARGET_CFLAGS) \
|
||||
-I$(STAGING_DIR)/usr/include/IL \
|
||||
-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
|
||||
-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BELLAGIO),y)
|
||||
GST_OMX_CONF_OPTS = \
|
||||
--with-omx-target=bellagio
|
||||
else ifeq ($(BR2_PACKAGE_BELLAGIO),y)
|
||||
GST_OMX_VARIANT = bellagio
|
||||
GST_OMX_CONF_ENV = \
|
||||
CFLAGS="$(TARGET_CFLAGS) \
|
||||
-DOMX_VERSION_MAJOR=1 \
|
||||
-DOMX_VERSION_MINOR=1 \
|
||||
-DOMX_VERSION_REVISION=2 \
|
||||
-DOMX_VERSION_STEP=0"
|
||||
else
|
||||
GST_OMX_VARIANT = generic
|
||||
endif
|
||||
|
||||
GST_OMX_CONF_OPTS += --with-omx-target=$(GST_OMX_VARIANT)
|
||||
|
||||
GST_OMX_DEPENDENCIES = gstreamer1 gst1-plugins-base libopenmax
|
||||
|
||||
# adjust library paths to where buildroot installs them
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From f4fdb9770c76113f38515245fecc5f11b3ace20d Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Tue, 4 Dec 2018 17:54:42 +0100
|
||||
Subject: [PATCH] fdkaacenc: Remove MODE_2_1
|
||||
|
||||
This is not a standard mode and no longer supported by fdk-aac 2.0.0.
|
||||
|
||||
For https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
ext/fdkaac/gstfdkaacenc.c | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/ext/fdkaac/gstfdkaacenc.c b/ext/fdkaac/gstfdkaacenc.c
|
||||
index ad2bcb492..8410e684c 100644
|
||||
--- a/ext/fdkaac/gstfdkaacenc.c
|
||||
+++ b/ext/fdkaac/gstfdkaacenc.c
|
||||
@@ -71,10 +71,6 @@ static const struct
|
||||
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT}}, {
|
||||
- 3, MODE_2_1, {
|
||||
- GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||
- GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT,
|
||||
- GST_AUDIO_CHANNEL_POSITION_LFE1}}, {
|
||||
4, MODE_1_2_1, {
|
||||
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
|
||||
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
From 19d34f6b5e1633d5ec4bb2832c58470f0c829cab Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Wed, 5 Dec 2018 10:10:39 +0100
|
||||
Subject: [PATCH] fdkaacdec: Use WAV channel mapping instead of interleave
|
||||
setting
|
||||
|
||||
The latter is going away in libfdk-aac 2.0.0. Instead, MPEG-style output
|
||||
is always non-interleaved and WAV-style output is always interleaved.
|
||||
Earlier libfdk-aac also defaults interleaving accordingly.
|
||||
|
||||
Since our reordering looks at the associated PCE indices instead of the
|
||||
actual channel order, we're agnostic to the mapping.
|
||||
|
||||
For https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/825
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
ext/fdkaac/gstfdkaacdec.c | 12 ++++--------
|
||||
1 file changed, 4 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/ext/fdkaac/gstfdkaacdec.c b/ext/fdkaac/gstfdkaacdec.c
|
||||
index c27183752..f5136b334 100644
|
||||
--- a/ext/fdkaac/gstfdkaacdec.c
|
||||
+++ b/ext/fdkaac/gstfdkaacdec.c
|
||||
@@ -151,17 +151,13 @@ gst_fdkaacdec_set_format (GstAudioDecoder * dec, GstCaps * caps)
|
||||
gst_buffer_unref (codec_data);
|
||||
}
|
||||
|
||||
+ /* Choose WAV channel mapping to get interleaving even with libfdk-aac 2.0.0
|
||||
+ * The pChannelIndices retain the indices from the standard MPEG mapping so
|
||||
+ * we're agnostic to the actual order. */
|
||||
if ((err =
|
||||
aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_CHANNEL_MAPPING,
|
||||
- 0)) != AAC_DEC_OK) {
|
||||
- GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err);
|
||||
- return FALSE;
|
||||
- }
|
||||
-
|
||||
- if ((err =
|
||||
- aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_INTERLEAVED,
|
||||
1)) != AAC_DEC_OK) {
|
||||
- GST_ERROR_OBJECT (self, "Failed to set interleaved output: %d", err);
|
||||
+ GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -332,11 +332,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK
|
||||
bool "decklink"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS # <dlfcn.h>
|
||||
help
|
||||
Blackmagic Decklink plugin
|
||||
|
||||
comment "decklink needs a toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
comment "decklink needs a toolchain w/ C++, dynamic library"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
|
||||
bool "directfb"
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From f672277509705c4034bc92a141eefee4524d15aa Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Ronge <tobiasr@axis.com>
|
||||
Date: Thu, 14 Mar 2019 10:12:27 +0100
|
||||
Subject: [PATCH] gstrtspconnection: Security loophole making heap overflow
|
||||
|
||||
The former code allowed an attacker to create a heap overflow by
|
||||
sending a longer than allowed session id in a response and including a
|
||||
semicolon to change the maximum length. With this change, the parser
|
||||
will never go beyond 512 bytes.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
gst-libs/gst/rtsp/gstrtspconnection.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
|
||||
index a6755bedd..c0429064a 100644
|
||||
--- a/gst-libs/gst/rtsp/gstrtspconnection.c
|
||||
+++ b/gst-libs/gst/rtsp/gstrtspconnection.c
|
||||
@@ -2461,7 +2461,7 @@ build_next (GstRTSPBuilder * builder, GstRTSPMessage * message,
|
||||
maxlen = sizeof (conn->session_id) - 1;
|
||||
/* the sessionid can have attributes marked with ;
|
||||
* Make sure we strip them */
|
||||
- for (i = 0; session_id[i] != '\0'; i++) {
|
||||
+ for (i = 0; i < maxlen && session_id[i] != '\0'; i++) {
|
||||
if (session_id[i] == ';') {
|
||||
maxlen = i;
|
||||
/* parse timeout */
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -11,7 +11,6 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES
|
||||
GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB
|
||||
GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+
|
||||
|
||||
# gio_unix_2_0 is only used for tests
|
||||
GST1_PLUGINS_BASE_CONF_OPTS = \
|
||||
--disable-examples \
|
||||
--disable-valgrind \
|
||||
|
||||
@@ -46,7 +46,7 @@ else
|
||||
GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGL1_PLUGIN_XINGMUX),y)
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y)
|
||||
GST1_PLUGINS_UGLY_CONF_OPTS += --enable-xingmux
|
||||
else
|
||||
GST1_PLUGINS_UGLY_CONF_OPTS += --disable-xingmux
|
||||
|
||||
13
buildroot/package/gstreamer1/gst1-shark/Config.in
Normal file
13
buildroot/package/gstreamer1/gst1-shark/Config.in
Normal file
@@ -0,0 +1,13 @@
|
||||
config BR2_PACKAGE_GST1_SHARK
|
||||
bool "gst1-shark"
|
||||
select BR2_PACKAGE_GSTREAMER1_CHECK
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP
|
||||
select BR2_PACKAGE_GSTREAMER1_GST_DEBUG # gst_debug_log_valist, GST_CAT_STATES
|
||||
help
|
||||
GstShark leverages GStreamers newest instrumentation subsystem
|
||||
by installing a set of custom hooks to the trace points. A
|
||||
variety of data analytics are extracted and presented to the
|
||||
user in a graphical, friendly way.
|
||||
|
||||
https://github.com/RidgeRun/gst-shark
|
||||
5
buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash
Normal file
5
buildroot/package/gstreamer1/gst1-shark/gst1-shark.hash
Normal file
@@ -0,0 +1,5 @@
|
||||
# locally computed hash
|
||||
sha256 35c56b89c10f42c623f5831f9533e1b9dcab8946eff0e4000bf3137bad5c705a gst1-shark-v0.5.5.tar.gz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING
|
||||
19
buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk
Normal file
19
buildroot/package/gstreamer1/gst1-shark/gst1-shark.mk
Normal file
@@ -0,0 +1,19 @@
|
||||
################################################################################
|
||||
#
|
||||
# gst1-shark
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_SHARK_VERSION = v0.5.5
|
||||
GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git
|
||||
GST1_SHARK_SITE_METHOD = git
|
||||
GST1_SHARK_GIT_SUBMODULES = YES
|
||||
|
||||
GST1_SHARK_LICENSE = LGPL-2.1+
|
||||
GST1_SHARK_LICENSE_FILES = COPYING
|
||||
|
||||
GST1_SHARK_AUTORECONF = YES
|
||||
GST1_SHARK_DEPENDENCIES = host-pkgconf gstreamer1 gst1-plugins-base
|
||||
GST1_SHARK_CONF_OPTS = --disable-graphviz
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user