diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-14 17:12:15 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-14 17:12:15 +0200 |
| commit | 6feb300093e37e58027d52ca5734624565e09598 (patch) | |
| tree | 418d2cc8c7e631c42898a28731ade8a29e3cb955 /extra/pulseaudio | |
| parent | 216722b262c18f99fa53875247e7a258cb3b4b34 (diff) | |
| parent | d3af8dc0117dc1ce4fea3d05c7a2d7786bd78986 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/openbox/PKGBUILD
community/powertop/PKGBUILD
core/libusb-compat/PKGBUILD
core/openssl/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/pidgin/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject/PKGBUILD
extra/xfce4-genmon-plugin/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libffi/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/wine/PKGBUILD
testing/mdadm/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-server/git-fixes.patch
Diffstat (limited to 'extra/pulseaudio')
| -rw-r--r-- | extra/pulseaudio/PKGBUILD | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 9ab731477..945cd757a 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 157751 2012-04-29 06:33:27Z allan $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 158827 2012-05-11 21:11:56Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> @@ -7,23 +7,24 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=1.1 -pkgrel=4 -arch=(i686 x86_64 mips64el) -url="http://pulseaudio.org/" +pkgver=2.0 +pkgrel=1 +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb udev dbus-core xcb-util avahi bluez gconf intltool jack - openssl fftw orc json-c gtk2) -[ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils) + speex tdb udev dbus-core avahi bluez gconf intltool jack + openssl fftw orc json-c gtk2 webrtc-audio-processing + libsystemd) +[ "$CARCH" != "mips64el" ] && makedepends+=(lirc-utils) options=(!emptydirs !libtool) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - $pkgbase.xinit) -sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee' + pulseaudio.xinit) +sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061' 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') build() { - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -44,7 +45,7 @@ build() { package_pulseaudio() { depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc - libsamplerate) + libsamplerate webrtc-audio-processing libsystemd) optdepends=('avahi: zeroconf support' 'bluez: bluetooth support' 'gconf: configuration through gconf (paprefs)' @@ -55,7 +56,7 @@ package_pulseaudio() { backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) install=pulseaudio.install - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make -j1 DESTDIR="$pkgdir" install # Lower resample quality, saves CPU @@ -80,15 +81,20 @@ package_pulseaudio() { ### Split libpulse - mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib,share/man/man5}} + mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib/pulseaudio,share/man/man5}} mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf - mv "$pkgdir"/usr/lib/libpulse{,dsp,-simple,-mainloop-glib}.so* \ - "$pkgdir"/usr/lib/libpulsecommon-*.so \ + 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","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5 |