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.

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index edb4e4ddbc95fcf1f4b1944712cb6a931f053e96..4273152a87bce67299d5632acfc79d2ff6f2cab8 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -547,6 +547,9 @@ export STAGING_IDLDIR = "${STAGING_DATADIR}/idl"
 # library package naming
 AUTO_LIBNAME_PKGS = "${PACKAGES}"
 
+# Globally toggle certain dependencies
+ENTERPRISE_DISTRO ?= "0"
+
 ###
 ### Config file processing
 ###
@@ -580,6 +583,7 @@ include conf/distro/${DISTRO}.conf
 include conf/documentation.conf
 require conf/sanity.conf
 require conf/abi_version.conf
+require conf/enterprise.conf
 
 ##################################################################
 # Weak variables (usually to retain backwards compatibility)

diff --git a/conf/enterprise.conf b/conf/enterprise.conf
new file mode 100644 (file)
index 0000000..7963766
--- /dev/null
+++ b/conf/enterprise.conf
@@ -0,0 +1,2 @@
+# For the enterprise edition we want to avoid certain packages by default.
+BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', '(gst-plugins-ugly|mp3blaster|mpg123|mpg321|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|libsidplay|sidplayer|python-mad|opie-mediaplayer1-libmadplugin)', '', d)}"

diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc
index 44e00e676432a85d1ac3f49995dcb6b81c578f54..f26c71e80ff287e2ba38aa36e6d46666569173ed 100644 (file)
--- a/packages/ffmpeg/ffmpeg.inc
+++ b/packages/ffmpeg/ffmpeg.inc
@@ -5,7 +5,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 
-DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame"
+DEPENDS = "zlib libogg libvorbis faac faad2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame liba52', d)}"
 RSUGGESTS = "mplayer"
 
 inherit autotools pkgconfig

diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 3e050408547d58a97471a5851771671613d8a787..6e347b16f1698fd07a052fa38bbc8260c41cdcfc 100644 (file)
--- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
+++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
@@ -1,6 +1,6 @@
 require ffmpeg.inc
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \
            file://configure.patch;patch=0 \

diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index aa955b16485b5e040376dea2bd306874841cba7c..3f8785b6d7fa1ed2fdeb7fb46270ca51f2283f5d 100644 (file)
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm"
 
 PE = "1"
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r34"
+PR = "r35"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv5te = "1"

diff --git a/packages/ffmpeg/ffmpeg_svn.bb b/packages/ffmpeg/ffmpeg_svn.bb
index 2433565bbe08dbcc7a7665b59d89500260f4627d..09f1003a1d336afdd3d93e351cad620bd2ec6510 100644 (file)
--- a/packages/ffmpeg/ffmpeg_svn.bb
+++ b/packages/ffmpeg/ffmpeg_svn.bb
@@ -6,7 +6,7 @@ SRCREV ?= "12186"
 
 PE = "1"
 PV = "0.4.9+svnr${SRCREV}" 
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 

diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc
index 1f3c486e53b545da89c4d54ff9656ed19eeffa28..4f523224671ef2f93362bf4a75c98b2564557d70 100644 (file)
--- 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 1c6065e74e17b2d57acd1469bd66a71dd0479197..ea99de1e39eb7dbfe16b15b5241bb1a9df91b433 100644 (file)
--- 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 80564ebe7ef783e22940599aab1e8bbbf0042293..7c36dbafff036381dc1bbfedf52c6b589ca3ec52 100644 (file)
--- 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 60162ed1bdd48b40dbe7d396858a1f850a6a2d57..59261e3121876b4877ea4259cce7d07614e724d5 100644 (file)
--- 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 da4b281e947ad954db51a07026410e895e84c6bb..d9dc87a4177c055a42ed81205d9bf252d9f3230f 100644 (file)
--- 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 da4b281e947ad954db51a07026410e895e84c6bb..d9dc87a4177c055a42ed81205d9bf252d9f3230f 100644 (file)
--- 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 da4b281e947ad954db51a07026410e895e84c6bb..d9dc87a4177c055a42ed81205d9bf252d9f3230f 100644 (file)
--- 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 87ea15878f03d79926daf8f87795321744e4d70e..9afde70d985aa3d97c6b92bf4bd16804e652ead9 100644 (file)
--- 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} \

diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb
index 06a4fba4cd9a0f1fb45a72d8ee48cf4bc96db137..c54429aca860f1aea769fe54984f6faf6eaaf915 100644 (file)
--- 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 d7ff21d4e9c5db762c06ef9d8130538f43be57ec..fd008b065a6ce04142f36e381f11eb97d2bab912 100644 (file)
--- 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 f8447ee25d7b60dda937c529b66c945d56b43890..68a0502182cae758681c53fbb34316e639d961b9 100644 (file)
--- 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-*"
 

diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index d0ae4039d39fd8ad5ccf864820fd540e44c0732f..f9d7312431454d3094c28bc22d6df5b4746776e6 100644 (file)
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -75,9 +75,8 @@ AUDIO_INSTALL = "\
   alsa-utils-aplay \
   alsa-utils-amixer \
   gst-meta-audio \
-  gst-plugin-mad \
   gst-plugin-modplug \
-  gst-plugin-sid \
+  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad gst-plugin-sid', d)} \
   fso-sounds \
 "
 

diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb
index a51dc83896a057b5541811ac4ad24b8a347e158e..87818d5e8cd6677ecb3e6b1ddf76d176d9f2e571 100644 (file)
--- a/packages/libxine/libxine-fb_1.0.bb
+++ b/packages/libxine/libxine-fb_1.0.bb
@@ -3,9 +3,10 @@ This version is configured for the usage with framebuffer based environments"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "zlib libogg tremor libmad libmodplug libpng"
+DEPENDS = "zlib libogg tremor libmodplug libpng \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
 PROVIDES = "virtual/libxine"
-PR = "r1"
+PR = "r2"
 
 inherit autotools pkgconfig gettext
 

diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb
index 806f8fd4b728ccdc99ce3d39638b8cd85f35d08d..6bc7e6eb153a3e5265c3dc18452d56844375961d 100644 (file)
--- a/packages/libxine/libxine-x11_1.0.bb
+++ b/packages/libxine/libxine-x11_1.0.bb
@@ -3,9 +3,10 @@ This version is configued for the usage with X11"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound virtual/libx11 libxext libpng"
+DEPENDS = "zlib libogg libvorbis tremor libmodplug esound virtual/libx11 libxext libpng \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
 PROVIDES = "virtual/libxine"
-PR = "r1"
+PR = "r2"
 
 inherit autotools pkgconfig gettext binconfig
 

diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb
index 9219e5fdcdbd0786b547e4070dad582e4741a15e..71e76631019df13cddb7e3eeca4553f262cd0951 100644 (file)
--- a/packages/libxine/libxine_1.1.0.bb
+++ b/packages/libxine/libxine_1.1.0.bb
@@ -3,9 +3,10 @@ This version is configued for the usage with X11"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound virtual/libx11 libxext libpng"
+DEPENDS = "zlib libogg libvorbis tremor libmodplug esound virtual/libx11 libxext libpng \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
 PROVIDES = "virtual/libxine"
-PR = "r1"
+PR = "r2"
 
 inherit autotools pkgconfig gettext binconfig
 

diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb
index f89364335cd9576f110ca717a41be954e97eb9c2..cf899861a02923265c393ffeb2ae6997f075be37 100644 (file)
--- a/packages/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11"
+DEPENDS = "virtual/libsdl zlib libpng jpeg freetype fontconfig alsa-lib lzo ncurses libxv virtual/libx11 \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \
@@ -38,7 +39,7 @@ PACKAGE_ARCH_mencoder_collie = "collie"
 
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
-PR = "r16"
+PR = "r17"
 
 PARALLEL_MAKE = ""
 

diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb
index d086e9bcc1a961884476c8772d64980e42196367..e4fb267f7cc902e8079c4a3baec467347b546211 100644 (file)
--- a/packages/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11"
+DEPENDS = "virtual/libsdl xsp zlib libpng jpeg freetype fontconfig alsa-lib lzo ncurses libxv virtual/libx11 \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
 DEPENDS_append_c7x0 = " libw100 "
 DEPENDS_append_hx4700 = " libw100 "
 
@@ -42,7 +43,7 @@ PACKAGE_ARCH_hx4700 = "hx4700"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
-PR = "r8"
+PR = "r9"
 
 PARALLEL_MAKE = ""
 

diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 923c9abf68612b9094bb98861ba864138a72887a..dc9ae771163acbec69cb1397f71fd6e0df33230b 100644 (file)
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl ffmpeg xsp libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11"
+DEPENDS = "virtual/libsdl ffmpeg xsp zlib libpng jpeg freetype fontconfig alsa-lib lzo ncurses libxv virtual/libx11 \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
 
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
@@ -39,7 +40,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc2+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv7a = "1"
 

diff --git a/packages/mt-daapd/mt-daapd.inc b/packages/mt-daapd/mt-daapd.inc
index 56692a3db87e479b4d44ee055352c8771a92cbc2..859e586cdf014ea29ac1e369295b921134e76dea 100644 (file)
--- a/packages/mt-daapd/mt-daapd.inc
+++ b/packages/mt-daapd/mt-daapd.inc
@@ -1,7 +1,8 @@
 DESCRIPTION = "multi threaded daap server for POSIX Systems: iTunes Server."
 SECTION = "console/network"
 PRIORITY = "optional"
-DEPENDS = "zlib gdbm libid3tag"
+DEPENDS = "zlib gdbm libid3tag \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libid3tag', d)}"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \

diff --git a/packages/mt-daapd/mt-daapd_0.2.1.1.bb b/packages/mt-daapd/mt-daapd_0.2.1.1.bb
index 45256799aa3a11da6ff7da5c4cb5b3c5b2e71248..e39cd775d7ceabd3831fa8ba0742083f3de5d129 100644 (file)
--- a/packages/mt-daapd/mt-daapd_0.2.1.1.bb
+++ b/packages/mt-daapd/mt-daapd_0.2.1.1.bb
@@ -1,3 +1,3 @@
 require ${PN}.inc
-PR = "r3"
+PR = "r4"
 SRC_URI += "file://itunes-5-fix.patch;patch=1"

diff --git a/packages/mt-daapd/mt-daapd_0.2.2.bb b/packages/mt-daapd/mt-daapd_0.2.2.bb
index dd2da24e65585ce570be6da625c30f9fbe13b99f..8145a5892b840f53cc91c0769cdd31318dbcb2f6 100644 (file)
--- a/packages/mt-daapd/mt-daapd_0.2.2.bb
+++ b/packages/mt-daapd/mt-daapd_0.2.2.bb
@@ -1,4 +1,4 @@
 require ${PN}.inc
 # This has not been released yet!
 DEFAULT_PREFERENCE = "-1"
-PR = "r0"
+PR = "r1"

diff --git a/packages/mt-daapd/mt-daapd_0.2.3.bb b/packages/mt-daapd/mt-daapd_0.2.3.bb
index a376c76229d6875264a1356b138ad60fb335fe3f..f6a01e0d803ddd7f5e754ba77f219af89d0c39a5 100644 (file)
--- a/packages/mt-daapd/mt-daapd_0.2.3.bb
+++ b/packages/mt-daapd/mt-daapd_0.2.3.bb
@@ -1,4 +1,4 @@
 require ${PN}.inc
 # This has not been released yet!
 #DEFAULT_PREFERENCE = -1
-PR = "r0"
+PR = "r1"

diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb
index 939ecec83694dbed08a07dcc48b5966678aa6880..82b24603a02c2c45f3a5673e9551120d763b95bc 100644 (file)
--- a/packages/musicpd/mpd-alsa_0.11.5.bb
+++ b/packages/musicpd/mpd-alsa_0.11.5.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa su
 HOMEPAGE = "http://www.musicpd.org"
 SECTION = "console/multimedia"
 LICENSE = "GPLv2"
-DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv"
+DEPENDS = "libvorbis libogg libao-alsa zlib libmikmod flac audiofile virtual/libiconv \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
 RDEPENDS = "libao-alsa"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
            file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init"

diff --git a/packages/musicpd/mpd-alsa_svn.bb b/packages/musicpd/mpd-alsa_svn.bb
index f86ae6a3374c0804a590843232a5c3e7df0555bf..9890c85831546e93b9814dfb9e564958cfa3f5a7 100644 (file)
--- a/packages/musicpd/mpd-alsa_svn.bb
+++ b/packages/musicpd/mpd-alsa_svn.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa su
 HOMEPAGE = "http://www.musicpd.org"
 SECTION = "console/multimedia"
 LICENSE = "GPLv2"
-DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmad flac audiofile virtual/libiconv faad2"
+DEPENDS = "libvorbis libogg libao-alsa zlib flac audiofile virtual/libiconv faad2 \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
 RDEPENDS = "libao-alsa"
 PV = "0.11.5+svnr${SRCREV}"
 PR = "r2"

diff --git a/packages/musicpd/mpd_svn.bb b/packages/musicpd/mpd_svn.bb
index 673ff03b9887c14c542c3ff8f3d1175899e145fd..c7d9a5b00a415c8eff2181b8b9cca0f95a1b1f38 100644 (file)
--- a/packages/musicpd/mpd_svn.bb
+++ b/packages/musicpd/mpd_svn.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Music Player Daemon (mpd)"
 HOMEPAGE = "http://www.musicpd.org"
 SECTION = "console/multimedia"
 LICENSE = "GPLv2"
-DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv faad2 pulseaudio"
+DEPENDS = "libvorbis libogg libao zlib libmikmod flac audiofile virtual/libiconv faad2 pulseaudio \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
 PV = "0.12.1+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
            file://mpd/mpd.init"

diff --git a/packages/mythtv/mythtv.inc b/packages/mythtv/mythtv.inc
index 8355e0f1a19b4b199e7f3c554f812d49d81cd5f7..9d0ebd9f0e14142abcdba2f226fd5604303d295d 100644 (file)
--- a/packages/mythtv/mythtv.inc
+++ b/packages/mythtv/mythtv.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "A full featured personal video recorder system."
 HOMEPAGE = "http://www.mythtv.org"
 LICENSE = "GPL"
 SECTION = "x11/multimedia"
-DEPENDS = "jack alsa-lib lame libxinerama libxv libxxf86vm libxvmc lirc"
+DEPENDS = "jack alsa-lib libxinerama libxv libxxf86vm libxvmc lirc \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'lame', d)}"
 #RDEPENDS_${PN} = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
 
 SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"

diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb
index fd2c351845976c78101422f5792df7e277c3465c..2d3f55c711a07f9392a9d2acd153ac67fcd26d03 100644 (file)
--- a/packages/mythtv/mythtv_0.18.1.bb
+++ b/packages/mythtv/mythtv_0.18.1.bb
@@ -2,7 +2,7 @@ require mythtv.inc
 
 inherit qmake2 qt3x11
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://msmpeg-underscore-pic.patch;patch=1 \
            file://settings.pro"

diff --git a/packages/mythtv/mythtv_0.20.bb b/packages/mythtv/mythtv_0.20.bb
index 2ebebd3012b184a763fa854b4856298a2ae544f4..467ed5112b8801608d3d6d0154bbcafb2d2d7dfe 100644 (file)
--- a/packages/mythtv/mythtv_0.20.bb
+++ b/packages/mythtv/mythtv_0.20.bb
@@ -3,7 +3,7 @@ require mythtv.inc
 inherit qmake2 qt3x11
 
 DEPENDS += "openchrome"
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://configure.patch;patch=1 \
             file://libmyth-libdir.patch;patch=1"

diff --git a/packages/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb
index edfcde03d28d05721db4d68645b900580559743c..105698999e0c6f7be43ab286bc388a0e64740ecb 100644 (file)
--- a/packages/openmax/libomxil-bellagio_0.9.0.bb
+++ b/packages/openmax/libomxil-bellagio_0.9.0.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multimedia Components on mobile platforms. It has been defined by the Khronos group."
 LICENSE = "LGPLv2"
-DEPENDS = "libmad alsa-lib ffmpeg"
+DEPENDS = "alsa-lib ffmpeg \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz"
 

diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc
index b35e71374dfabcbbe66aeeb00cc4377bc3c39fba..e12341e8bb62801874f748b8748aea423516e6fa 100644 (file)
--- a/packages/scummvm/scummvm.inc
+++ b/packages/scummvm/scummvm.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.scummvm.org"
 SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
 

diff --git a/packages/scummvm/scummvm_0.6.0.bb b/packages/scummvm/scummvm_0.6.0.bb
index 852ca5ff1ea784e5395abb9216bd2e44718875c1..9c8477dcaa376099aeadf3327e184bcde930ae85 100644 (file)
--- a/packages/scummvm/scummvm_0.6.0.bb
+++ b/packages/scummvm/scummvm_0.6.0.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Virtual Machine for LucasArts Adventures for Qt/Embedded based palmtop environments w/ SDL."
 SECTION = "opie/games"
 PRIORITY = "optional"
-DEPENDS = "libsdl-qpe libmad tremor libogg zlib mpeg2dec"
+DEPENDS = "libsdl-qpe tremor libogg zlib \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 LICENSE = "GPL"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \

diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb
index a1d3dce944e4a124c12a4d5d66435d8288a077f8..638a39e7fd16e73c41994b5e61d24f353ba117ed 100644 (file)
--- a/packages/scummvm/scummvm_0.6.1b.bb
+++ b/packages/scummvm/scummvm_0.6.1b.bb
@@ -1,5 +1,6 @@
 require scummvm.inc
-DEPENDS = "virtual/libsdl libmad tremor libogg zlib mpeg2dec"
+DEPENDS = "virtual/libsdl tremor libogg zlib \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 SRC_URI += " file://mouse.patch;patch=1 \
              file://gcc-4.x.x-accept.patch;patch=1 \
             file://sh3-linux-new-arch.patch;patch=1 \

diff --git a/packages/scummvm/scummvm_0.9.0.bb b/packages/scummvm/scummvm_0.9.0.bb
index 0403e6ae905457f1777f4804a6f7ec1aae2820c4..01ade384582e7e2cf1bf37048d133f1ab2e14d52 100644 (file)
--- a/packages/scummvm/scummvm_0.9.0.bb
+++ b/packages/scummvm/scummvm_0.9.0.bb
@@ -1,5 +1,6 @@
 require scummvm.inc
-DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec"
+DEPENDS = "virtual/libsdl libvorbis libogg zlib \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1"
 
 EXTRA_OECONF += "--enable-lure \
@@ -8,8 +9,10 @@ EXTRA_OECONF += "--enable-lure \
                 "
 
 do_compile() {
-       oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
-                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT  -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
+       oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
+                   CXXFLAGS="${CXXFLAGS}" \
+                   LDFLAGS="${LDFLAGS} ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-lmpeg2', d)}" \
+                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-DUSE_MAD -DUSE_MPEG2', d}"
 }
 
 

diff --git a/packages/scummvm/scummvm_0.9.1.bb b/packages/scummvm/scummvm_0.9.1.bb
index 39f3a76d142df25d12495617aeeb0753884a5641..7b6c9238a4cddedd1df1d0135668e5a66e96be18 100644 (file)
--- a/packages/scummvm/scummvm_0.9.1.bb
+++ b/packages/scummvm/scummvm_0.9.1.bb
@@ -1,6 +1,7 @@
 require scummvm.inc
 
-DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec"
+DEPENDS = "virtual/libsdl libvorbis libogg zlib \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 
 SRC_URI += "file://makefile-nostrip.patch;patch=1 \
             file://scummvm-targetcheck.patch;patch=1"
@@ -15,8 +16,10 @@ EXTRA_OECONF += "--enable-lure \
                 "
 
 do_compile() {
-       oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
-                  DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
+       oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
+                   CXXFLAGS="${CXXFLAGS}" \
+                   LDFLAGS="${LDFLAGS} ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-lmpeg2', d)}" \
+                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-DUSE_MAD -DUSE_MPEG2', d}"
 }
 
 

diff --git a/packages/squeezeclient/squeezeslave_svn.bb b/packages/squeezeclient/squeezeslave_svn.bb
index 03fbb0ede02df2949de9247cc445eb92b9edfae1..acdbc656da973c7e4fc2b2a7c41e418f969624d0 100644 (file)
--- a/packages/squeezeclient/squeezeslave_svn.bb
+++ b/packages/squeezeclient/squeezeslave_svn.bb
@@ -1,9 +1,10 @@
 SECTION = "console/multimedia"
 DESCRIPTION = "command line audio playback client for SlimServer"
 LICENSE = "GPL"
-DEPENDS += "libmad flac libvorbis"
+DEPENDS += "flac libvorbis \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
 PV = "3.0+svn-${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://svn.slimdevices.com/repos/slim/trunk/;module=softsqueeze;proto=http \
            file://varinit.patch;patch=1 \

diff --git a/packages/swfdec/swfdec-mozilla_0.7.2.bb b/packages/swfdec/swfdec-mozilla_0.7.2.bb
index 63499cfbd33cf7ef4323da33320312f61f1b911d..d98a25582bca8369f85251bc791917478ddfdd2b 100644 (file)
--- a/packages/swfdec/swfdec-mozilla_0.7.2.bb
+++ b/packages/swfdec/swfdec-mozilla_0.7.2.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations."
 LICENSE = "LGPL"
 
-PR = "r1"
+PR = "r2"
 
-DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib"
+DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
 RDEPENDS = "gst-ffmpeg"
 
 SRC_URI = "http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/${P}.tar.gz \

diff --git a/packages/swfdec/swfdec-mozilla_0.7.4.bb b/packages/swfdec/swfdec-mozilla_0.7.4.bb
index 2bc6a00a84febcbc4fb3ae826e31353c0a0ca323..ed727555f7b8812fc12d04f5ddf14cf875dacc19 100644 (file)
--- a/packages/swfdec/swfdec-mozilla_0.7.4.bb
+++ b/packages/swfdec/swfdec-mozilla_0.7.4.bb
@@ -1,7 +1,10 @@
 DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations."
 LICENSE = "LGPL"
 
-DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib"
+PR = "r1"
+
+DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
 RDEPENDS = "gst-ffmpeg"
 
 SRC_URI = "http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/${P}.tar.gz \

diff --git a/packages/swfdec/swfdec_0.4.0.bb b/packages/swfdec/swfdec_0.4.0.bb
index b4c56afacff39452b59c0b9a5291af21b5dad2d2..c9296c652b8f33a8e2fb8ad76f0927f98c9e61c1 100644 (file)
--- a/packages/swfdec/swfdec_0.4.0.bb
+++ b/packages/swfdec/swfdec_0.4.0.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations."
 LICENSE = "LGPL"
 
-DEPENDS = "pango cairo liboil zlib libmad gtk+ alsa-lib"
+DEPENDS = "pango cairo liboil zlib gtk+ alsa-lib \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
+PR = "r1"
 
 SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.4/${P}.tar.gz \
            file://jsautocfg.h \

diff --git a/packages/swfdec/swfdec_0.7.2.bb b/packages/swfdec/swfdec_0.7.2.bb
index 05d4977eaea939200b0b0328ec82e3c6270d79be..7e3c15dd6ca81ab2b80550d16932c94ecdaf176f 100644 (file)
--- a/packages/swfdec/swfdec_0.7.2.bb
+++ b/packages/swfdec/swfdec_0.7.2.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations."
 LICENSE = "LGPL"
 
-DEPENDS = "gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib"
+DEPENDS = "gstreamer libsoup-2.4 pango cairo liboil zlib gtk+ alsa-lib \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
+PR = "r1"
 
 SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.7/${P}.tar.gz \
 "

diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 9f1403f05077bc0eace6be51fa87afb4949e1da0..e316971e7575755b50458b8ae3aae216a7e1071a 100644 (file)
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tasks for OPIE stuff"\r
 SECTION = "opie/base"\r
 LICENSE = "MIT"\r
-PR = "r2"\r
+PR = "r3"\r
 \r
 inherit task\r
 \r
@@ -34,7 +34,7 @@ RDEPENDS_task-opie-styles = "opie-style-flat opie-style-fresh opie-style-liquid
 RDEPENDS_task-opie-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"\r
 \r
 RDEPENDS_task-opie-multimedia = "opie-mediaplayer1 \\r
-                        opie-mediaplayer1-libmadplugin \\r
+                        ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'opie-mediaplayer1-libmadplugin', d)} \\r
                         opie-mediaplayer1-libmodplugin \\r
                         opie-mediaplayer1-libtremorplugin \\r
                         opie-mediaplayer1-libwavplugin \\r

diff --git a/packages/vlc/vlc-davinci_0.8.6h.bb b/packages/vlc/vlc-davinci_0.8.6h.bb
index 4c6b19231b3596928b2baa87872648796c184e75..71520bbb9ba29f3e7b639c3ef7b7f0e6f4160acc 100644 (file)
--- a/packages/vlc/vlc-davinci_0.8.6h.bb
+++ b/packages/vlc/vlc-davinci_0.8.6h.bb
@@ -6,11 +6,12 @@ SECTION = "multimedia"
 
 SRCREV = "e712a114e04a1070f1afdf31ec668cb28eda513c"
 
-PR = "r5"
+PR = "r6"
 
 PV = "0.8.6h+${PR}+gitr${SRCREV}"
 
-DEPENDS = "codec-engine dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+DEPENDS = "codec-engine dbus libxml2 gnutls tremor faad2 ffmpeg flac  \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "git://git.videolan.org/vlc.git;protocol=git;branch=0.8.6-neuros"
 

diff --git a/packages/vlc/vlc-gpe_0.7.2.bb b/packages/vlc/vlc-gpe_0.7.2.bb
index 224b88096ea1e0d2e530d3920e0ad65a511cf331..8b09103a7fca0b4c72551e06ab7a8c356b63dd84 100644 (file)
--- a/packages/vlc/vlc-gpe_0.7.2.bb
+++ b/packages/vlc/vlc-gpe_0.7.2.bb
@@ -3,9 +3,10 @@ HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "x11/multimedia"
-PR = "r2"
+PR = "r3"
 
-DEPENDS = "faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+DEPENDS = "faad2 ffmpeg flac \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz"
 S = "${WORKDIR}/vlc-${PV}"

diff --git a/packages/vlc/vlc-gpe_0.8.1.bb b/packages/vlc/vlc-gpe_0.8.1.bb
index 0c83b6036c571fe4a39b7c252a6e10afc965a52f..78525211793e2d0a122b169acc95c11dd946bc7c 100644 (file)
--- a/packages/vlc/vlc-gpe_0.8.1.bb
+++ b/packages/vlc/vlc-gpe_0.8.1.bb
@@ -3,9 +3,10 @@ HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "x11/multimedia"
-PR = "r5"
+PR = "r6"
 
-DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz \
        file://fix-pda.patch;patch=1 \

diff --git a/packages/vlc/vlc-gpe_0.8.4.bb b/packages/vlc/vlc-gpe_0.8.4.bb
index f53aa6b45fc348389d8637dcfe28a12695e3a36e..d7138ee69d5d4dc5b81d65b259c27d5aa1856209 100644 (file)
--- a/packages/vlc/vlc-gpe_0.8.4.bb
+++ b/packages/vlc/vlc-gpe_0.8.4.bb
@@ -3,9 +3,10 @@ HOMEPAGE = "http://www.videolan.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "x11/multimedia"
-PR = "r4"
+PR = "r5"
 
-DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz \
        file://pda-interface.patch;patch=1"

diff --git a/packages/vlc/vlc_0.9.2.bb b/packages/vlc/vlc_0.9.2.bb
index 588da5e29eb23e3c95992f9e769ac85c729f012c..509662b4ae72fc39defbb62789316b27c4faface 100644 (file)
--- a/packages/vlc/vlc_0.9.2.bb
+++ b/packages/vlc/vlc_0.9.2.bb
@@ -4,9 +4,10 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "multimedia"
 
-PR = "r1"
+PR = "r2"
 
-DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://videolan.mirror.technotop.nl/vlc/0.9.2/vlc-${PV}.tar.bz2"
 

diff --git a/packages/vlc/vlc_0.9.4.bb b/packages/vlc/vlc_0.9.4.bb
index bf60e2762e7af18ee401d3999d37aa867cce5a46..4630ea534094635444345c6ae03a61528fad427a 100644 (file)
--- a/packages/vlc/vlc_0.9.4.bb
+++ b/packages/vlc/vlc_0.9.4.bb
@@ -4,9 +4,10 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "multimedia"
 
-PR = "r1"
+PR = "r2"
 
-DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://videolan.mirror.technotop.nl/vlc/${PV}/vlc-${PV}.tar.bz2"
 

diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb
index d4294494355b5a3f5dff1281a45df73838e7d629..a8b24e709af91b1a420d0398dc5da9e9c02fc5a1 100644 (file)
--- a/packages/xmms-embedded/xmms-embedded_20040327.bb
+++ b/packages/xmms-embedded/xmms-embedded_20040327.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "XMMS embedded - lightweight audio player with video and codec plugins"
 SECTION = "opie/multimedia"
-DEPENDS = "zlib tremor libmad libid3tag libsidplay glib-2.0 libmikmod"
+DEPENDS = "zlib tremor glib-2.0 libmikmod \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libsidplay libmad libid3tag', d)}"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "cvs://anonymous@xmms-embedded.cvs.sourceforge.net/cvsroot/xmms-embedded;module=xmms-embedded;date=${PV} \
            file://bogusincdir.patch;patch=1 \