summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-09-28 18:44:40 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-09-28 18:44:40 +0000
commit17798617669f23548a46c4263b41a47b8eae2faa (patch)
tree83bc95334cc58b2d12f065ae51ec9ca55d5517c9 /packages
parent001012e9df8a01975b0d69e7d069d8e9429424d6 (diff)
parent171bc5c067cefe8ece060ae11506133df9ed64ae (diff)
merge of '0a9f13e573f898d652f74fb5614964dd53e3ff46'
and '84184cc683b97b9e1637721ea024604a13d90609'
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/pulseaudio/pulseaudio-meta/pulseaudio2
-rw-r--r--packages/pulseaudio/pulseaudio-meta_0.9.10.bb14
2 files changed, 13 insertions, 3 deletions
diff --git a/packages/pulseaudio/pulseaudio-meta/pulseaudio b/packages/pulseaudio/pulseaudio-meta/pulseaudio
index 964947376e..e0d33bd2b9 100755
--- a/packages/pulseaudio/pulseaudio-meta/pulseaudio
+++ b/packages/pulseaudio/pulseaudio-meta/pulseaudio
@@ -15,7 +15,7 @@ prog="pulseaudio"
start() {
echo -n "Starting audio server: "
# FIXME once alsa/shm permissions have been fixed, supply --system
- start-stop-daemon -S -x /usr/bin/pulseaudio -- --no-cpu-limit --resample-method=trivial -D -nF /etc/pulse/session
+ start-stop-daemon -S -x /usr/bin/pulseaudio -- --no-cpu-limit --resample-method=sinc-fastest -D -nF /etc/pulse/session
if [ $? = 0 ]; then
echo "$prog (warning ignores)." # FIXME remove comment on warning
diff --git a/packages/pulseaudio/pulseaudio-meta_0.9.10.bb b/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
index 0f1dd6a5b6..b11963b869 100644
--- a/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
+++ b/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
@@ -5,19 +5,24 @@ RDEPENDS = "\
pulseaudio-module-alsa-sink \
pulseaudio-module-alsa-source \
pulseaudio-module-cli \
+ pulseaudio-module-default-device-restore \
+ pulseaudio-module-detect\
pulseaudio-module-esound-protocol-unix \
pulseaudio-module-simple-protocol-tcp \
pulseaudio-module-native-protocol-unix \
pulseaudio-module-cli-protocol-unix \
+ pulseaudio-module-rescue-streams\
pulseaudio-module-suspend-on-idle \
+ pulseaudio-module-volue-restore \
gst-plugin-pulse \
libasound-module-ctl-pulse \
libasound-module-pcm-pulse \
"
-PR = "r1"
+PR = "r2"
inherit update-rc.d
+export TARGET_PFPU = "${TARGET_FPU}"
INITSCRIPT_NAME = "pulseaudio"
INITSCRIPT_PARAMS = "defaults 35"
@@ -34,11 +39,16 @@ do_install() {
install -d ${D}/${sysconfdir}/pulse
install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
install -m 0644 ${WORKDIR}/asound.conf ${D}/${sysconfdir}
+
+ if [ "x${TARGET_PFPU}" == "xsoft" ] ; then
+ sed -i -e s:resample-method=sinc-fastest:resample-method=trivial: ${D}${sysconfdir}/init.d/pulseaudio
+ fi
}
-PACKAGE_ARCH = "all"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
CONFFILES_${PN} = "\
+ ${sysconfdir}/init.d/pulseaudio \
${sysconfdir}/pulse/session \
${sysconfdir}/asound.conf \
"