From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Tue, 28 Oct 2008 11:18:59 +0000 (+0100)
Subject: gstreamer.inc: Use base_conditional for Openmoko instead of a plain override
X-Git-Tag: Release-2010-05/1~5571
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=221a8e7b86256299ea4d8d51ceb2c9d14d0d8935;p=openembedded.git

gstreamer.inc: Use base_conditional for Openmoko instead of a plain override

    The plain override undid the changes gst-plugins-{bad,ugly,good} did
    which means that the dependency on gst-plugins-base got dropped.
    Use base_conditional to add the libmad dependency when we are
    building for Openmoko.

    This continues f4fcadb061442a394cbe50041eb6acd9d4125eba.
---

diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
index 2964b7db8f..f8447ee25d 100644
--- a/packages/gstreamer/gst-plugins.inc
+++ b/packages/gstreamer/gst-plugins.inc
@@ -1,7 +1,7 @@
 require gst-common.inc
 DESCRIPTION = "Plugins for GStreamer"
-DEPENDS = "gstreamer libmikmod libmad liboil libogg tremor libvorbis libid3tag"
-DEPENDS_openmoko = "gstreamer libmikmod liboil libogg tremor libvorbis libid3tag"
+DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis libid3tag"
+DEPENDS += "${@base_conditional('DISTRO', 'openmoko', '', 'libmad', d)}"
 
 PACKAGES_DYNAMIC = "gst-plugin-*"