Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH] mpg123: add PACKAGECONFIG for pulseaudio and alsa
Date: Tue, 3 Sep 2013 19:58:46 +0200	[thread overview]
Message-ID: <20130903175846.GF3553@jama> (raw)
In-Reply-To: <1377267483-7785-1-git-send-email-eren@hambedded.org>

[-- Attachment #1: Type: text/plain, Size: 2475 bytes --]

On Fri, Aug 23, 2013 at 05:18:03PM +0300, Eren Türkay wrote:
> The default DISTRO_FEATURES include alsa and pulseaudio at the same
> time. Hence, both of the options are enabled in mpg123 configuration
> without adding related dependencies, which causes build error.
> 
> Make the options mutually exclusive through PACKAGECONFIG.  If both alsa
> and pulseaudio are specified, pulseaudio takes precedence.

Applied, thanks!

> 
> Signed-off-by: Eren Türkay <eren@hambedded.org>
> ---
>  .../recipes-multimedia/mpg123/mpg123_1.15.3.bb     |   10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb
> index 595235c..0075427 100644
> --- a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb
> +++ b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb
> @@ -6,6 +6,14 @@ HOMEPAGE = "http://mpg123.de/"
>  BUGTRACKER = "http://sourceforge.net/p/mpg123/bugs/"
>  SECTION = "multimedia"
>  
> +# The options should be mutually exclusive for configuration script.
> +# If both alsa and pulseaudio are specified (as in the default distro features)
> +# pulseaudio takes precedence.
> +PACKAGECONFIG_ALSA = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}"
> +PACKAGECONFIG[pulseaudio] = "--with-default-audio=pulse,,pulseaudio"
> +PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib"
> +
>  LICENSE = "LGPLv2.1"
>  LICENSE_FLAGS = "commercial"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=a7aa23a2b646eca38ad4eeb7a853761c"
> @@ -23,7 +31,5 @@ EXTRA_OECONF = " \
>      --enable-shared \
>      ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \
>      ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \
> -    ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '--with-default-audio=alsa', '', d)} \
> -    ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '--with-default-audio=pulse', '', d)} \
>  "
>  
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

      reply	other threads:[~2013-09-03 17:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-23 14:18 [meta-oe][PATCH] mpg123: add PACKAGECONFIG for pulseaudio and alsa Eren Türkay
2013-09-03 17:58 ` Martin Jansa [this message]

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=20130903175846.GF3553@jama \
    --to=martin.jansa@gmail.com \
    --cc=openembedded-devel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox