From 0d2c29eaff64c853bdd73b9cbf01fbe39020db46 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 29 Oct 2008 18:48:41 +0100 Subject: 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. --- packages/gnash/gnash-minimal.inc | 3 ++- packages/gnash/gnash-minimal_0.8.2.bb | 2 +- packages/gnash/gnash-minimal_cvs.bb | 2 +- packages/gnash/gnash.inc | 6 ++++-- packages/gnash/gnash_0.8.0.bb | 2 ++ packages/gnash/gnash_0.8.1.bb | 2 ++ packages/gnash/gnash_0.8.2.bb | 2 ++ packages/gnash/gnash_0.8.3.bb | 2 +- 8 files changed, 15 insertions(+), 6 deletions(-) (limited to 'packages/gnash') diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index 1f3c486e53..4f52322467 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -2,7 +2,8 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 featu HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" +DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 zlib boost jpeg pango curl freetype \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" RRECOMMENDS_${PN} = "libltdl" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb index 1c6065e74e..ea99de1e39 100644 --- a/packages/gnash/gnash-minimal_0.8.2.bb +++ b/packages/gnash/gnash-minimal_0.8.2.bb @@ -1,3 +1,3 @@ require gnash-minimal.inc -PR = "r2" +PR = "r3" diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb index 80564ebe7e..7c36dbafff 100644 --- a/packages/gnash/gnash-minimal_cvs.bb +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -1,7 +1,7 @@ require gnash-minimal.inc -PR = "r2" +PR = "r3" PV = "0.8.3+cvs${SRCDATE}" diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index 60162ed1bd..59261e3121 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -1,8 +1,10 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" -PR = "r2" +DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}" + +PR = "r3" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \ " diff --git a/packages/gnash/gnash_0.8.0.bb b/packages/gnash/gnash_0.8.0.bb index da4b281e94..d9dc87a417 100644 --- a/packages/gnash/gnash_0.8.0.bb +++ b/packages/gnash/gnash_0.8.0.bb @@ -1 +1,3 @@ require gnash.inc + +PR = "r1" diff --git a/packages/gnash/gnash_0.8.1.bb b/packages/gnash/gnash_0.8.1.bb index da4b281e94..d9dc87a417 100644 --- a/packages/gnash/gnash_0.8.1.bb +++ b/packages/gnash/gnash_0.8.1.bb @@ -1 +1,3 @@ require gnash.inc + +PR = "r1" diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb index da4b281e94..d9dc87a417 100644 --- a/packages/gnash/gnash_0.8.2.bb +++ b/packages/gnash/gnash_0.8.2.bb @@ -1 +1,3 @@ require gnash.inc + +PR = "r1" diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb index 87ea15878f..9afde70d98 100644 --- a/packages/gnash/gnash_0.8.3.bb +++ b/packages/gnash/gnash_0.8.3.bb @@ -1,6 +1,6 @@ require gnash.inc -PR = "r3" +PR = "r4" EXTRA_OECONF += " --without-included-ltdl \ --with-ltdl-include=${STAGING_INCDIR} \ -- cgit v1.2.3