summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-09-21 10:41:38 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-05 12:36:13 +0200
commitc04e70b834a3db7e3e2b0e660ef51264e7750aef (patch)
tree82ee11e344ad7cadb513b4f6738b499bb2dad865
parent1c1541da5389eeff1044c972f4f9e1470571fb21 (diff)
downloadmeta-openembedded-c04e70b834a3db7e3e2b0e660ef51264e7750aef.tar.gz
xfce4-settings: add PACKAGECONFIG for sound-settings
defaults based upon DISTRO_FEATURES for alsa and pulseaudio Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb8
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 4b75dd7ee..227858a15 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}"
23 23
24EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" 24EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"
25 25
26PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)}" 26PACKAGECONFIG ??= " \
27 ${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \
28 ${@base_contains('DISTRO_FEATURES','alsa','sound-setter', base_contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \
29"
27PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata" 30PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata"
28PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" 31PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify"
32PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop"
29 33
30do_configure_prepend() { 34do_configure_prepend() {
31 NOCONFIGURE=yes ./autogen.sh 35 NOCONFIGURE=yes ./autogen.sh
@@ -43,3 +47,5 @@ do_install_prepend() {
43} 47}
44 48
45RRECOMMENDS_${PN} += "gnome-icon-theme" 49RRECOMMENDS_${PN} += "gnome-icon-theme"
50RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}"
51RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}"