[oe-commits] Paul Barker : mplayer2: replace ENTERPRISE_DISTRO with PACKAGECONFIG options

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: f8cb5783072ab34757fe6d4d3117fd5399f6753a
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=f8cb5783072ab34757fe6d4d3117fd5399f6753a

Author: Paul Barker <paul at paulbarker.me.uk>
Date:   Sat Jun 22 13:28:34 2013 +0000

mplayer2: replace ENTERPRISE_DISTRO with PACKAGECONFIG options

Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    7 +++++--
 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 2e04d3c..7c1357b 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}"