summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-10-24 17:37:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-27 09:44:56 +0100
commit8d4b851f5ec50537745574488feb4f5c9104e2b2 (patch)
treeaf1640666cdcc68182b94e9b180487cabb2a5285 /meta/recipes-multimedia/pulseaudio
parent8d98171dc2d66459dc5862cebdb350437c817982 (diff)
downloadpoky-8d4b851f5ec50537745574488feb4f5c9104e2b2.tar.gz
pulseaudio: add GConf dependency
Add explicit build-dependency on GConf as currently it's an implicit dependency and so vunerable to races at build time. (From OE-Core rev: 558705735aa9a2d640d1114bd809ca4ea7f0130d) Signed-off-by: Ross Burton <ross.burton@intel.com> 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.inc2
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 463777d363..ab70c7e9a9 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
10DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \ 10DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \
11 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}" 11 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}"
12# optional 12# optional
13DEPENDS += "udev alsa-lib glib-2.0 dbus \ 13DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \
14 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}" 14 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
15 15
16SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ 16SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
index a10b95316d..d25b424214 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
@@ -1,6 +1,6 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r7" 3PR = "r8"
4 4
5DEPENDS += "libjson gdbm speex libxml-parser-perl-native" 5DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
6 6