aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2013-05-04 09:35:17 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-07 18:59:01 +0200
commit3d6369b7c39d78b0d424dbe5a97e736b694e3c48 (patch)
treee39e6dd650062f1796ba0fb7037c858c0872ab2d
parent07a97f66b2ec1193d582f7f1c181135b87cde9ef (diff)
downloadmeta-openembedded-3d6369b7c39d78b0d424dbe5a97e736b694e3c48.tar.gz
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@paulbarker.me.uk> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc.inc3
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 059d7d2979..531a018efa 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)} \
"