diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-02 09:38:50 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-02 09:38:50 +0200 |
commit | b4e4bd9b44479ab23dbbeaf58ba35e25ff345df1 (patch) | |
tree | 49dafd3110cca5d6f5054d4f9ef04957ec7b53a6 /extra/pulseaudio | |
parent | 7d33f92ae992837f61fe5db4535e95dfec6924fa (diff) | |
parent | c9738c6a1d438f30dfa7363aa847343754f953ac (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-mozc/PKGBUILD
community/libfm/PKGBUILD
community/sxiv/PKGBUILD
extra/pulseaudio/PKGBUILD
Diffstat (limited to 'extra/pulseaudio')
-rw-r--r-- | extra/pulseaudio/PKGBUILD | 8 | ||||
-rwxr-xr-x | extra/pulseaudio/pulseaudio.install | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 571a202e7..70575cf3a 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173315 2012-12-18 20:30:41Z heftig $ +# $Id: PKGBUILD 181159 2013-04-01 19:36:12Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -8,7 +8,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=3.0 -pkgrel=2.1 +pkgrel=3 arch=(i686 x86_64 mips64el) url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -58,6 +58,10 @@ package_pulseaudio() { cd $pkgbase-$pkgver make -j1 DESTDIR="$pkgdir" install + # Disable autospawn by default + sed -e '/autospawn/iautospawn=no' \ + -i "$pkgdir/etc/pulse/client.conf" + # Speed up pulseaudio shutdown # Lower resample quality, saves CPU sed -e '/exit-idle-time/iexit-idle-time=0' \ diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install index 0e599b856..9de8b0e8f 100755 --- a/extra/pulseaudio/pulseaudio.install +++ b/extra/pulseaudio/pulseaudio.install @@ -20,6 +20,15 @@ post_upgrade() { with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio may refuse to start due to configuration errors. MES + if (( $(vercmp $2 3.0-3) < 0 )); then + cat << MES + +>>> Autospawn is now disabled by default. If you need to run PulseAudio outside + of an X session, either: + - Enable autospawn in client.conf, or + - Start it manually by executing 'pulseaudio --start' +MES + fi } # vim:set ts=2 sw=2 et: |