From c04e70b834a3db7e3e2b0e660ef51264e7750aef Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 21 Sep 2013 10:41:38 +0000 Subject: xfce4-settings: add PACKAGECONFIG for sound-settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit defaults based upon DISTRO_FEATURES for alsa and pulseaudio Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'meta-xfce') 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 4b75dd7ee6..227858a15a 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)}" -- cgit 1.2.3-korg