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>

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 14e90a213cedaaf6bd962f0c3bdcf12dd9961130..753b013cd4d91436a359b4742c1a0478667991f2 100644 (file)
--- 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 2f3728f9193782aed9b6c93c7a20c0c2ec3c3346..947aa6ded6932f448b95999269fea98a8e473f41 100644 (file)
--- 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"