gstreamer: make gstreamer version a DISTRO_FEATURE

GStreamer version can now be changed using a DISTRO_FEATURE:
'gstreamer010' for GStreamer 0.10 and 'gstreamer' for GStreamer 1.0

This can also be used to remove all gstreamer packages from image
and toolchain.

Default version is still the old 0.10

Change-Id: I54b19962ccd0dfd2f71bb44e231bf5af43ccfab9
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>

6 files changed, 13 insertions, 7 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 1cfcac2..ac635d8 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -42,12 +42,12 @@ DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost
 POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
+# use GStreamer 0.10, optionally change to "gstreamer" to use GStreamer 1.0
+DISTRO_FEATURES += "gstreamer010"
+
 PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo"
 PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native"
 
-COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
-COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
-
 MACHINE_EXTRA_INSTALL ?= ""
 MACHINE_EXTRA_INSTALL_SDK ?= ""
 MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index c1e9c1b..2ceb4fe 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -39,7 +39,8 @@ MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
         libgles2-mx6 \
-        gst-fsl-plugin \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = " \
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 8a048b1..f0b6179 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -37,6 +37,8 @@ MACHINE_EXTRA_INSTALL = "\
         libegl-mx6 \
         libgles2-mx6 \
         gst-fsl-plugin \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = " \
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 74b22d3..c677500 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -40,7 +40,8 @@ MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
         libgles2-mx6 \
-        gst-fsl-plugin \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         libopencv-core \
         libopencv-imgproc \
         libopencv-objdetect \
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index d9a11ab..819960d 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -54,7 +54,8 @@ MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
         libgles2-mx6 \
-        gst-fsl-plugin \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         bcm4330-nvram-config \
         libopencv-core \
         libopencv-imgproc \
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index cb8e019..cec9fd5 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.conf
@@ -34,7 +34,8 @@ MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
         libgles2-mx6 \
-        gst-fsl-plugin \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
+        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = " \