aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2013-06-22 13:28:34 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-06-27 18:52:23 +0200
commitf8cb5783072ab34757fe6d4d3117fd5399f6753a (patch)
tree3f2ea559e4aab4776282526d3662242665b1add2 /meta-oe/recipes-multimedia
parentcb092cc4ea867cc7cccba59eabcdcea9e5d895b2 (diff)
downloadmeta-openembedded-f8cb5783072ab34757fe6d4d3117fd5399f6753a.tar.gz
mplayer2: replace ENTERPRISE_DISTRO with PACKAGECONFIG options
Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 2e04d3c73a..7c1357b01c 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -3,8 +3,7 @@ SECTION = "multimedia"
HOMEPAGE = "http://www.mplayerhq.hu/"
DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \
- libxv virtual/libx11 libass speex faad2 \
- ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
+ libxv virtual/libx11 libass speex faad2"
RDEPENDS_${PN} = "mplayer-common"
PROVIDES = "mplayer"
@@ -132,6 +131,10 @@ EXTRA_OECONF = " \
EXTRA_OECONF_append_armv6 = " --enable-armv6"
EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
+PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
+PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52"
+PACKAGECONFIG[lame] = ",,lame"
+
FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"