summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 4b13980cc4..10ed8e26e9 100644
--- a/meta-moblin/packages/pulseaudio/pulseaudio.inc
+++ b/meta-moblin/packages/pulseaudio/pulseaudio.inc
@@ -15,6 +15,7 @@ inherit autotools pkgconfig
15 15
16EXTRA_OECONF = "\ 16EXTRA_OECONF = "\
17 --disable-lynx \ 17 --disable-lynx \
18 --disable-bluez \
18 --without-x \ 19 --without-x \
19 --without-jack \ 20 --without-jack \
20 --with-glib \ 21 --with-glib \
@@ -69,6 +70,9 @@ FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}"
69FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper" 70FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
70FILES_${PN}-misc = "${bindir}/*" 71FILES_${PN}-misc = "${bindir}/*"
71 72
73# Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it)
74ALLOW_EMPTY_${PN} = "1"
75
72CONFFILES_pulseaudio-server = "\ 76CONFFILES_pulseaudio-server = "\
73 ${sysconfdir}/pulse/default.pa \ 77 ${sysconfdir}/pulse/default.pa \
74 ${sysconfdir}/pulse/daemon.conf \ 78 ${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 6ef6669955..8c8feb1ad1 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 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3DEPENDS += "dbus gdbm speex" 3DEPENDS += "dbus gdbm speex"
4PR = "r0" 4PR = "r1"
5 5
6SRC_URI += "\ 6SRC_URI += "\
7 file://buildfix.patch;patch=1 \ 7 file://buildfix.patch;patch=1 \