summaryrefslogtreecommitdiff
path: root/packages/gstreamer
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2008-10-29 18:48:41 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-10-29 19:26:53 +0100
commit0d2c29eaff64c853bdd73b9cbf01fbe39020db46 (patch)
tree2a1b71da4fdd171baf822050e81db29d8f8022f2 /packages/gstreamer
parentdc39745f3c8ea019033b811f6ef0ececb110d330 (diff)
bluemchen wiese: Allow to disable certain ugly packages globally
Adopt the notion of gstreamer and allow to easily not build certain ugly packages. People are constraints to not live on a bluemchen wiese can set ENTERPRISE_DISTRO="1" in their config and get ugly packages removed. This is implemented by a set of packages in the BBMASK (as a safety net) and by using base conditional to onl conditonally add ugly packages.
Diffstat (limited to 'packages/gstreamer')
-rw-r--r--packages/gstreamer/gst-meta-base_0.10.bb20
-rw-r--r--packages/gstreamer/gst-plugins-ugly_0.10.7.bb2
-rw-r--r--packages/gstreamer/gst-plugins.inc4
3 files changed, 8 insertions, 18 deletions
diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb
index 06a4fba4cd..c54429aca8 100644
--- a/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/packages/gstreamer/gst-meta-base_0.10.bb
@@ -1,8 +1,10 @@
# Based on its sibling on Poky which is copyright (C) 2006,2007 OpenedHand LTD
DESCRIPTION = "Gstreamer package groups"
-DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly"
-PR = "r11"
+DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}"
+
+PR = "r12"
PACKAGES = "${PN}-dbg \
gst-meta-base \
@@ -34,14 +36,7 @@ RDEPENDS_gst-meta-audio = "\
gst-meta-base \
gst-plugin-ivorbis \
gst-plugin-ogg \
- gst-plugin-mad \
- gst-plugin-id3demux \
- gst-plugin-wavparse"
-
-RDEPENDS_gst-meta-audio_openmoko = "\
- gst-meta-base \
- gst-plugin-ivorbis \
- gst-plugin-ogg \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)} \
gst-plugin-id3demux \
gst-plugin-wavparse"
@@ -55,10 +50,7 @@ RDEPENDS_gst-meta-video = "\
gst-meta-base \
gst-plugin-avi \
gst-plugin-matroska \
- gst-plugin-mpegstream \
- gst-plugin-mpegaudioparse \
- gst-plugin-mpegvideoparse \
- gst-plugin-mpeg2dec"
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mpegstream gst-plugin-mpegaudioparse gst-plugin-mpegvideoparse gst-plugin-mpeg2dec', d)}"
RRECOMMENDS_gst-meta-video = "\
gst-meta-audio"
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.7.bb b/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
index d7ff21d4e9..fd008b065a 100644
--- a/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
@@ -1,8 +1,6 @@
require gst-plugins.inc
PR = "r0"
-EXTRA_OECONF_append_openmoko = "--disable-mad"
-
DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
SRC_URI += "\
diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
index f8447ee25d..68a0502182 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 liboil libogg tremor libvorbis libid3tag"
-DEPENDS += "${@base_conditional('DISTRO', 'openmoko', '', 'libmad', d)}"
+DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis"
+DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
PACKAGES_DYNAMIC = "gst-plugin-*"