From: Phil Blundell <philb@gnu.org>
Date: Sat, 22 Sep 2012 18:37:04 +0000 (+0100)
Subject: pulseaudio: Ensure openssl is disabled
X-Git-Tag: 2015-4~9076
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1cdcd754651f8d519ac8e4ba0d241d784e2a0090;p=openembedded-core.git

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 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"