From 7d44cbeae1886939407f5e9b42ffb45f550204b1 Mon Sep 17 00:00:00 2001 From: "Felipe F. Tonello" Date: Tue, 16 Jul 2013 18:03:47 -0700 Subject: [PATCH] pulseaudio: Removed avahi forced dependency Only adds avahi dependency when zeroconf is in DISTRO_FEATURES. (From OE-Core rev: dcb6d36b26359eb7672abd72fcb089bfa83459aa) Signed-off-by: Felipe F. Tonello Added missing '' in base_contains() Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 3f7c293..d4f66e6 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \ file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" -DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool" +DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool" # optional DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" @@ -43,11 +43,13 @@ EXTRA_OECONF = "\ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk x11', '', d)}" PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc" PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" +PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}" -- 2.7.4