summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2015-11-13 12:02:14 -0300
committerPeter Korsgaard <peter@korsgaard.com>2015-11-13 16:08:16 +0100
commit6375c462e0aa32eb2d1a375110722be18cdd66e9 (patch)
treed07127c149ebfce081cae2b06ee0f88032353a89
parent5be50abb61813a92f975e797700bcadfe02c0312 (diff)
downloadbuildroot-6375c462e0aa32eb2d1a375110722be18cdd66e9.tar.gz
buildroot-6375c462e0aa32eb2d1a375110722be18cdd66e9.zip
x265: needs dynamic library
Fixes: http://autobuild.buildroot.net/results/60f/60fc8d54ec61c96e9beaa84154fe8d7e61e55d4e/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/gstreamer1/gst1-plugins-bad/Config.in5
-rw-r--r--package/x265/Config.in6
2 files changed, 7 insertions, 4 deletions
diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index 26a963eb13..f7714016bc 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -636,11 +636,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265
bool "x265"
depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_X265
help
x265 encoding plugin
-comment "x265 needs a toolchain w/ C++"
- depends on !BR2_INSTALL_LIBSTDCPP
+comment "x265 needs a toolchain w/ C++, dynamic library"
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
endif
diff --git a/package/x265/Config.in b/package/x265/Config.in
index 15ae9339fb..f268e65841 100644
--- a/package/x265/Config.in
+++ b/package/x265/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_X265
bool "x265"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_STATIC_LIBS # dlfcn
help
x265 is an open source free software and library for encoding video
using the High Efficiency Video Coding (HEVC/H.265) standard. x265 is
@@ -20,5 +21,6 @@ config BR2_PACKAGE_X265_CLI
endif
-comment "x265 needs a toolchain w/ C++, threads"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "x265 needs a toolchain w/ C++, threads, dynamic library"
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
+ !BR2_TOOLCHAIN_HAS_THREADS
OpenPOWER on IntegriCloud