diff options
author | Paul Barker <paul@paulbarker.me.uk> | 2013-05-04 09:35:17 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-07 18:59:01 +0200 |
commit | 3d6369b7c39d78b0d424dbe5a97e736b694e3c48 (patch) | |
tree | e39e6dd650062f1796ba0fb7037c858c0872ab2d /meta-multimedia | |
parent | 07a97f66b2ec1193d582f7f1c181135b87cde9ef (diff) | |
download | meta-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>
Diffstat (limited to 'meta-multimedia')
-rw-r--r-- | 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 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 = "\ | |||
65 | ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ | 65 | ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ |
66 | ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ | 66 | ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ |
67 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ | 67 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ |
68 | ${@base_conditional('ENTERPRISE_DISTRO', '1', \ | ||
69 | '--disable-mad --disable-id3tag --disable-a52 --disable-libmpeg2', \ | ||
70 | '--enable-mad --enable-id3tag --enable-a52 --enable-libmpeg2', d)} \ | ||
68 | " | 71 | " |
69 | 72 | ||
70 | 73 | ||