From 8bce139334b95e65bed5e7e59b855a717fe84e10 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 24 Jun 2013 11:26:27 +0100 Subject: [PATCH] gst-plugins-base: element selection rationalisation Use PACKAGECONFIG to control the X11 elements, and add statements for the elements that we don't always enable. Remove the freetype dependency as it's apparently (but not really) only needed by the examples. (From OE-Core rev: d40606de85a42c48327dead5d6e4c9a1de2cc39c) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb index 462c54d..26c562c 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb @@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv libsm libice', '', d)}" -DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora util-linux tremor" +DEPENDS += "alsa-lib liboil libogg libvorbis libtheora util-linux tremor" SRC_URI += "file://gst-plugins-base-tremor.patch \ file://configure.ac-fix-subparse-plugin.patch" @@ -19,7 +18,14 @@ PR = "r7" inherit gettext -EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-gnome_vfs --disable-orc" +EXTRA_OECONF += "--disable-freetypetest" + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs" +PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" +PACKAGECONFIG[x11] = "--enable-x --enable-xvideo,--disable-x --disable-xvideo,virtual/libx11 libxv libsm libice" do_configure_prepend() { # This m4 file contains nastiness which conflicts with libtool 2.2.2 -- 2.7.4