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

login
register
mail settings
Submitter Andreas Müller
Date Sept. 21, 2013, 10:41 a.m.
Message ID <1379760101-13380-8-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/58463/
State Accepted, archived
Commit c04e70b834a3db7e3e2b0e660ef51264e7750aef
Headers show

Comments

Andreas Müller - Sept. 21, 2013, 10:41 a.m.
defaults based upon DISTRO_FEATURES for alsa and pulseaudio

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
Martin Jansa - Oct. 4, 2013, 2:18 p.m.
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@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@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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Andreas Müller - Oct. 4, 2013, 8:02 p.m.
On Fri, Oct 4, 2013 at 4:18 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> 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@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}"
Aargh - it is definitely a 4.11+git - I have seen this warning long
time ago but did not take enough attention...
>
> Sorry that I haven't reported it on the commit which caused it :).

I will send a patch ontop of this series next week.

Nadreas
Martin Jansa - Oct. 4, 2013, 8:23 p.m.
On Fri, Oct 04, 2013 at 10:02:25PM +0200, Andreas Müller wrote:
> On Fri, Oct 4, 2013 at 4:18 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > 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@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}"
> Aargh - it is definitely a 4.11+git - I have seen this warning long
> time ago but did not take enough attention...
> >
> > Sorry that I haven't reported it on the commit which caused it :).
> 
> I will send a patch ontop of this series next week.
> 
> Nadreas

OK, I'll merge this series this week (2nd build already running).

Could you check xfce4 specific issues in
http://lists.openembedded.org/pipermail/openembedded-core/2013-October/084905.html
?

That would be very appreciated.

Patch

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