Patchwork [meta-multimedia,5/5] vlc: fix configure failures with ENTERPRISE_DISTRO=1

login
register
mail settings
Submitter Paul Barker
Date May 4, 2013, 9:35 a.m.
Message ID <1367660117-19572-6-git-send-email-paul@paulbarker.me.uk>
Download mbox | patch
Permalink /patch/49333/
State Accepted, archived
Commit 3d6369b7c39d78b0d424dbe5a97e736b694e3c48
Headers show

Comments

Paul Barker - May 4, 2013, 9:35 a.m.
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>
---
 meta-multimedia/recipes-multimedia/vlc/vlc.inc | 3 +++
 1 file changed, 3 insertions(+)
Martin Jansa - May 4, 2013, 10:34 a.m.
On Sat, May 04, 2013 at 10:35:17AM +0100, Paul Barker wrote:
> 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.

It would be great to convert them to PACKAGECONFIG options, but it can
be in follow-up change.

> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
>  meta-multimedia/recipes-multimedia/vlc/vlc.inc | 3 +++
>  1 file changed, 3 insertions(+)
> 
> 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)} \
>  "
>  
>  
> -- 
> 1.8.2.2
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

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)} \
 "