summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio
diff options
context:
space:
mode:
authorFelipe F. Tonello <eu@felipetonello.com>2013-07-16 18:03:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-18 21:25:35 +0100
commit8ebc333db1a66d31a29196c7df63fcebc1eae631 (patch)
treeb7f64e6b5408e1cedf28f7c4ef5744e907fa7454 /meta/recipes-multimedia/pulseaudio
parent7156f30ac32b9bb7718cedf12e868d3e0e0514bc (diff)
downloadpoky-8ebc333db1a66d31a29196c7df63fcebc1eae631.tar.gz
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 <eu@felipetonello.com> Added missing '' in base_contains() Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 3f7c293273..d4f66e6ca8 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 \
7 file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 7 file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \ 8 file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \
9 file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" 9 file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95"
10DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool" 10DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool"
11# optional 11# optional
12DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" 12DEPENDS += "udev alsa-lib glib-2.0 dbus gconf"
13 13
@@ -43,11 +43,13 @@ EXTRA_OECONF = "\
43 43
44PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 44PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
45 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 45 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
46 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
46 ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk x11', '', d)}" 47 ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk x11', '', d)}"
47PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc" 48PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc"
48PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+" 49PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+"
49PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" 50PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
50PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" 51PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb"
52PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
51 53
52EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}" 54EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}"
53 55