From 1e0fb274cde401417fbade86add3651da1eab1c8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Apr 2022 21:49:16 +0200 Subject: [PATCH] package/gstreamer1/gst1-plugins-bad: needs C++ gst1-plugins-bad needs C++ since switch to meson-package in commit 5d6c408e9535be4b5ba0c8a49215d2d03dcb5cd5: The following exception(s) were encountered: Running "/home/autobuild/autobuild/instance-8/output-1/host/bin/microblaze-buildroot-linux-musl-g++ --version" gave "[Errno 2] No such file or directory: '/home/autobuild/autobuild/instance-8/output-1/host/bin/microblaze-buildroot-linux-musl-g++'" Rewriting the meson.build so it only requires C++ for the modules that are actually written in C++ is quite complicated, so just let the whole package depend on C++. Hopefully however this is going to be fixed in some future release. Therefore, the dependencies for individual modules are kept as well (even though they're redundant now). Fixes: - http://autobuild.buildroot.org/results/8f924cebeb8a1ed73e57103bf3073fb8f8d8752e Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 129922140ed7ed03458398b5ec3bad1423f7e6cf) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-imx/Config.in | 6 ++++-- package/gstreamer1/gst1-plugins-bad/Config.in | 4 ++++ package/gstreamer1/gst1-vaapi/Config.in | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-imx/Config.in b/package/gstreamer1/gst1-imx/Config.in index 7b46233b53..41ef8548c5 100644 --- a/package/gstreamer1/gst1-imx/Config.in +++ b/package/gstreamer1/gst1-imx/Config.in @@ -88,11 +88,13 @@ config BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC config BR2_PACKAGE_GST1_IMX_V4L2VIDEOSINK bool "imxv4l2videosink" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 # V4L2_COLORSPACE_DEFAULT + depends on BR2_INSTALL_LIBSTDCPP # gst1-plugins-bad select BR2_PACKAGE_GST1_PLUGINS_BAD help Elements for V4L2 output -comment "imxv4l2videosink needs a toolchain w/ headers >= 4.2" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 +comment "imxv4l2videosink needs a toolchain w/ headers >= 4.2, C++" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 || \ + !BR2_INSTALL_LIBSTDCPP endif diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 234d57636b..669360adb1 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -1,5 +1,6 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD bool "gst1-plugins-bad" + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_GST1_PLUGINS_BASE help A set of plug-ins for GStreamer that may be of poor quality @@ -724,3 +725,6 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 endif + +comment "gst1-plugins-bad needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index 91bd4f85dd..ade8b83a5f 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GST1_VAAPI bool "gst1-vaapi" depends on !BR2_STATIC_LIBS # dlopen(), libva depends on BR2_TOOLCHAIN_HAS_THREADS # libva, libdrm + depends on BR2_INSTALL_LIBSTDCPP # gst1-plugins-bad depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_LIBVA select BR2_PACKAGE_LIBDRM @@ -45,6 +46,6 @@ config BR2_PACKAGE_GST1_VAAPI_ENCODERS endif -comment "gst1-vaapi needs udev /dev management and a toolchain w/ threads, dynamic library" +comment "gst1-vaapi needs udev /dev management and a toolchain w/ threads, dynamic library, C++" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_PACKAGE_HAS_UDEV + !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP