Bump buildroot to 2020.11-rc1 (#985)
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
This commit is contained in:
@@ -1,31 +0,0 @@
|
||||
From 1bc387f8feaab9020be72e88cf26ccc1a67a6a10 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 22 Aug 2020 23:33:48 +0200
|
||||
Subject: [PATCH] meson: allow the user to disable opencv
|
||||
|
||||
Allow the user to really disable opencv through meson (i.e.
|
||||
-Dopencv=disabled).
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1533]
|
||||
---
|
||||
gst-libs/gst/opencv/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build
|
||||
index 6cc4602f3..fb6c46e40 100644
|
||||
--- a/gst-libs/gst/opencv/meson.build
|
||||
+++ b/gst-libs/gst/opencv/meson.build
|
||||
@@ -13,7 +13,7 @@ opencv_dep = dependency('opencv', version : '>= 3.0.0', required : false)
|
||||
if not opencv_dep.found()
|
||||
opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false)
|
||||
endif
|
||||
-if opencv_dep.found()
|
||||
+if not get_option('opencv').disabled() and opencv_dep.found()
|
||||
gstopencv = library('gstopencv-' + api_version,
|
||||
opencv_sources,
|
||||
c_args : gst_plugins_bad_args + ['-DBUILDING_GST_OPENCV'],
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -5,7 +5,7 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD
|
||||
A set of plug-ins for GStreamer that may be of poor quality
|
||||
or lacking some features.
|
||||
|
||||
http://gstreamer.freedesktop.org/
|
||||
https://gstreamer.freedesktop.org/
|
||||
|
||||
if BR2_PACKAGE_GST1_PLUGINS_BAD
|
||||
|
||||
@@ -87,8 +87,13 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS
|
||||
Collection of elements that may or may not be useful for
|
||||
debugging
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBENC
|
||||
bool "dvbsubenc"
|
||||
help
|
||||
DVB subpicture encoding support
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY
|
||||
bool "dvdsuboverlay"
|
||||
bool "dvbsuboverlay"
|
||||
help
|
||||
DVB subtitle renderer plugin
|
||||
|
||||
@@ -232,6 +237,21 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE
|
||||
help
|
||||
Removes silence from an audio stream
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RIST
|
||||
bool "rist"
|
||||
help
|
||||
RIST streaming
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP2
|
||||
bool "rtmp2"
|
||||
help
|
||||
RTMP sink/source (rtmp2sink, rtmp2src)
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP2
|
||||
bool "rtp"
|
||||
help
|
||||
RTP (rtpsrc/rtpsink)
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP
|
||||
bool "rtmp"
|
||||
select BR2_PACKAGE_RTMPDUMP
|
||||
@@ -268,6 +288,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC
|
||||
help
|
||||
subtitle encoders
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SWITCHBIN
|
||||
bool "switchbin"
|
||||
help
|
||||
Switching between paths based on input caps
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE
|
||||
bool "timecode"
|
||||
|
||||
@@ -297,17 +322,20 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M
|
||||
help
|
||||
Demuxes/decodes YUV4MPEG streams
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF
|
||||
bool "yadif"
|
||||
help
|
||||
YADIF deinterlacing filter
|
||||
|
||||
comment "plugins with external dependencies"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER
|
||||
bool "assrender"
|
||||
depends on BR2_INSTALL_LIBSTDCPP # libass -> harfbuzz
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass -> harfbuzz
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libass -> harfbuzz
|
||||
select BR2_PACKAGE_LIBASS
|
||||
|
||||
comment "assrender plugin needs a toolchain w/ C++, gcc => 4.8"
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ
|
||||
bool "bluez"
|
||||
depends on BR2_USE_WCHAR # bluez5_utils -> libglib2
|
||||
@@ -395,6 +423,7 @@ comment "fdk-aac needs a toolchain w/ C++"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH
|
||||
bool "fluidsynth"
|
||||
depends on !BR2_STATIC_LIBS # fluidsynth
|
||||
depends on BR2_USE_WCHAR # fluidsynth
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # fluidsynth
|
||||
depends on BR2_USE_MMU # fluidsynth
|
||||
@@ -402,9 +431,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH
|
||||
help
|
||||
Fluidsynth MIDI decoder plugin
|
||||
|
||||
comment "fluidsynth needs a toolchain w/ threads, wchar"
|
||||
comment "fluidsynth needs a toolchain w/ threads, wchar, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL
|
||||
bool "gl"
|
||||
@@ -489,14 +519,16 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENAL
|
||||
bool "openal"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on BR2_PAKCAGE_OPENAL_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_OPENAL
|
||||
|
||||
comment "openal plugin needs a toolchain w/ NPTL, C++"
|
||||
comment "openal plugin needs a toolchain w/ NPTL, C++, gcc >= 4.9"
|
||||
depends on BR2_PAKCAGE_OPENAL_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \
|
||||
|| !BR2_INSTALL_LIBSTDCPP
|
||||
|| !BR2_INSTALL_LIBSTDCPP \
|
||||
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264
|
||||
bool "openh264"
|
||||
@@ -527,6 +559,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG
|
||||
bool "rsvg"
|
||||
depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # librsvg
|
||||
depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # librsvg -> pango -> harfbuzz
|
||||
@@ -535,6 +568,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG
|
||||
RSVG plugin library
|
||||
|
||||
comment "rsvg plugin needs a toolchain w/ C++, gcc >= 4.8"
|
||||
depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
@@ -613,6 +647,13 @@ comment "wpe needs the gst1-plugins-base opengl library and wpewebkit"
|
||||
depends on !BR2_PACKAGE_WPEWEBKIT \
|
||||
|| !BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS
|
||||
bool "v4l2codecs"
|
||||
depends on BR2_PACKAGE_HAS_UDEV # libgudev
|
||||
select BR2_PACKAGE_LIBGUDEV
|
||||
help
|
||||
Video4Linux Stateless CODECs support
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265
|
||||
bool "x265"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz.sha256sum
|
||||
sha256 f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74 gst-plugins-bad-1.16.2.tar.xz
|
||||
sha256 0b12e4d1cd5db5f8a0c04fc98a1d8c3acc533097b6198d6644420da78d460223 COPYING
|
||||
sha256 cf9b86bcf2d298e8cf5b9d8982f9dab296465b002fdfa0347357a0732f961e03 COPYING.LIB
|
||||
# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.1.tar.xz.sha256sum
|
||||
sha256 c195978c85d97406c05eb9d43ac54b9ab35eda6ffdae32b3ed597b8f1743c1b2 gst-plugins-bad-1.18.1.tar.xz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GST1_PLUGINS_BAD_VERSION = 1.16.2
|
||||
GST1_PLUGINS_BAD_VERSION = 1.18.1
|
||||
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
|
||||
# Additional plugin licenses will be appended to GST1_PLUGINS_BAD_LICENSE and
|
||||
# GST1_PLUGINS_BAD_LICENSE_FILES if enabled.
|
||||
GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB
|
||||
GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+
|
||||
GST1_PLUGINS_BAD_LICENSE_FILES = COPYING
|
||||
GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+
|
||||
|
||||
GST1_PLUGINS_BAD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
|
||||
|
||||
@@ -23,19 +23,22 @@ GST1_PLUGINS_BAD_CONF_OPTS = \
|
||||
-Dwinks=disabled \
|
||||
-Dandroidmedia=disabled \
|
||||
-Dapplemedia=disabled \
|
||||
-Dintrospection=disabled \
|
||||
-Dgobject-cast-checks=disabled \
|
||||
-Dglib-asserts=disabled \
|
||||
-Dglib-checks=disabled
|
||||
-Dglib-checks=disabled \
|
||||
-Dextra-checks=disabled \
|
||||
-Ddoc=disabled
|
||||
|
||||
# Options which require currently unpackaged libraries
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += \
|
||||
-Davtp=disabled \
|
||||
-Dopensles=disabled \
|
||||
-Duvch264=disabled \
|
||||
-Dmsdk=disabled \
|
||||
-Dvoamrwbenc=disabled \
|
||||
-Dbs2b=disabled \
|
||||
-Dchromaprint=disabled \
|
||||
-Dd3d11=disabled \
|
||||
-Ddc1394=disabled \
|
||||
-Ddts=disabled \
|
||||
-Dresindvd=disabled \
|
||||
@@ -45,6 +48,8 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
|
||||
-Dkate=disabled \
|
||||
-Dladspa=disabled \
|
||||
-Dlv2=disabled \
|
||||
-Dmediafoundation=disabled \
|
||||
-Dmicrodns=disabled \
|
||||
-Dlibde265=disabled \
|
||||
-Dmodplug=disabled \
|
||||
-Dmplex=disabled \
|
||||
@@ -58,11 +63,23 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
|
||||
-Dgme=disabled \
|
||||
-Dvdpau=disabled \
|
||||
-Dspandsp=disabled \
|
||||
-Dsvthevcenc=disabled \
|
||||
-Dtranscode=disabled \
|
||||
-Dwasapi2=disabled \
|
||||
-Dzxing=disabled \
|
||||
-Dmagicleap=disabled \
|
||||
-Diqa=disabled \
|
||||
-Dopencv=disabled
|
||||
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dintrospection=enabled
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += gobject-introspection
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dintrospection=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=enabled
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += libdrm wayland wayland-protocols
|
||||
@@ -174,6 +191,12 @@ else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Ddebugutils=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBENC),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsubenc=enabled
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsubenc=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Ddvbsuboverlay=enabled
|
||||
else
|
||||
@@ -362,6 +385,24 @@ else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dremovesilence=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RIST),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Drist=enabled
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Drist=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP2),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp2=enabled
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp2=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP2),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Drtp=enabled
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Drtp=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Drtmp=enabled
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += rtmpdump
|
||||
@@ -405,6 +446,12 @@ else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dsubenc=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SWITCHBIN),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dswitchbin=enabled
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dswitchbin=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dtimecode=enabled
|
||||
else
|
||||
@@ -447,13 +494,6 @@ else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dy4m=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=enabled
|
||||
GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dyadif=disabled
|
||||
endif
|
||||
|
||||
# Plugins with dependencies
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y)
|
||||
@@ -705,6 +745,13 @@ else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dwpe=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dv4l2codecs=enabled
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += libgudev
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dv4l2codecs=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += -Dx265=enabled
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += x265
|
||||
|
||||
Reference in New Issue
Block a user