[1/4] gst-plugins: do not build x11 related plugins without the x11 DISTRO_FEATURE

Submitted by Enrico Scholz on Jan. 12, 2012, 4:38 p.m.

Details

Message ID 1326386296-1526-2-git-send-email-enrico.scholz@sigma-chemnitz.de
State New
Headers show

Commit Message

Enrico Scholz Jan. 12, 2012, 4:38 p.m.
gst-plugins might be used on headless systems or on systems with
DirectFB or qt frontends.  Building them without the x11 software stack
might be desirable there and is supported by the buildsystem.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
 .../gstreamer/gst-plugins-base_0.10.35.bb          |    4 +++-
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
index e49a00c..dc86c19 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
@@ -6,7 +6,9 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
 
-DEPENDS += "virtual/libx11 alsa-lib freetype liboil libogg libvorbis libxv libtheora avahi util-linux tremor"
+DEPENDS-x11 = 'virtual/libx11 libxv avahi'
+DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora util-linux tremor"
+DEPENDS += "${@base_contains('DISTRO_FEATURES','x11', '${DEPENDS-x11}', '', d)}"
 
 SRC_URI += " file://gst-plugins-base-tremor.patch"
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index b23d399..25c44f5 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -11,6 +11,7 @@  FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
 SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
 
 EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES','x11','','--disable-x', d)}"
 
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"