summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-03-15 17:08:06 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2016-03-16 12:51:06 +0000
commitef1c1f258ab449230d644442df667f89023f38d4 (patch)
treeba0cf3bb75c8ee966fc818d16dbd3947aaf45316 /conf
parent5d3414342d9b5af1f531702aa25180407837c21f (diff)
downloadmeta-boot2qt-ef1c1f258ab449230d644442df667f89023f38d4.tar.gz
colibri-imx6: don't pull in old gstreamer
gst-fsl-plugin pulls in gstremer 0.10, even when 1.0 was selected. Change-Id: I60f8e6bef8fd1abe1913f4019b847757718fbded Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/colibri-imx6.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 4c9a923..4cde248 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -43,7 +43,6 @@ MACHINE_EXTRA_INSTALL = "\
43 libgal-mx6 \ 43 libgal-mx6 \
44 libegl-mx6 \ 44 libegl-mx6 \
45 libgles2-mx6 \ 45 libgles2-mx6 \
46 gst-fsl-plugin \
47 ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ 46 ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
48 ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ 47 ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
49 " 48 "