aboutsummaryrefslogtreecommitdiffstats
path: root/packages/mplayer/mplayer_0.0+1.0rc1.bb
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/mplayer/mplayer_0.0+1.0rc1.bb
parentedbb2e054166f3414e8a604a2b4f2ef8d775c02a (diff)
parent0d2c29eaff64c853bdd73b9cbf01fbe39020db46 (diff)
downloadopenembedded-c0fcc31726c8c0ae90657512bd95bc983d1a8e4b.tar.gz
Merge branch 'holger/enterprise' into org.openembedded.dev
Diffstat (limited to 'packages/mplayer/mplayer_0.0+1.0rc1.bb')
-rw-r--r--packages/mplayer/mplayer_0.0+1.0rc1.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb
index f89364335c..cf899861a0 100644
--- 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 = ""