[arch-commits] Commit in pulseaudio/repos/extra-x86_64 (6 files)
Jan Steffens
heftig at archlinux.org
Sun Sep 27 16:15:31 UTC 2015
Date: Sunday, September 27, 2015 @ 18:15:30
Author: heftig
Revision: 247541
archrelease: copy trunk to extra-x86_64
Added:
pulseaudio/repos/extra-x86_64/PKGBUILD
(from rev 247540, pulseaudio/trunk/PKGBUILD)
pulseaudio/repos/extra-x86_64/padsp-lib32.patch
(from rev 247540, pulseaudio/trunk/padsp-lib32.patch)
pulseaudio/repos/extra-x86_64/pulseaudio.install
(from rev 247540, pulseaudio/trunk/pulseaudio.install)
Deleted:
pulseaudio/repos/extra-x86_64/PKGBUILD
pulseaudio/repos/extra-x86_64/padsp-lib32.patch
pulseaudio/repos/extra-x86_64/pulseaudio.install
--------------------+
PKGBUILD | 410 +++++++++++++++++++++++++--------------------------
padsp-lib32.patch | 30 +--
pulseaudio.install | 16 -
3 files changed, 230 insertions(+), 226 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-09-27 16:14:05 UTC (rev 247540)
+++ PKGBUILD 2015-09-27 16:15:30 UTC (rev 247541)
@@ -1,203 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgbase=pulseaudio
-pkgname=(pulseaudio libpulse pulseaudio-{gconf,zeroconf,lirc,xen,jack,bluetooth,equalizer})
-pkgdesc="A featureful, general-purpose sound server"
-pkgver=7.0
-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 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
- padsp-lib32.patch)
-sha256sums=('ca1ae1377e8926bfc3ffe2aeb9f657f6c363a16f72861166fcf9454e3eeae8fa'
- '7832fc59df76538ff10aedd297c03cb7ff117235da8bfad26082994bb5b84332')
-
-prepare() {
- cd $pkgbase-$pkgver
-}
-
-build() {
- cd $pkgbase-$pkgver
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --with-udev-rules-dir=/usr/lib/udev/rules.d \
- --with-database=tdb \
- --disable-tcpwrap \
- --disable-bluez4 \
- --disable-samplerate \
- --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 speexdsp tdb orc
- webrtc-audio-processing sbc libsoxr)
- optdepends=('pulseaudio-alsa: ALSA configuration (recommended)')
- backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
- install=pulseaudio.install
-
- cd $pkgbase-$pkgver
-
- _pulsever=$(./git-version-gen .tarball-version)
- [[ $_pulsever = *.*.* ]] && _pulsever=${_pulsever%.*}
-
- make -j1 DESTDIR="$pkgdir" install \
- bashcompletiondir=/usr/share/bash-completion/completions
-
- 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 usr/bin/start-pulseaudio-x11
-
- 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 etc/pulse/client.conf \
- "$srcdir/libpulse/etc/pulse"
-
- mv usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \
- "$srcdir/libpulse/usr/bin"
-
- mv usr/lib/libpulse{,-simple,-mainloop-glib}.so* \
- usr/lib/{cmake,pkgconfig} \
- "$srcdir/libpulse/usr/lib"
-
- mv usr/lib/pulseaudio/libpulse{dsp,common-*}.so \
- "$srcdir/libpulse/usr/lib/pulseaudio"
-
- mv usr/include \
- "$srcdir/libpulse/usr"
-
- mv usr/share/man/man1/pa{cat,ctl,dsp,mon,play,rec,record}.1 \
- "$srcdir/libpulse/usr/share/man/man1"
-
- 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-$_pulsever/modules \
- "$srcdir"/{gconf/usr/lib/pulse,equalizer/usr/bin}
-
- 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 usr/lib/pulse-$_pulsever/modules/{libavahi-wrap,module-{zeroconf-{publish,discover},raop-discover}}.so \
- "$srcdir/zeroconf/usr/lib/pulse-$_pulsever/modules"
-
- mv usr/lib/pulse-$_pulsever/modules/module-lirc.so \
- "$srcdir/lirc/usr/lib/pulse-$_pulsever/modules"
-
- mv usr/lib/pulse-$_pulsever/modules/module-xenpv-sink.so \
- "$srcdir/xen/usr/lib/pulse-$_pulsever/modules"
-
- mv usr/lib/pulse-$_pulsever/modules/module-jack{-sink,-source,dbus-detect}.so \
- "$srcdir/jack/usr/lib/pulse-$_pulsever/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 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() {
- pkgdesc="$pkgdesc (client library)"
- depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c systemd)
- backup=(etc/pulse/client.conf)
-
- mv "$srcdir"/libpulse/* "$pkgdir"
-}
-
-package_pulseaudio-gconf(){
- pkgdesc="GConf support for PulseAudio"
- depends=("pulseaudio=$pkgver-$pkgrel" gconf)
-
- mv "$srcdir"/gconf/* "$pkgdir"
-}
-
-package_pulseaudio-zeroconf(){
- pkgdesc="Zeroconf support for PulseAudio"
- depends=("pulseaudio=$pkgver-$pkgrel" avahi openssl)
-
- mv "$srcdir"/zeroconf/* "$pkgdir"
-}
-
-package_pulseaudio-lirc(){
- pkgdesc="IR (lirc) support for PulseAudio"
- depends=("pulseaudio=$pkgver-$pkgrel" lirc)
-
- mv "$srcdir"/lirc/* "$pkgdir"
-}
-
-package_pulseaudio-xen(){
- pkgdesc="Xen support for PulseAudio"
- depends=("pulseaudio=$pkgver-$pkgrel" xenstore)
- license=(GPL2)
-
- mv "$srcdir"/xen/* "$pkgdir"
-}
-
-package_pulseaudio-jack(){
- pkgdesc="Jack support for PulseAudio"
- depends=("pulseaudio=$pkgver-$pkgrel" jack2)
-
- mv "$srcdir"/jack/* "$pkgdir"
-}
-
-package_pulseaudio-bluetooth(){
- pkgdesc="Bluetooth support for PulseAudio"
- depends=("pulseaudio=$pkgver-$pkgrel" bluez bluez-libs)
-
- mv "$srcdir"/bluetooth/* "$pkgdir"
-}
-
-package_pulseaudio-equalizer(){
- pkgdesc="Equalizer for PulseAudio"
- depends=("pulseaudio=$pkgver-$pkgrel" python-pyqt4 fftw)
- license=(AGPL3)
-
- mv "$srcdir"/equalizer/* "$pkgdir"
-}
Copied: pulseaudio/repos/extra-x86_64/PKGBUILD (from rev 247540, pulseaudio/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-09-27 16:15:30 UTC (rev 247541)
@@ -0,0 +1,207 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Corrado Primier <bardo at aur.archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgbase=pulseaudio
+pkgname=(pulseaudio libpulse pulseaudio-{gconf,zeroconf,lirc,xen,jack,bluetooth,equalizer})
+pkgdesc="A featureful, general-purpose sound server"
+pkgver=7.0
+pkgrel=2
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/wiki/Software/PulseAudio"
+license=(LGPL)
+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
+ padsp-lib32.patch)
+sha256sums=('ca1ae1377e8926bfc3ffe2aeb9f657f6c363a16f72861166fcf9454e3eeae8fa'
+ '7832fc59df76538ff10aedd297c03cb7ff117235da8bfad26082994bb5b84332')
+
+prepare() {
+ cd $pkgbase-$pkgver
+}
+
+build() {
+ cd $pkgbase-$pkgver
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --with-udev-rules-dir=/usr/lib/udev/rules.d \
+ --with-database=tdb \
+ --disable-tcpwrap \
+ --disable-bluez4 \
+ --disable-samplerate \
+ --disable-rpath \
+ --disable-default-build-tests \
+ DATADIRNAME=share
+
+ # 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 speexdsp tdb orc
+ webrtc-audio-processing sbc libsoxr)
+ optdepends=('pulseaudio-alsa: ALSA configuration (recommended)')
+ backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
+ install=pulseaudio.install
+
+ cd $pkgbase-$pkgver
+
+ _pulsever=$(./git-version-gen .tarball-version)
+ while [[ $_pulsever = *.*.* ]]; do
+ _pulsever=${_pulsever%.*}
+ done
+ _pulsever=${_pulsever%%-*}
+
+ make -j1 DESTDIR="$pkgdir" install \
+ bashcompletiondir=/usr/share/bash-completion/completions
+
+ 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 usr/bin/start-pulseaudio-x11
+
+ 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 etc/pulse/client.conf \
+ "$srcdir/libpulse/etc/pulse"
+
+ mv usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \
+ "$srcdir/libpulse/usr/bin"
+
+ mv usr/lib/libpulse{,-simple,-mainloop-glib}.so* \
+ usr/lib/{cmake,pkgconfig} \
+ "$srcdir/libpulse/usr/lib"
+
+ mv usr/lib/pulseaudio/libpulse{dsp,common-*}.so \
+ "$srcdir/libpulse/usr/lib/pulseaudio"
+
+ mv usr/include \
+ "$srcdir/libpulse/usr"
+
+ mv usr/share/man/man1/pa{cat,ctl,dsp,mon,play,rec,record}.1 \
+ "$srcdir/libpulse/usr/share/man/man1"
+
+ 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-$_pulsever/modules \
+ "$srcdir"/{gconf/usr/lib/pulse,equalizer/usr/bin}
+
+ 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 usr/lib/pulse-$_pulsever/modules/{libavahi-wrap,module-{zeroconf-{publish,discover},raop-discover}}.so \
+ "$srcdir/zeroconf/usr/lib/pulse-$_pulsever/modules"
+
+ mv usr/lib/pulse-$_pulsever/modules/module-lirc.so \
+ "$srcdir/lirc/usr/lib/pulse-$_pulsever/modules"
+
+ mv usr/lib/pulse-$_pulsever/modules/module-xenpv-sink.so \
+ "$srcdir/xen/usr/lib/pulse-$_pulsever/modules"
+
+ mv usr/lib/pulse-$_pulsever/modules/module-jack{-sink,-source,dbus-detect}.so \
+ "$srcdir/jack/usr/lib/pulse-$_pulsever/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 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() {
+ pkgdesc="$pkgdesc (client library)"
+ depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c systemd)
+ backup=(etc/pulse/client.conf)
+
+ mv "$srcdir"/libpulse/* "$pkgdir"
+}
+
+package_pulseaudio-gconf(){
+ pkgdesc="GConf support for PulseAudio"
+ depends=("pulseaudio=$pkgver-$pkgrel" gconf)
+
+ mv "$srcdir"/gconf/* "$pkgdir"
+}
+
+package_pulseaudio-zeroconf(){
+ pkgdesc="Zeroconf support for PulseAudio"
+ depends=("pulseaudio=$pkgver-$pkgrel" avahi openssl)
+
+ mv "$srcdir"/zeroconf/* "$pkgdir"
+}
+
+package_pulseaudio-lirc(){
+ pkgdesc="IR (lirc) support for PulseAudio"
+ depends=("pulseaudio=$pkgver-$pkgrel" lirc)
+
+ mv "$srcdir"/lirc/* "$pkgdir"
+}
+
+package_pulseaudio-xen(){
+ pkgdesc="Xen support for PulseAudio"
+ depends=("pulseaudio=$pkgver-$pkgrel" xenstore)
+ license=(GPL2)
+
+ mv "$srcdir"/xen/* "$pkgdir"
+}
+
+package_pulseaudio-jack(){
+ pkgdesc="Jack support for PulseAudio"
+ depends=("pulseaudio=$pkgver-$pkgrel" jack2)
+
+ mv "$srcdir"/jack/* "$pkgdir"
+}
+
+package_pulseaudio-bluetooth(){
+ pkgdesc="Bluetooth support for PulseAudio"
+ depends=("pulseaudio=$pkgver-$pkgrel" bluez bluez-libs)
+
+ mv "$srcdir"/bluetooth/* "$pkgdir"
+}
+
+package_pulseaudio-equalizer(){
+ pkgdesc="Equalizer for PulseAudio"
+ depends=("pulseaudio=$pkgver-$pkgrel" python-pyqt4 fftw)
+ license=(AGPL3)
+
+ mv "$srcdir"/equalizer/* "$pkgdir"
+}
Deleted: padsp-lib32.patch
===================================================================
--- padsp-lib32.patch 2015-09-27 16:14:05 UTC (rev 247540)
+++ padsp-lib32.patch 2015-09-27 16:15:30 UTC (rev 247541)
@@ -1,15 +0,0 @@
-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
Copied: pulseaudio/repos/extra-x86_64/padsp-lib32.patch (from rev 247540, pulseaudio/trunk/padsp-lib32.patch)
===================================================================
--- padsp-lib32.patch (rev 0)
+++ padsp-lib32.patch 2015-09-27 16:15:30 UTC (rev 247541)
@@ -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
Deleted: pulseaudio.install
===================================================================
--- pulseaudio.install 2015-09-27 16:14:05 UTC (rev 247540)
+++ pulseaudio.install 2015-09-27 16:15:30 UTC (rev 247541)
@@ -1,8 +0,0 @@
-post_upgrade() {
- (( $(vercmp $2 6.0-2) < 0 )) && cat <<MSG
->>> Many PulseAudio modules with additional dependencies have been split into
- separate packages. Please check the pulseaudio-* packages and reinstall
- what you need.
-MSG
- true
-}
Copied: pulseaudio/repos/extra-x86_64/pulseaudio.install (from rev 247540, pulseaudio/trunk/pulseaudio.install)
===================================================================
--- pulseaudio.install (rev 0)
+++ pulseaudio.install 2015-09-27 16:15:30 UTC (rev 247541)
@@ -0,0 +1,8 @@
+post_upgrade() {
+ (( $(vercmp $2 6.0-2) < 0 )) && cat <<MSG
+>>> Many PulseAudio modules with additional dependencies have been split into
+ separate packages. Please check the pulseaudio-* packages and reinstall
+ what you need.
+MSG
+ true
+}
More information about the arch-commits
mailing list