gstreamer packages: factorize dependency on gstreamer

Proposed-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/gstreamer/Config.in b/package/gstreamer/Config.in
index 039d6576761303e3cf506a89823a70c5c43db95c..c6292f4a7ef1d49f71fbaca402f001da31f48a07 100644 (file)
--- a/package/gstreamer/Config.in
+++ b/package/gstreamer/Config.in
@@ -1,5 +1,7 @@
 # Gstreamer 0.10.x & Plugins
 source "package/gstreamer/gstreamer/Config.in"
+
+if BR2_PACKAGE_GSTREAMER
 source "package/gstreamer/gst-plugins-base/Config.in"
 source "package/gstreamer/gst-plugins-good/Config.in"
 source "package/gstreamer/gst-plugins-bad/Config.in"
@@ -9,3 +11,4 @@ source "package/gstreamer/gst-dsp/Config.in"
 source "package/gstreamer/gst-fsl-plugins/Config.in"
 source "package/gstreamer/gst-omapfb/Config.in"
 source "package/gstreamer/gst-plugin-x170/Config.in"
+endif

diff --git a/package/gstreamer/gst-dsp/Config.in b/package/gstreamer/gst-dsp/Config.in
index 590931af76f6e4eba83eb10f028a1391a5166f31..102cf69b458542f0b2bec6126d3d701d296cdb30 100644 (file)
--- a/package/gstreamer/gst-dsp/Config.in
+++ b/package/gstreamer/gst-dsp/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_GST_DSP
        bool "gst-dsp"
-       depends on BR2_PACKAGE_GSTREAMER && BR2_cortex_a8
+       depends on BR2_cortex_a8
        select BR2_PACKAGE_TIDSP_BINARIES
        help
          GStreamer plug-in to access TI OMAP3 DSP algorithms.

diff --git a/package/gstreamer/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in
index 1d6a707707739d801cd3055a26105c49226fb0c7..da254ef4922cd5491504f9991d4d1a785e4893ee 100644 (file)
--- a/package/gstreamer/gst-ffmpeg/Config.in
+++ b/package/gstreamer/gst-ffmpeg/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_GST_FFMPEG
        bool "gst-ffmpeg"
-       depends on BR2_PACKAGE_GSTREAMER
        select BR2_PACKAGE_GST_PLUGINS_BASE
        select BR2_PACKAGE_FFMPEG
        select BR2_PACKAGE_FFMPEG_GPL
@@ -14,5 +13,4 @@ config BR2_PACKAGE_GST_FFMPEG
          http://gstreamer.freedesktop.org/
 
 comment "gst-ffmpeg needs a toolchain w/ largefile, IPv6"
-       depends on BR2_PACKAGE_GSTREAMER
        depends on !(BR2_LARGEFILE && BR2_INET_IPV6)

diff --git a/package/gstreamer/gst-fsl-plugins/Config.in b/package/gstreamer/gst-fsl-plugins/Config.in
index a9034fa740f9043a06908d32451c713fbe627c7b..4e2bbe41adc4cd5b7dd6658bd90a0485a3031587 100644 (file)
--- a/package/gstreamer/gst-fsl-plugins/Config.in
+++ b/package/gstreamer/gst-fsl-plugins/Config.in
@@ -1,11 +1,10 @@
 comment "gst-fsl-plugins needs an imx-specific Linux kernel to be built"
-       depends on BR2_arm && BR2_PACKAGE_GSTREAMER && !BR2_LINUX_KERNEL
+       depends on BR2_arm && !BR2_LINUX_KERNEL
 
 config BR2_PACKAGE_GST_FSL_PLUGINS
        bool "gst-fsl-plugins"
        depends on BR2_LINUX_KERNEL
        depends on BR2_arm # Only relevant for i.MX
-       depends on BR2_PACKAGE_GSTREAMER
        select BR2_PACKAGE_GST_PLUGINS_BASE
        select BR2_PACKAGE_LIBFSLVPUWRAP
        select BR2_PACKAGE_IMX_LIB

diff --git a/package/gstreamer/gst-omapfb/Config.in b/package/gstreamer/gst-omapfb/Config.in
index e603cb1976e9d122d58aa908fa5056c5f0fa765c..cfe5bba6bcc8ee6d80adc56b9ee03adb95eebeda 100644 (file)
--- a/package/gstreamer/gst-omapfb/Config.in
+++ b/package/gstreamer/gst-omapfb/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_GST_OMAPFB
        bool "gst-omapfb"
-       depends on BR2_PACKAGE_GSTREAMER && BR2_cortex_a8
+       depends on BR2_cortex_a8
        help
          GStreamer plug-in to use OMAP framebuffer.
 

diff --git a/package/gstreamer/gst-plugin-x170/Config.in b/package/gstreamer/gst-plugin-x170/Config.in
index d7fe96a49a5f1caccd3dd77e6c28851a1bf9dc97..ed668c6ac4a53388f620e028dec74df017309e40 100644 (file)
--- a/package/gstreamer/gst-plugin-x170/Config.in
+++ b/package/gstreamer/gst-plugin-x170/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_GST_PLUGIN_X170
        bool "gst-plugin-x170"
-       depends on BR2_PACKAGE_GSTREAMER
        depends on BR2_arm926t
        # glibc toolchain includes WCHAR and threading for libglib2
        depends on BR2_TOOLCHAIN_USES_GLIBC # on2-8170-libs
@@ -12,5 +11,5 @@ config BR2_PACKAGE_GST_PLUGIN_X170
          http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
 
 comment "gst-plugin-x170 needs an (e)glibc toolchain"
-       depends on BR2_PACKAGE_GSTREAMER && BR2_arm926t
+       depends on BR2_arm926t
        depends on !BR2_TOOLCHAIN_USES_GLIBC

diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in
index c42172a6fda977a6af90691c31b6d5bfde85bdec..047bf7ebdbfabdfedba648fb6c1a61dea9702b14 100644 (file)
--- a/package/gstreamer/gst-plugins-bad/Config.in
+++ b/package/gstreamer/gst-plugins-bad/Config.in
@@ -1,6 +1,5 @@
 menuconfig BR2_PACKAGE_GST_PLUGINS_BAD
        bool "gst-plugins-bad"
-       depends on BR2_PACKAGE_GSTREAMER
        select BR2_PACKAGE_GST_PLUGINS_BASE
        help
          A set of plug-ins for GStreamer that may be of poor quality or

diff --git a/package/gstreamer/gst-plugins-base/Config.in b/package/gstreamer/gst-plugins-base/Config.in
index 20c2d3609c76e7f3a7991dded175129d2cd10924..fce68c11d12431f6965f2bb9d2af3208d9092872 100644 (file)
--- a/package/gstreamer/gst-plugins-base/Config.in
+++ b/package/gstreamer/gst-plugins-base/Config.in
@@ -1,6 +1,5 @@
 menuconfig BR2_PACKAGE_GST_PLUGINS_BASE
        bool "gst-plugins-base"
-       depends on BR2_PACKAGE_GSTREAMER
        select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
        select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
        select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7

diff --git a/package/gstreamer/gst-plugins-good/Config.in b/package/gstreamer/gst-plugins-good/Config.in
index bc2c293f06b1b0c55d38fcce529c35e7af637fec..81bd34051429e2cb6a661dcf640eb969ce155541 100644 (file)
--- a/package/gstreamer/gst-plugins-good/Config.in
+++ b/package/gstreamer/gst-plugins-good/Config.in
@@ -1,6 +1,5 @@
 menuconfig BR2_PACKAGE_GST_PLUGINS_GOOD
        bool "gst-plugins-good"
-       depends on BR2_PACKAGE_GSTREAMER
        select BR2_PACKAGE_GST_PLUGINS_BASE
        help
          A set of well-supported plug-ins for GStreamer under the preferred

diff --git a/package/gstreamer/gst-plugins-ugly/Config.in b/package/gstreamer/gst-plugins-ugly/Config.in
index c0046e422ff855d287cc2b57243ade977673b6a6..3d133cf3f1d5bdcbdd0fc50908696b4c2376e3ea 100644 (file)
--- a/package/gstreamer/gst-plugins-ugly/Config.in
+++ b/package/gstreamer/gst-plugins-ugly/Config.in
@@ -1,6 +1,5 @@
 menuconfig BR2_PACKAGE_GST_PLUGINS_UGLY
        bool "gst-plugins-ugly"
-       depends on BR2_PACKAGE_GSTREAMER
        select BR2_PACKAGE_GST_PLUGINS_BASE
        help
          A set of well-supported plug-ins for GStreamer, but might pose

diff --git a/package/gstreamer/gstreamer/Config.in b/package/gstreamer/gstreamer/Config.in
index 9a83a9688e3434621ec94c11344d937a8f7ef17c..75f8fda554748719f99018ab1af50d589387e39e 100644 (file)
--- a/package/gstreamer/gstreamer/Config.in
+++ b/package/gstreamer/gstreamer/Config.in
@@ -12,10 +12,11 @@ config BR2_PACKAGE_GSTREAMER
 
          http://gstreamer.freedesktop.org/
 
+if BR2_PACKAGE_GSTREAMER
+
 config BR2_PACKAGE_GSTREAMER_GST_DEBUG
        bool "enable gst-debug trace support"
        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
@@ -24,11 +25,12 @@ config BR2_PACKAGE_GSTREAMER_GST_DEBUG
 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.
 
+endif
+
 comment "gstreamer needs a toolchain w/ wchar, threads"
        depends on BR2_USE_MMU
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS