summaryrefslogtreecommitdiff
path: root/packages/tasks
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2008-11-03 16:22:16 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-11-03 16:22:16 +0100
commitc0fcc31726c8c0ae90657512bd95bc983d1a8e4b (patch)
tree3b59e0fae49e720712c76424056eb568f002be51 /packages/tasks
parentedbb2e054166f3414e8a604a2b4f2ef8d775c02a (diff)
parent0d2c29eaff64c853bdd73b9cbf01fbe39020db46 (diff)
Merge branch 'holger/enterprise' into org.openembedded.dev
Diffstat (limited to 'packages/tasks')
-rw-r--r--packages/tasks/task-opie-all.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 9f1403f050..e316971e75 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Tasks for OPIE stuff"
SECTION = "opie/base"
LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
inherit task
@@ -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"
RDEPENDS_task-opie-multimedia = "opie-mediaplayer1 \
- opie-mediaplayer1-libmadplugin \
+ ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'opie-mediaplayer1-libmadplugin', d)} \
opie-mediaplayer1-libmodplugin \
opie-mediaplayer1-libtremorplugin \
opie-mediaplayer1-libwavplugin \