jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

gst1-plugins-bad: move dtls plugin

Browse Source 
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>
This commit is contained in:
Peter Korsgaard 2017-07-04 13:24:22 +02:00
parent ea82b2d34a
commit 8b1529948b
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/gstreamer1/gst1-plugins-bad/Config.in
View File

@ -219,12 +219,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS
help help
Collection of elements that may or may not be useful for debugging 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 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY
bool "dvdsuboverlay" bool "dvdsuboverlay"
help help
@ -547,6 +541,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
comment "libmms needs a toolchain w/ wchar, threads" comment "libmms needs a toolchain w/ wchar, threads"
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_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 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTML
bool "ttml" bool "ttml"
depends on BR2_USE_WCHAR # pango -> glib2 depends on BR2_USE_WCHAR # pango -> glib2

14
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
View File

@ -233,13 +233,6 @@ else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-debugutils GST1_PLUGINS_BAD_CONF_OPTS += --disable-debugutils
endif 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) ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay
else else
@ -636,6 +629,13 @@ else
GST1_PLUGINS_BAD_CONF_OPTS += --disable-libmms GST1_PLUGINS_BAD_CONF_OPTS += --disable-libmms
endif 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) ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTML),y)
GST1_PLUGINS_BAD_CONF_OPTS += --enable-ttml GST1_PLUGINS_BAD_CONF_OPTS += --enable-ttml
GST1_PLUGINS_BAD_DEPENDENCIES += cairo libxml2 pango GST1_PLUGINS_BAD_DEPENDENCIES += cairo libxml2 pango