Date: Wednesday, October 30, 2013 @ 13:48:36 Author: heftig Revision: 198103
archrelease: copy trunk to extra-i686, extra-x86_64 Added: pulseaudio/repos/extra-i686/PKGBUILD (from rev 198101, pulseaudio/trunk/PKGBUILD) pulseaudio/repos/extra-i686/pulseaudio.install (from rev 198101, pulseaudio/trunk/pulseaudio.install) pulseaudio/repos/extra-i686/pulseaudio.xinit (from rev 198101, pulseaudio/trunk/pulseaudio.xinit) pulseaudio/repos/extra-x86_64/PKGBUILD (from rev 198101, pulseaudio/trunk/PKGBUILD) pulseaudio/repos/extra-x86_64/pulseaudio.install (from rev 198101, pulseaudio/trunk/pulseaudio.install) pulseaudio/repos/extra-x86_64/pulseaudio.xinit (from rev 198101, pulseaudio/trunk/pulseaudio.xinit) Deleted: pulseaudio/repos/extra-i686/PKGBUILD pulseaudio/repos/extra-i686/pulseaudio.install pulseaudio/repos/extra-i686/pulseaudio.xinit pulseaudio/repos/extra-x86_64/PKGBUILD pulseaudio/repos/extra-x86_64/pulseaudio.install pulseaudio/repos/extra-x86_64/pulseaudio.xinit ---------------------------------+ /PKGBUILD | 254 ++++++++++++++++++++++++++++++++++++++ /pulseaudio.install | 56 ++++++++ /pulseaudio.xinit | 24 +++ extra-i686/PKGBUILD | 122 ------------------ extra-i686/pulseaudio.install | 28 ---- extra-i686/pulseaudio.xinit | 12 - extra-x86_64/PKGBUILD | 122 ------------------ extra-x86_64/pulseaudio.install | 28 ---- extra-x86_64/pulseaudio.xinit | 12 - 9 files changed, 334 insertions(+), 324 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-10-30 12:48:35 UTC (rev 198102) +++ extra-i686/PKGBUILD 2013-10-30 12:48:36 UTC (rev 198103) @@ -1,122 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Corrado Primier <ba...@aur.archlinux.org> -# Contributor: William Rea <sillywi...@gmail.com> - -pkgbase=pulseaudio -pkgname=(pulseaudio libpulse) -pkgdesc="A featureful, general-purpose sound server" -pkgver=4.0 -pkgrel=5 -arch=(i686 x86_64) -url="http://www.freedesktop.org/wiki/Software/PulseAudio" -license=(LGPL AGPL3) -makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack sbc - lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing - check git) -options=(!emptydirs !libtool) -#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz -source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de - pulseaudio.xinit) -sha256sums=('SKIP' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') - - -build() { - cd $pkgbase-$pkgver - - ./autogen.sh --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --with-udev-rules-dir=/usr/lib/udev/rules.d \ - --with-database=tdb \ - --disable-tcpwrap \ - --disable-rpath \ - --disable-default-build-tests - - # fight unused direct deps - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc - libsamplerate webrtc-audio-processing sbc) - optdepends=('avahi: zeroconf support' - 'bluez: bluetooth support' - 'bluez-libs: bluetooth support' - 'gconf: configuration through gconf (paprefs)' - 'jack: jack support' - 'lirc-utils: infra-red support' - 'openssl: RAOP support' - 'python-pyqt: Equalizer GUI (qpaeq)') - backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) - install=pulseaudio.install - - cd $pkgbase-$pkgver - make -j1 DESTDIR="$pkgdir" install \ - bashcompletiondir=/usr/share/bash-completion/completions - - # Disable autospawn by default - sed -e '/autospawn/iautospawn=no' \ - -i "$pkgdir/etc/pulse/client.conf" - - # Speed up pulseaudio shutdown so that it exits immediately with - # the last user session (module-systemd-login keeps it alive) - sed -e '/exit-idle-time/iexit-idle-time=0' \ - -i "$pkgdir/etc/pulse/daemon.conf" - - # Disable cork-request module, can result in e.g. media players unpausing - # when there's a Skype call incoming - sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ - -i "$pkgdir/usr/bin/start-pulseaudio-x11" - - install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" - - rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" - - install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ - "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" - -### Split libpulse - - mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}} - - mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf - - mv "$pkgdir"/usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \ - "$srcdir/libpulse/usr/bin" - - mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \ - "$srcdir/libpulse/usr/lib" - - mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \ - "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \ - "$srcdir/libpulse/usr/lib/pulseaudio" - - mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake - mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig - - mv {"$pkgdir","$srcdir/libpulse"}/usr/include - - mv "$pkgdir"/usr/share/man/man1/pa{cat,ctl,dsp,play}.1 \ - "$srcdir/libpulse/usr/share/man/man1" - - mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5 - mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala -} - -package_libpulse() { - pkgdesc="$pkgdesc (client library)" - depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c) - optdepends=('alsa-plugins: ALSA support' - 'avahi: zeroconf support') - backup=(etc/pulse/client.conf) - license=(LGPL) - - mv "$srcdir"/libpulse/* "$pkgdir" -} Copied: pulseaudio/repos/extra-i686/PKGBUILD (from rev 198101, pulseaudio/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-10-30 12:48:36 UTC (rev 198103) @@ -0,0 +1,127 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Corrado Primier <ba...@aur.archlinux.org> +# Contributor: William Rea <sillywi...@gmail.com> + +pkgbase=pulseaudio +pkgname=(pulseaudio libpulse) +pkgdesc="A featureful, general-purpose sound server" +pkgver=4.0 +pkgrel=6 +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/PulseAudio" +license=(LGPL AGPL3) +makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit + speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack sbc + lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing + check git) +options=(!emptydirs !libtool) +#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz +source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de + pulseaudio.xinit) +sha256sums=('SKIP' + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') + +prepare() { + cd $pkgbase-$pkgver + # ABI break https://bugs.freedesktop.org/show_bug.cgi?id=71047 + git revert -n 16886bb b98a2e1 +} + +build() { + cd $pkgbase-$pkgver + + ./autogen.sh --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --with-udev-rules-dir=/usr/lib/udev/rules.d \ + --with-database=tdb \ + --disable-tcpwrap \ + --disable-rpath \ + --disable-default-build-tests + + # fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package_pulseaudio() { + depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc + libsamplerate webrtc-audio-processing sbc) + optdepends=('avahi: zeroconf support' + 'bluez: bluetooth support' + 'bluez-libs: bluetooth support' + 'gconf: configuration through gconf (paprefs)' + 'jack: jack support' + 'lirc-utils: infra-red support' + 'openssl: RAOP support' + 'python-pyqt: Equalizer GUI (qpaeq)') + backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) + install=pulseaudio.install + + cd $pkgbase-$pkgver + make -j1 DESTDIR="$pkgdir" install \ + bashcompletiondir=/usr/share/bash-completion/completions + + # Disable autospawn by default + sed -e '/autospawn/iautospawn=no' \ + -i "$pkgdir/etc/pulse/client.conf" + + # Speed up pulseaudio shutdown so that it exits immediately with + # the last user session (module-systemd-login keeps it alive) + sed -e '/exit-idle-time/iexit-idle-time=0' \ + -i "$pkgdir/etc/pulse/daemon.conf" + + # Disable cork-request module, can result in e.g. media players unpausing + # when there's a Skype call incoming + sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ + -i "$pkgdir/usr/bin/start-pulseaudio-x11" + + install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" + + rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" + + install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ + "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" + +### Split libpulse + + mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}} + + mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf + + mv "$pkgdir"/usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \ + "$srcdir/libpulse/usr/bin" + + mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \ + "$srcdir/libpulse/usr/lib" + + mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \ + "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \ + "$srcdir/libpulse/usr/lib/pulseaudio" + + mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake + mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig + + mv {"$pkgdir","$srcdir/libpulse"}/usr/include + + mv "$pkgdir"/usr/share/man/man1/pa{cat,ctl,dsp,play}.1 \ + "$srcdir/libpulse/usr/share/man/man1" + + mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5 + mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala +} + +package_libpulse() { + pkgdesc="$pkgdesc (client library)" + depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c) + optdepends=('alsa-plugins: ALSA support' + 'avahi: zeroconf support') + backup=(etc/pulse/client.conf) + license=(LGPL) + + mv "$srcdir"/libpulse/* "$pkgdir" +} Deleted: extra-i686/pulseaudio.install =================================================================== --- extra-i686/pulseaudio.install 2013-10-30 12:48:35 UTC (rev 198102) +++ extra-i686/pulseaudio.install 2013-10-30 12:48:36 UTC (rev 198103) @@ -1,28 +0,0 @@ -post_install() { - cat << MES ->>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details - on configuring your system for PulseAudio. - ->>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio. -MES -} - -post_upgrade() { - cat << MES ->>> If you have per-user copies of configuration files (such as client.conf, - daemon.conf or default.pa) in ~/.config/pulse or ~/.pulse/, make sure you - keep them in sync 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: Copied: pulseaudio/repos/extra-i686/pulseaudio.install (from rev 198101, pulseaudio/trunk/pulseaudio.install) =================================================================== --- extra-i686/pulseaudio.install (rev 0) +++ extra-i686/pulseaudio.install 2013-10-30 12:48:36 UTC (rev 198103) @@ -0,0 +1,28 @@ +post_install() { + cat << MES +>>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details + on configuring your system for PulseAudio. + +>>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio. +MES +} + +post_upgrade() { + cat << MES +>>> If you have per-user copies of configuration files (such as client.conf, + daemon.conf or default.pa) in ~/.config/pulse or ~/.pulse/, make sure you + keep them in sync 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: Deleted: extra-i686/pulseaudio.xinit =================================================================== --- extra-i686/pulseaudio.xinit 2013-10-30 12:48:35 UTC (rev 198102) +++ extra-i686/pulseaudio.xinit 2013-10-30 12:48:36 UTC (rev 198103) @@ -1,12 +0,0 @@ -#!/bin/bash - -case "$DESKTOP_SESSION" in - gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart - ;; - *) - # Extra checks in case DESKTOP_SESSION is not set correctly - if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then - /usr/bin/start-pulseaudio-x11 - fi - ;; -esac Copied: pulseaudio/repos/extra-i686/pulseaudio.xinit (from rev 198101, pulseaudio/trunk/pulseaudio.xinit) =================================================================== --- extra-i686/pulseaudio.xinit (rev 0) +++ extra-i686/pulseaudio.xinit 2013-10-30 12:48:36 UTC (rev 198103) @@ -0,0 +1,12 @@ +#!/bin/bash + +case "$DESKTOP_SESSION" in + gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart + ;; + *) + # Extra checks in case DESKTOP_SESSION is not set correctly + if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then + /usr/bin/start-pulseaudio-x11 + fi + ;; +esac Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-10-30 12:48:35 UTC (rev 198102) +++ extra-x86_64/PKGBUILD 2013-10-30 12:48:36 UTC (rev 198103) @@ -1,122 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Corrado Primier <ba...@aur.archlinux.org> -# Contributor: William Rea <sillywi...@gmail.com> - -pkgbase=pulseaudio -pkgname=(pulseaudio libpulse) -pkgdesc="A featureful, general-purpose sound server" -pkgver=4.0 -pkgrel=5 -arch=(i686 x86_64) -url="http://www.freedesktop.org/wiki/Software/PulseAudio" -license=(LGPL AGPL3) -makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack sbc - lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing - check git) -options=(!emptydirs !libtool) -#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz -source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de - pulseaudio.xinit) -sha256sums=('SKIP' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') - - -build() { - cd $pkgbase-$pkgver - - ./autogen.sh --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --with-udev-rules-dir=/usr/lib/udev/rules.d \ - --with-database=tdb \ - --disable-tcpwrap \ - --disable-rpath \ - --disable-default-build-tests - - # fight unused direct deps - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc - libsamplerate webrtc-audio-processing sbc) - optdepends=('avahi: zeroconf support' - 'bluez: bluetooth support' - 'bluez-libs: bluetooth support' - 'gconf: configuration through gconf (paprefs)' - 'jack: jack support' - 'lirc-utils: infra-red support' - 'openssl: RAOP support' - 'python-pyqt: Equalizer GUI (qpaeq)') - backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) - install=pulseaudio.install - - cd $pkgbase-$pkgver - make -j1 DESTDIR="$pkgdir" install \ - bashcompletiondir=/usr/share/bash-completion/completions - - # Disable autospawn by default - sed -e '/autospawn/iautospawn=no' \ - -i "$pkgdir/etc/pulse/client.conf" - - # Speed up pulseaudio shutdown so that it exits immediately with - # the last user session (module-systemd-login keeps it alive) - sed -e '/exit-idle-time/iexit-idle-time=0' \ - -i "$pkgdir/etc/pulse/daemon.conf" - - # Disable cork-request module, can result in e.g. media players unpausing - # when there's a Skype call incoming - sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ - -i "$pkgdir/usr/bin/start-pulseaudio-x11" - - install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" - - rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" - - install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ - "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" - -### Split libpulse - - mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}} - - mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf - - mv "$pkgdir"/usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \ - "$srcdir/libpulse/usr/bin" - - mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \ - "$srcdir/libpulse/usr/lib" - - mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \ - "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \ - "$srcdir/libpulse/usr/lib/pulseaudio" - - mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake - mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig - - mv {"$pkgdir","$srcdir/libpulse"}/usr/include - - mv "$pkgdir"/usr/share/man/man1/pa{cat,ctl,dsp,play}.1 \ - "$srcdir/libpulse/usr/share/man/man1" - - mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5 - mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala -} - -package_libpulse() { - pkgdesc="$pkgdesc (client library)" - depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c) - optdepends=('alsa-plugins: ALSA support' - 'avahi: zeroconf support') - backup=(etc/pulse/client.conf) - license=(LGPL) - - mv "$srcdir"/libpulse/* "$pkgdir" -} Copied: pulseaudio/repos/extra-x86_64/PKGBUILD (from rev 198101, pulseaudio/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-10-30 12:48:36 UTC (rev 198103) @@ -0,0 +1,127 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Corrado Primier <ba...@aur.archlinux.org> +# Contributor: William Rea <sillywi...@gmail.com> + +pkgbase=pulseaudio +pkgname=(pulseaudio libpulse) +pkgdesc="A featureful, general-purpose sound server" +pkgver=4.0 +pkgrel=6 +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/PulseAudio" +license=(LGPL AGPL3) +makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit + speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack sbc + lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing + check git) +options=(!emptydirs !libtool) +#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz +source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de + pulseaudio.xinit) +sha256sums=('SKIP' + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') + +prepare() { + cd $pkgbase-$pkgver + # ABI break https://bugs.freedesktop.org/show_bug.cgi?id=71047 + git revert -n 16886bb b98a2e1 +} + +build() { + cd $pkgbase-$pkgver + + ./autogen.sh --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --with-udev-rules-dir=/usr/lib/udev/rules.d \ + --with-database=tdb \ + --disable-tcpwrap \ + --disable-rpath \ + --disable-default-build-tests + + # fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package_pulseaudio() { + depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc + libsamplerate webrtc-audio-processing sbc) + optdepends=('avahi: zeroconf support' + 'bluez: bluetooth support' + 'bluez-libs: bluetooth support' + 'gconf: configuration through gconf (paprefs)' + 'jack: jack support' + 'lirc-utils: infra-red support' + 'openssl: RAOP support' + 'python-pyqt: Equalizer GUI (qpaeq)') + backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) + install=pulseaudio.install + + cd $pkgbase-$pkgver + make -j1 DESTDIR="$pkgdir" install \ + bashcompletiondir=/usr/share/bash-completion/completions + + # Disable autospawn by default + sed -e '/autospawn/iautospawn=no' \ + -i "$pkgdir/etc/pulse/client.conf" + + # Speed up pulseaudio shutdown so that it exits immediately with + # the last user session (module-systemd-login keeps it alive) + sed -e '/exit-idle-time/iexit-idle-time=0' \ + -i "$pkgdir/etc/pulse/daemon.conf" + + # Disable cork-request module, can result in e.g. media players unpausing + # when there's a Skype call incoming + sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ + -i "$pkgdir/usr/bin/start-pulseaudio-x11" + + install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" + + rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" + + install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ + "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" + +### Split libpulse + + mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}} + + mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf + + mv "$pkgdir"/usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \ + "$srcdir/libpulse/usr/bin" + + mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \ + "$srcdir/libpulse/usr/lib" + + mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \ + "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \ + "$srcdir/libpulse/usr/lib/pulseaudio" + + mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake + mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig + + mv {"$pkgdir","$srcdir/libpulse"}/usr/include + + mv "$pkgdir"/usr/share/man/man1/pa{cat,ctl,dsp,play}.1 \ + "$srcdir/libpulse/usr/share/man/man1" + + mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5 + mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala +} + +package_libpulse() { + pkgdesc="$pkgdesc (client library)" + depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c) + optdepends=('alsa-plugins: ALSA support' + 'avahi: zeroconf support') + backup=(etc/pulse/client.conf) + license=(LGPL) + + mv "$srcdir"/libpulse/* "$pkgdir" +} Deleted: extra-x86_64/pulseaudio.install =================================================================== --- extra-x86_64/pulseaudio.install 2013-10-30 12:48:35 UTC (rev 198102) +++ extra-x86_64/pulseaudio.install 2013-10-30 12:48:36 UTC (rev 198103) @@ -1,28 +0,0 @@ -post_install() { - cat << MES ->>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details - on configuring your system for PulseAudio. - ->>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio. -MES -} - -post_upgrade() { - cat << MES ->>> If you have per-user copies of configuration files (such as client.conf, - daemon.conf or default.pa) in ~/.config/pulse or ~/.pulse/, make sure you - keep them in sync 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: Copied: pulseaudio/repos/extra-x86_64/pulseaudio.install (from rev 198101, pulseaudio/trunk/pulseaudio.install) =================================================================== --- extra-x86_64/pulseaudio.install (rev 0) +++ extra-x86_64/pulseaudio.install 2013-10-30 12:48:36 UTC (rev 198103) @@ -0,0 +1,28 @@ +post_install() { + cat << MES +>>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details + on configuring your system for PulseAudio. + +>>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio. +MES +} + +post_upgrade() { + cat << MES +>>> If you have per-user copies of configuration files (such as client.conf, + daemon.conf or default.pa) in ~/.config/pulse or ~/.pulse/, make sure you + keep them in sync 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: Deleted: extra-x86_64/pulseaudio.xinit =================================================================== --- extra-x86_64/pulseaudio.xinit 2013-10-30 12:48:35 UTC (rev 198102) +++ extra-x86_64/pulseaudio.xinit 2013-10-30 12:48:36 UTC (rev 198103) @@ -1,12 +0,0 @@ -#!/bin/bash - -case "$DESKTOP_SESSION" in - gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart - ;; - *) - # Extra checks in case DESKTOP_SESSION is not set correctly - if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then - /usr/bin/start-pulseaudio-x11 - fi - ;; -esac Copied: pulseaudio/repos/extra-x86_64/pulseaudio.xinit (from rev 198101, pulseaudio/trunk/pulseaudio.xinit) =================================================================== --- extra-x86_64/pulseaudio.xinit (rev 0) +++ extra-x86_64/pulseaudio.xinit 2013-10-30 12:48:36 UTC (rev 198103) @@ -0,0 +1,12 @@ +#!/bin/bash + +case "$DESKTOP_SESSION" in + gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart + ;; + *) + # Extra checks in case DESKTOP_SESSION is not set correctly + if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then + /usr/bin/start-pulseaudio-x11 + fi + ;; +esac