Bump buildroot to 2019.02

This commit is contained in:
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -9,134 +9,6 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD
if BR2_PACKAGE_GST1_PLUGINS_BAD
comment "libraries with external dependencies"
menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL
bool "opengl"
depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
if BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL
config BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL
def_bool BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW
comment "The opengl library needs an API, a platform and a window system"
depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL
comment "APIs"
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API
bool
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL
bool "opengl"
default y
depends on BR2_PACKAGE_HAS_LIBGL
select BR2_PACKAGE_LIBGLU
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API
comment "opengl needs an OpenGL backend"
depends on !BR2_PACKAGE_HAS_LIBGL
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2
bool "gles2"
default y
depends on BR2_PACKAGE_HAS_LIBGLES
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API
comment "gles2 needs an OpenGL ES backend"
depends on !BR2_PACKAGE_HAS_LIBGLES
comment "Platforms"
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM
bool
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX
bool "glx"
default y
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
depends on !BR2_PACKAGE_RPI_USERLAND # x11
select BR2_PACKAGE_XLIB_LIBXRENDER
select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM
help
OpenGL Extension to the X Window System
comment "glx not supported with rpi-userland"
depends on BR2_PACKAGE_RPI_USERLAND
comment "glx needs the opengl API and modular X.org"
depends on !BR2_PACKAGE_RPI_USERLAND && \
(!BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL || \
!BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR)
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL
bool "egl"
default y
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API
depends on BR2_PACKAGE_HAS_LIBEGL
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM
comment "egl needs an API and an EGL backend"
depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API || \
!BR2_PACKAGE_HAS_LIBEGL
comment "Window systems"
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW
bool
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11
bool "x11"
default y
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM
depends on !BR2_PACKAGE_RPI_USERLAND
depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW
comment "x11 not supported with rpi-userland"
depends on BR2_PACKAGE_RPI_USERLAND
comment "x11 needs a platform and X.org"
depends on !BR2_PACKAGE_RPI_USERLAND && \
(!BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM || \
!BR2_PACKAGE_XORG7)
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND
bool "wayland"
default y
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL
depends on BR2_PACKAGE_WAYLAND
select BR2_PACKAGE_WAYLAND_PROTOCOLS
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW
comment "wayland needs the egl platform and the wayland package"
depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL || \
!BR2_PACKAGE_WAYLAND
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX
bool "dispmanx"
default y
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL
depends on BR2_PACKAGE_RPI_USERLAND
select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW
help
Raspberry Pi's Dispmanx windowing system
comment "dispmanx needs the egl platform and rpi-userland"
depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL || \
!BR2_PACKAGE_RPI_USERLAND
endif
comment "opengl needs an OpenGL or OpenGL ES backend"
depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES
comment "dependency-less plugins"
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP
@@ -174,11 +46,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD
help
Audio filters plugin
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER
bool "audiomixer"
help
Audio mixer plugin
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX
bool "audiomixmatrix"
help
@@ -513,10 +380,10 @@ comment "fdk-aac needs a toolchain w/ C++"
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL
bool "gl"
default y
depends on BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL
depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL
comment "gl needs the gst1-plugins-bad opengl library"
depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL
comment "gl needs the gst1-plugins-base opengl library"
depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS
bool "hls"

View File

@@ -1,2 +1,4 @@
# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz.sha256sum
sha256 0c7857be16686d5c1ba6e34bd338664d3d4599d32714a8eca5c8a41a101e2d08 gst-plugins-bad-1.12.4.tar.xz
# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.4.tar.xz.sha256sum
sha256 910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5 gst-plugins-bad-1.14.4.tar.xz
sha256 0b12e4d1cd5db5f8a0c04fc98a1d8c3acc533097b6198d6644420da78d460223 COPYING
sha256 cf9b86bcf2d298e8cf5b9d8982f9dab296465b002fdfa0347357a0732f961e03 COPYING.LIB

View File

@@ -4,7 +4,7 @@
#
################################################################################
GST1_PLUGINS_BAD_VERSION = 1.12.4
GST1_PLUGINS_BAD_VERSION = 1.14.4
GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad
GST1_PLUGINS_BAD_INSTALL_STAGING = YES
@@ -21,7 +21,8 @@ GST1_PLUGINS_BAD_CONF_OPTS = \
--disable-winks \
--disable-android_media \
--disable-apple_media \
--disable-acm
--disable-acm \
--disable-introspection
# Options which require currently unpackaged libraries
GST1_PLUGINS_BAD_CONF_OPTS += \
@@ -58,8 +59,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
--disable-schro \
--disable-zbar \
--disable-spandsp \
--disable-gtk3 \
--disable-qt
--disable-gtk3
GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1
@@ -72,58 +72,13 @@ GST1_PLUGINS_BAD_CONF_ENV += \
-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-opengl
GST1_PLUGINS_BAD_DEPENDENCIES += libgl libglu
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-opengl
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-gles2
GST1_PLUGINS_BAD_DEPENDENCIES += libgles
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-gles2
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-glx
GST1_PLUGINS_BAD_DEPENDENCIES += xproto_glproto xlib_libXrender
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-glx
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-egl
GST1_PLUGINS_BAD_DEPENDENCIES += libegl
GST1_PLUGINS_BAD_CONF_ENV += \
CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \
LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs egl`"
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-egl
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-x11
GST1_PLUGINS_BAD_DEPENDENCIES += xlib_libX11 xlib_libXext
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-x11
endif
ifneq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND)$(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),)
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-wayland
GST1_PLUGINS_BAD_DEPENDENCIES += wayland wayland-protocols
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-wayland
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-dispmanx
GST1_PLUGINS_BAD_DEPENDENCIES += rpi-userland
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-dispmanx
endif
ifeq ($(BR2_PACKAGE_ORC),y)
GST1_PLUGINS_BAD_DEPENDENCIES += orc
GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc
@@ -178,12 +133,6 @@ else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixer
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiomixer
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixmatrix
else