summaryrefslogtreecommitdiffstats
path: root/package/multimedia
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2012-12-02 17:19:40 -0800
committerPeter Korsgaard <jacmet@sunsite.dk>2012-12-02 17:19:40 -0800
commit8cdabd76950e227af088729c53c7f741a46bd9cc (patch)
tree86f11d84d46f9a5cc6be78b425b07bb58abb5d93 /package/multimedia
parent677d5068b955cf713b73d285e41ec8eedbda8e38 (diff)
parentc4fbc4202ea47829396bc446e84fd85153513974 (diff)
downloadbuildroot-novena-8cdabd76950e227af088729c53c7f741a46bd9cc.tar.gz
buildroot-novena-8cdabd76950e227af088729c53c7f741a46bd9cc.zip
Merge branch 'next'
Kickoff 2013.02 cycle
Diffstat (limited to 'package/multimedia')
-rw-r--r--package/multimedia/gstreamer/Config.in14
-rw-r--r--package/multimedia/gstreamer/gstreamer.mk3
2 files changed, 13 insertions, 4 deletions
diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index 4d279b8b1..9a6748106 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -12,9 +12,17 @@ config BR2_PACKAGE_GSTREAMER_GST_DEBUG
default y
depends on BR2_PACKAGE_GSTREAMER
help
- Enable support for the gst-debug tracing functionality
- in gstreamer. This has limited CPU overhead, but does
- increase the rootfs size somewhat.
+ Enable support for the gst-debug tracing functionality in gstreamer.
+ This has limited CPU overhead, but does increase the rootfs size
+ somewhat.
+
+config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY
+ bool "enable plugin registry"
+ default y
+ depends on BR2_PACKAGE_GSTREAMER
+ help
+ Enable support for the GStreamer plugin registry. This may increase
+ the launch-time for a GStreamer application.
comment "gstreamer requires a toolchain with WCHAR support"
depends on !BR2_USE_WCHAR
diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk
index a9841b17c..b87f0294f 100644
--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -21,7 +21,8 @@ GSTREAMER_CONF_OPT = \
--disable-tests \
--disable-failing-tests \
--disable-loadsave \
- $(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug)
+ $(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug) \
+ $(if $(BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY),,--disable-registry)
GSTREAMER_DEPENDENCIES = libglib2 host-pkgconf