[arch-commits] Commit in pulseaudio/trunk (PKGBUILD padsp-lib32.patch)
Jan Steffens
heftig at archlinux.org
Wed Sep 9 15:14:09 UTC 2015
Date: Wednesday, September 9, 2015 @ 17:14:09
Author: heftig
Revision: 245625
6.99.1
Added:
pulseaudio/trunk/padsp-lib32.patch
Modified:
pulseaudio/trunk/PKGBUILD
-------------------+
PKGBUILD | 96 +++++++++++++++++++++++++++++++---------------------
padsp-lib32.patch | 15 ++++++++
2 files changed, 74 insertions(+), 37 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-09-09 13:59:25 UTC (rev 245624)
+++ PKGBUILD 2015-09-09 15:14:09 UTC (rev 245625)
@@ -7,19 +7,24 @@
pkgbase=pulseaudio
pkgname=(pulseaudio libpulse pulseaudio-{gconf,zeroconf,lirc,xen,jack,bluetooth,equalizer})
pkgdesc="A featureful, general-purpose sound server"
-pkgver=6.0
-pkgrel=2
+pkgver=6.99.1
+pkgrel=1
arch=(i686 x86_64)
url="http://www.freedesktop.org/wiki/Software/PulseAudio"
license=(LGPL)
-makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit
+makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit libsoxr
speexdsp tdb systemd dbus avahi bluez bluez-libs gconf intltool jack2-dbus sbc
lirc openssl xenstore fftw orc json-c gtk3 webrtc-audio-processing
check)
options=(!emptydirs)
-source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz)
-sha256sums=('b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6')
+source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
+ padsp-lib32.patch)
+sha256sums=('e0fe622b52cb3d9c82e1845191572845250e68e32faa349aecedc05aff012bac'
+ '7832fc59df76538ff10aedd297c03cb7ff117235da8bfad26082994bb5b84332')
+_pulsever=$pkgver
+[[ $_pulsever = *.*.* ]] && _pulsever=${_pulsever%.*}
+
prepare() {
cd $pkgbase-$pkgver
}
@@ -47,7 +52,7 @@
package_pulseaudio() {
depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speexdsp tdb orc
- webrtc-audio-processing sbc)
+ webrtc-audio-processing sbc libsoxr)
optdepends=('pulseaudio-alsa: ALSA configuration (recommended)')
backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
install=pulseaudio.install
@@ -56,68 +61,85 @@
make -j1 DESTDIR="$pkgdir" install \
bashcompletiondir=/usr/share/bash-completion/completions
- # 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"
+ cd "$pkgdir"
+ patch -Np1 -i "$srcdir/padsp-lib32.patch"
+ sed -e '/flat-volumes/iflat-volumes=no' \
+ -i etc/pulse/daemon.conf
+
+ # Superseded by socket activation
+ sed -e '/autospawn/iautospawn=no' \
+ -i etc/pulse/client.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"
+ -i usr/bin/start-pulseaudio-x11
- rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf"
+ rm etc/dbus-1/system.d/pulseaudio-system.conf
+ mkdir usr/lib/systemd/user/sockets.target.wants
+ ln -s ../pulseaudio.socket \
+ usr/lib/systemd/user/sockets.target.wants/pulseaudio.socket
+
### 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 etc/pulse/client.conf \
+ "$srcdir/libpulse/etc/pulse"
- mv "$pkgdir"/usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \
+ mv usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \
"$srcdir/libpulse/usr/bin"
- mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \
+ mv usr/lib/libpulse{,-simple,-mainloop-glib}.so* \
+ usr/lib/{cmake,pkgconfig} \
"$srcdir/libpulse/usr/lib"
- mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \
- "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \
+ mv usr/lib/pulseaudio/libpulse{dsp,common-*}.so \
"$srcdir/libpulse/usr/lib/pulseaudio"
- mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake
- mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig
+ mv usr/include \
+ "$srcdir/libpulse/usr"
- mv {"$pkgdir","$srcdir/libpulse"}/usr/include
-
- mv "$pkgdir"/usr/share/man/man1/pa{cat,ctl,dsp,play}.1 \
+ mv usr/share/man/man1/pa{cat,ctl,dsp,mon,play,rec,record}.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
+ mv usr/share/man/man5/pulse-client.conf.5 \
+ "$srcdir/libpulse/usr/share/man/man5"
+ mv usr/share/vala \
+ "$srcdir/libpulse/usr/share"
+
### Split modules
- mkdir -p "$srcdir"/{gconf,zeroconf,lirc,xen,jack,bluetooth,equalizer}/usr/lib/pulse-$pkgver/modules \
+ mkdir -p "$srcdir"/{gconf,zeroconf,lirc,xen,jack,bluetooth,equalizer}/usr/lib/pulse-$_pulsever/modules \
"$srcdir"/{gconf/usr/lib/pulse,equalizer/usr/bin}
- mv {"$pkgdir","$srcdir/gconf"}/usr/lib/pulse-$pkgver/modules/module-gconf.so
- mv {"$pkgdir","$srcdir/gconf"}/usr/lib/pulse/gconf-helper
+ mv usr/lib/pulse-$_pulsever/modules/module-gconf.so \
+ "$srcdir/gconf/usr/lib/pulse-$_pulsever/modules"
+ mv usr/lib/pulse/gconf-helper \
+ "$srcdir/gconf/usr/lib/pulse"
- mv "$pkgdir"/usr/lib/pulse-$pkgver/modules/{libavahi-wrap,module-{zeroconf-{publish,discover},raop-discover}}.so \
- "$srcdir/zeroconf/usr/lib/pulse-$pkgver/modules"
+ mv usr/lib/pulse-$_pulsever/modules/{libavahi-wrap,module-{zeroconf-{publish,discover},raop-discover}}.so \
+ "$srcdir/zeroconf/usr/lib/pulse-$_pulsever/modules"
- mv {"$pkgdir","$srcdir/lirc"}/usr/lib/pulse-$pkgver/modules/module-lirc.so
+ mv usr/lib/pulse-$_pulsever/modules/module-lirc.so \
+ "$srcdir/lirc/usr/lib/pulse-$_pulsever/modules"
- mv {"$pkgdir","$srcdir/xen"}/usr/lib/pulse-$pkgver/modules/module-xenpv-sink.so
+ mv usr/lib/pulse-$_pulsever/modules/module-xenpv-sink.so \
+ "$srcdir/xen/usr/lib/pulse-$_pulsever/modules"
- mv "$pkgdir"/usr/lib/pulse-$pkgver/modules/module-jack{-sink,-source,dbus-detect}.so \
- "$srcdir/jack/usr/lib/pulse-$pkgver/modules"
+ mv usr/lib/pulse-$_pulsever/modules/module-jack{-sink,-source,dbus-detect}.so \
+ "$srcdir/jack/usr/lib/pulse-$_pulsever/modules"
- mv "$pkgdir"/usr/lib/pulse-$pkgver/modules/{libbluez5-util,module-{bluetooth-{discover,policy},bluez5-{discover,device}}}.so \
- "$srcdir/bluetooth/usr/lib/pulse-$pkgver/modules"
+ mv usr/lib/pulse-$_pulsever/modules/{libbluez5-util,module-{bluetooth-{discover,policy},bluez5-{discover,device}}}.so \
+ "$srcdir/bluetooth/usr/lib/pulse-$_pulsever/modules"
- mv {"$pkgdir","$srcdir/equalizer"}/usr/lib/pulse-$pkgver/modules/module-equalizer-sink.so
- mv {"$pkgdir","$srcdir/equalizer"}/usr/bin/qpaeq
+ mv usr/lib/pulse-$_pulsever/modules/module-equalizer-sink.so \
+ "$srcdir/equalizer/usr/lib/pulse-$_pulsever/modules"
+ mv usr/bin/qpaeq \
+ "$srcdir/equalizer/usr/bin"
}
package_libpulse() {
Added: padsp-lib32.patch
===================================================================
--- padsp-lib32.patch (rev 0)
+++ padsp-lib32.patch 2015-09-09 15:14:09 UTC (rev 245625)
@@ -0,0 +1,15 @@
+diff -u -r foo/usr/bin/padsp bar/usr/bin/padsp
+--- foo/usr/bin/padsp 2015-09-09 14:26:20.000000000 +0200
++++ bar/usr/bin/padsp 2015-09-09 14:47:54.828230174 +0200
+@@ -74,9 +74,9 @@
+ shift $(( $OPTIND - 1 ))
+
+ if [ x"$LD_PRELOAD" = x ] ; then
+- LD_PRELOAD="/usr/lib/pulseaudio/libpulsedsp.so"
++ LD_PRELOAD="/usr/\$LIB/pulseaudio/libpulsedsp.so"
+ else
+- LD_PRELOAD="$LD_PRELOAD /usr/lib/pulseaudio/libpulsedsp.so"
++ LD_PRELOAD="$LD_PRELOAD /usr/\$LIB/pulseaudio/libpulsedsp.so"
+ fi
+
+ export LD_PRELOAD
More information about the arch-commits
mailing list