aboutsummaryrefslogtreecommitdiffstats
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:31:36 +0100
commit558705735aa9a2d640d1114bd809ca4ea7f0130d (patch)
tree6350b3551f7e335dca110e53ca0d238cf32b58b3
parentc8e8e8ba22eaa335ac72f0e5b317f804035133e2 (diff)
downloadopenembedded-core-contrib-558705735aa9a2d640d1114bd809ca4ea7f0130d.tar.gz
openembedded-core-contrib-558705735aa9a2d640d1114bd809ca4ea7f0130d.tar.bz2
openembedded-core-contrib-558705735aa9a2d640d1114bd809ca4ea7f0130d.zip
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. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-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 \
DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \
${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}"
# optional
-DEPENDS += "udev alsa-lib glib-2.0 dbus \
+DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \
${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
SRC_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 @@
require pulseaudio.inc
-PR = "r7"
+PR = "r8"
DEPENDS += "libjson gdbm speex libxml-parser-perl-native"