summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/gstreamer1/gst1-plugins-bad/Config.in7
-rw-r--r--package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk2
2 files changed, 8 insertions, 1 deletions
diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index a28243b8f3..26a963eb13 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -635,7 +635,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265
bool "x265"
+ depends on BR2_INSTALL_LIBSTDCPP
+ select BR2_PACKAGE_X265
help
- x265 plugin
+ x265 encoding plugin
+
+comment "x265 needs a toolchain w/ C++"
+ depends on !BR2_INSTALL_LIBSTDCPP
endif
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index fe5f2427cf..1c42a60e34 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -760,6 +760,8 @@ endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-x265
+GST1_PLUGINS_BAD_DEPENDENCIES += x265
+GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-x265
endif
OpenPOWER on IntegriCloud