[oe-commits] Paul Barker : vlc: fix configure failures with ENTERPRISE_DISTRO=1

[git at git.openembedded.org]

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

Author: Paul Barker <paul at paulbarker.me.uk>
Date:   Sat May  4 09:35:17 2013 +0000

vlc: fix configure failures with ENTERPRISE_DISTRO=1

VLC will by default search for libmad, liba52 and other libraries and may fail
to configure if they are not available. We add the relevant options to
EXTRA_OECONF to ensure that ENTERPRISE_DISTRO is respected.

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

---

 meta-multimedia/recipes-multimedia/vlc/vlc.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 059d7d2..531a018 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -65,6 +65,9 @@ EXTRA_OECONF = "\
     ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
     ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
     ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
+    ${@base_conditional('ENTERPRISE_DISTRO', '1', \
+	'--disable-mad --disable-id3tag --disable-a52 --disable-libmpeg2', \
+	'--enable-mad --enable-id3tag --enable-a52 --enable-libmpeg2', d)} \
 "