From: Martin Jansa <martin.jansa@gmail.com>
To: Jonathan Liu <net147@gmail.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11
Date: Fri, 26 Feb 2016 12:04:28 +0100 [thread overview]
Message-ID: <20160226110428.GA2557@jama> (raw)
In-Reply-To: <1456483945-16340-1-git-send-email-net147@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2291 bytes --]
On Fri, Feb 26, 2016 at 09:52:25PM +1100, Jonathan Liu wrote:
> If avdevice is enabled, libxv is used if it is detected by configure
> for the XV outdev. However, we can't depend on libxv for avdevice when
> DISTRO_FEATURES doesn't contain x11 as this will result in an error.
>
> Fix this by adding a libxv dependency only when the avdevice
> PACKAGECONFIG is enabled and DISTRO_FEATURES contains x11. XV outdev
> is only one of many that are supported by avdevice so it is still
> useful to enable avdevice even if libxv is not available.
>
> Signed-off-by: Jonathan Liu <net147@gmail.com>
> ---
> meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb
> index 72393b3..f29c05e 100644
> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb
> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb
> @@ -23,11 +23,12 @@ SRC_URI[sha256sum] = "25bcedbdafadac3d09c325c1d46a51f53d858b26a260d5aed6b4f17fea
> PROVIDES = "libav libpostproc"
>
> DEPENDS = "alsa-lib zlib libogg yasm-native"
> +DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'avdevice', bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv', '', d), '', d)}"
>
> inherit autotools pkgconfig
>
> PACKAGECONFIG ??= "avdevice avfilter gpl theora x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> -PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice, libxv"
> +PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice"
bb.utils.contains didn't work in PACKAGECONFIG?
Why not
PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice, ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv', '', d)"
> PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter"
> PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac"
> PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
> --
> 2.7.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
next prev parent reply other threads:[~2016-02-26 11:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 10:52 [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11 Jonathan Liu
2016-02-26 11:04 ` Martin Jansa [this message]
2016-02-26 11:17 ` Jonathan Liu
2016-02-26 12:33 ` Burton, Ross
2016-02-26 13:29 ` Jonathan Liu
2016-02-26 14:43 ` alexander.kanavin
2016-02-26 14:05 ` Jonathan Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160226110428.GA2557@jama \
--to=martin.jansa@gmail.com \
--cc=net147@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.