[oe-commits] =?UTF-8?Q?Andreas=20M=C3=BCller=20?=: xfce4-settings: add PACKAGECONFIG for sound-settings

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: c04e70b834a3db7e3e2b0e660ef51264e7750aef
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c04e70b834a3db7e3e2b0e660ef51264e7750aef

Author: Andreas Müller <schnitzeltony at googlemail.com>
Date:   Sat Sep 21 10:41:38 2013 +0000

xfce4-settings: add PACKAGECONFIG for sound-settings

defaults based upon DISTRO_FEATURES for alsa and pulseaudio

Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../xfce4-settings/xfce4-settings_git.bb           |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

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