summaryrefslogtreecommitdiff
path: root/meta-moblin
diff options
context:
space:
mode:
Diffstat (limited to 'meta-moblin')
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio.inc4
-rw-r--r--meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb2
2 files changed, 5 insertions, 1 deletions
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio.inc b/meta-moblin/packages/pulseaudio/pulseaudio.inc
index 4b13980cc..10ed8e26e 100644
--- a/meta-moblin/packages/pulseaudio/pulseaudio.inc
+++ b/meta-moblin/packages/pulseaudio/pulseaudio.inc
@@ -15,6 +15,7 @@ inherit autotools pkgconfig
EXTRA_OECONF = "\
--disable-lynx \
+ --disable-bluez \
--without-x \
--without-jack \
--with-glib \
@@ -69,6 +70,9 @@ FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}"
FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
FILES_${PN}-misc = "${bindir}/*"
+# Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it)
+ALLOW_EMPTY_${PN} = "1"
+
CONFFILES_pulseaudio-server = "\
${sysconfdir}/pulse/default.pa \
${sysconfdir}/pulse/daemon.conf \
diff --git a/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb
index 6ef666995..8c8feb1ad 100644
--- a/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb
+++ b/meta-moblin/packages/pulseaudio/pulseaudio_0.9.12.bb
@@ -1,7 +1,7 @@
require pulseaudio.inc
DEPENDS += "dbus gdbm speex"
-PR = "r0"
+PR = "r1"
SRC_URI += "\
file://buildfix.patch;patch=1 \