aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-09-22 19:37:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-24 11:18:06 +0100
commit1cdcd754651f8d519ac8e4ba0d241d784e2a0090 (patch)
treed163b1e033b537f960cfbbf7a9201a2aef60d12f /meta/recipes-multimedia
parenta87db6f8dea71cbb7ead9285ff8af0e28cf75604 (diff)
downloadopenembedded-core-1cdcd754651f8d519ac8e4ba0d241d784e2a0090.tar.gz
pulseaudio: Ensure openssl is disabled
We don't DEPEND on openssl but configure will try to use it if pkg-config thinks it might be installed. This can lead to failing and/or nondeterministic builds, so let's force it off. Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc1
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 14e90a213c..753b013cd4 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -37,6 +37,7 @@ EXTRA_OECONF = "\
--disable-orc \
--enable-tcpwrap=no \
--with-access-group=audio \
+ --disable-openssl \
"
PARALLEL_MAKE = ""
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
index 2f3728f919..947aa6ded6 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 = "r4"
+PR = "r5"
DEPENDS += "libjson gdbm speex libxml-parser-perl-native"