[oe] [meta-oe/meta-xfce 07/10] xfce4-settings: add PACKAGECONFIG for sound-settings

[Martin Jansa]

On Sat, Sep 21, 2013 at 12:41:38PM +0200, Andreas Müller wrote:
> defaults based upon DISTRO_FEATURES for alsa and pulseaudio
> 
> Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
> ---
>  meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
> index 4b75dd7..227858a 100644
> --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
> +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
> @@ -23,9 +23,13 @@ PV = "4.10.0+git${SRCPV}"
>   
>  EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"

Last xfce4-settings change caused PV going backwards:
xfce4-settings-4.10.0+gitAUTOINC+b7a0e1fd77: Package version for package
xfce4-settings-locale-si went backwards which would break package feeds
from (0:4.11.0-r0.55 to 0:4.10.0+git0+b7a0e1fd77-r0.2)

commit 23f020f742aea622e5dd7aef81eb59c99f8ef000
Author: Andreas M<C3><BC>ller <schnitzeltony at googlemail.com>
Date:   Mon Sep 16 09:04:15 2013 +0000

    xfce4-settings: move to schnitzeltony's git repo to get new datetime
setter
    
Is this git version really older tna old release we had?

Sorry that I haven't reported it on the commit which caused it :).

>  
> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)}"
> +PACKAGECONFIG ??= " \
> +    ${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \
> +    ${@base_contains('DISTRO_FEATURES','alsa','sound-setter', base_contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \
> +"
>  PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata"
>  PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify"
> +PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop"
>  
>  do_configure_prepend() {
>      NOCONFIGURE=yes ./autogen.sh
> @@ -43,3 +47,5 @@ do_install_prepend() {
>  }
>  
>  RRECOMMENDS_${PN} += "gnome-icon-theme"
> +RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}"
> +RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}"
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20131004/7901c47c/attachment-0002.sig>