summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2012-11-14 13:21:06 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2012-12-04 11:25:34 +0100
commit368c674608c013005e78a32e049952223dd1ecd1 (patch)
treef00dc162aea95f95617a0e3a32a2c79d2c4b44e1
parent14b68506078a4133e743491d35245775a58a1317 (diff)
downloadmeta-openembedded-368c674608c013005e78a32e049952223dd1ecd1.tar.gz
mplayer2: move lame into ENTERPRISE_DISTRO check
Lame was in two places in build dependencies. Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 4e3c18bab..685a0bb56 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player."
2SECTION = "multimedia" 2SECTION = "multimedia"
3HOMEPAGE = "http://www.mplayerhq.hu/" 3HOMEPAGE = "http://www.mplayerhq.hu/"
4DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \ 4DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
5 libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame \ 5 libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \
6 libxv virtual/libx11 libass speex \ 6 libxv virtual/libx11 libass speex \
7 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" 7 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
8 8