]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
gst1-plugins-bad: move dtls plugin
authorPeter Korsgaard <peter@korsgaard.com>
Tue, 4 Jul 2017 11:24:22 +0000 (13:24 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 4 Jul 2017 11:31:41 +0000 (13:31 +0200)
The dtls plugin needs openssl, so move it down to the "plugins with external
dependencies" section to match the rest of the plugins.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/gstreamer1/gst1-plugins-bad/Config.in
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk

index 67d3923c73eb183498c3f7049ca129816449c0c1..0c9789997a9e4db23ac6a2722713bdf113ed9c8d 100644 (file)
@@ -219,12 +219,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS
        help
          Collection of elements that may or may not be useful for debugging
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS
-       bool "dtls"
-       select BR2_PACKAGE_OPENSSL
-       help
-         DTLS plugin
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY
        bool "dvdsuboverlay"
        help
@@ -547,6 +541,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
 comment "libmms needs a toolchain w/ wchar, threads"
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS
+       bool "dtls"
+       select BR2_PACKAGE_OPENSSL
+       help
+         DTLS plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTML
        bool "ttml"
        depends on BR2_USE_WCHAR # pango -> glib2
index 56e443c48049249293bc3a60f537decf0a20d42f..685538dc7ddc23723d4f4236c6a1fa2327ff0a89 100644 (file)
@@ -233,13 +233,6 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-debugutils
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls
-GST1_PLUGINS_BAD_DEPENDENCIES += openssl
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay
 else
@@ -636,6 +629,13 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-libmms
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls
+GST1_PLUGINS_BAD_DEPENDENCIES += openssl
+else
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTML),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-ttml
 GST1_PLUGINS_BAD_DEPENDENCIES += cairo libxml2 pango