gstreamer1 packages: factorize dependency on gstreamer1

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/gstreamer1/Config.in b/package/gstreamer1/Config.in
index f9d23639636d0ad5d2500933013a393c3f955836..f7b98c7e95abf6165162ded50e4612d4e1f674ac 100644 (file)
--- a/package/gstreamer1/Config.in
+++ b/package/gstreamer1/Config.in
@@ -1,7 +1,10 @@
 # Gstreamer 1.x & Plugins
 source "package/gstreamer1/gstreamer1/Config.in"
+
+if BR2_PACKAGE_GSTREAMER1
 source "package/gstreamer1/gst1-plugins-base/Config.in"
 source "package/gstreamer1/gst1-plugins-good/Config.in"
 source "package/gstreamer1/gst1-plugins-bad/Config.in"
 source "package/gstreamer1/gst1-plugins-ugly/Config.in"
 source "package/gstreamer1/gst-omx/Config.in"
+endif

diff --git a/package/gstreamer1/gst-omx/Config.in b/package/gstreamer1/gst-omx/Config.in
index b6ea116c66c60b85e14ea29c0e9318715b48c18a..1d5b1315248ac63ff1eaf2ff0705d9c359ed3972 100644 (file)
--- a/package/gstreamer1/gst-omx/Config.in
+++ b/package/gstreamer1/gst-omx/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_GST_OMX
        bool "gst-omx"
-       depends on BR2_PACKAGE_GSTREAMER1 && BR2_PACKAGE_HAS_OPENMAX
+       depends on BR2_PACKAGE_HAS_OPENMAX
        select BR2_PACKAGE_GST1_PLUGINS_BASE
        help
          GStreamer plug-in to use OpenMAX API.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_GST_OMX
          http://cgit.freedesktop.org/gstreamer/gst-omx
 
 comment "gst-omx requires a OpenMAX implementation"
-       depends on BR2_PACKAGE_GSTREAMER1 && !BR2_PACKAGE_HAS_OPENMAX
+       depends on !BR2_PACKAGE_HAS_OPENMAX

diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index d028245124a8b0b73b6ff980b5db45abe8f9764b..407bf315c61d5d909c39b4dcb82582111c72a8af 100644 (file)
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -1,6 +1,5 @@
 menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD
        bool "gst1-plugins-bad"
-       depends on BR2_PACKAGE_GSTREAMER1
        select BR2_PACKAGE_GST1_PLUGINS_BASE
        help
          A set of plug-ins for GStreamer that may be of poor quality or

diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in
index 5b54baba21b90a777d4b3b8dce7924cd8d3fe26a..55960ea9a68c04ddc7b600aa8b9d9a928ce34446 100644 (file)
--- a/package/gstreamer1/gst1-plugins-base/Config.in
+++ b/package/gstreamer1/gst1-plugins-base/Config.in
@@ -1,6 +1,5 @@
 menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE
        bool "gst1-plugins-base"
-       depends on BR2_PACKAGE_GSTREAMER1
        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/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index a9308c7d9d1d62044bca448d611b7abe72c9e0d4..20983d6c32f9763bb7143ba116670a5ea0eddc8c 100644 (file)
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -1,6 +1,5 @@
 menuconfig BR2_PACKAGE_GST1_PLUGINS_GOOD
        bool "gst1-plugins-good"
-       depends on BR2_PACKAGE_GSTREAMER1
        select BR2_PACKAGE_GST1_PLUGINS_BASE
        help
          A set of well-supported plug-ins for GStreamer under the preferred

diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in
index 9b5c8e06a3fe5246cd4f495425ce8d9b25848209..ad9f13c8b59a85d57ae039c1f7969e9403c33bc1 100644 (file)
--- a/package/gstreamer1/gst1-plugins-ugly/Config.in
+++ b/package/gstreamer1/gst1-plugins-ugly/Config.in
@@ -1,6 +1,5 @@
 menuconfig BR2_PACKAGE_GST1_PLUGINS_UGLY
        bool "gst1-plugins-ugly"
-       depends on BR2_PACKAGE_GSTREAMER1
        select BR2_PACKAGE_GST1_PLUGINS_BASE
        help
          A set of well-supported plug-ins for GStreamer, but might pose