summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2012-02-20 08:57:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-26 11:56:05 +0000
commit21f2c0b5cd9a53aba277aaaf27a6a5d562b2405f (patch)
tree93738c4d65f8b122ac30c607c0070ba4c535279d
parentc02bea652b615569e2204f8db864d73c5bb10cbc (diff)
downloadpoky-21f2c0b5cd9a53aba277aaaf27a6a5d562b2405f.tar.gz
pulseaudio: Really disable orc support
If orc is detected the compilation fails with missing headers which should have been generated by orc (using meta-angstrom + meta-openembedded and and armv7 target) [RP: add RP bump, fix typos] (From OE-Core rev: 8f72d9e4ecf495646af3c5cebe7f08ca01bbbb99) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc1
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_1.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 38ecba58ad..ca3a28dc6c 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -29,6 +29,7 @@ EXTRA_OECONF = "\
29 --with-oss \ 29 --with-oss \
30 --without-hal \ 30 --without-hal \
31 --disable-hal \ 31 --disable-hal \
32 --disable-orc \
32 --with-access-group=audio \ 33 --with-access-group=audio \
33" 34"
34 35
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
index 93db7825ea..3055994249 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
@@ -1,6 +1,6 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5DEPENDS += "libjson gdbm speex libxml-parser-perl-native" 5DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
6 6