summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@linux.com>2015-09-14 01:27:54 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-09-14 01:27:54 +0700
commitabbd682493819b5b63853cb17acff92dd56f2212 (patch)
tree874fcd4255594444889870a69d8d3029039e7b92
parenta2fa8c03e7924204062aea3cd1c9731a9f56cc78 (diff)
downloadslackbuilds-abbd682493819b5b63853cb17acff92dd56f2212.tar.gz
audio/pulseaudio: Make bash completion script posix friendly.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--audio/pulseaudio/030_posix-completion.diff91
-rw-r--r--audio/pulseaudio/README5
-rw-r--r--audio/pulseaudio/pulseaudio.SlackBuild5
-rw-r--r--audio/pulseaudio/pulseaudio.info2
4 files changed, 99 insertions, 4 deletions
diff --git a/audio/pulseaudio/030_posix-completion.diff b/audio/pulseaudio/030_posix-completion.diff
new file mode 100644
index 0000000000..de1ef055ef
--- /dev/null
+++ b/audio/pulseaudio/030_posix-completion.diff
@@ -0,0 +1,91 @@
+--- shell-completion/bash/pulseaudio.orig 2015-02-13 00:10:35.000000000 +1000
++++ shell-completion/bash/pulseaudio 2015-09-12 11:09:36.948222926 +1000
+@@ -1,39 +1,45 @@
+ #!/bin/bash
+
+ __cards () {
++ (pactl list cards short 2> /dev/null) |\
+ while IFS=$'\t' read idx name _; do
+ printf "%s %s\n" "$idx" "$name"
+- done < <(pactl list cards short 2> /dev/null)
++ done
+ }
+
+ __sinks () {
++ (pactl list sinks short 2> /dev/null) |\
+ while IFS=$'\t' read _ name _ _ _; do
+ printf "%s\n" "$name"
+- done < <(pactl list sinks short 2> /dev/null)
++ done
+ }
+
+ __sinks_idx () {
++ (pactl list sinks short 2> /dev/null) |\
+ while IFS=$'\t' read idx _ _ _ _; do
+ printf "%s\n" "$idx"
+- done < <(pactl list sinks short 2> /dev/null)
++ done
+ }
+
+ __sources () {
++ (pactl list sources short 2> /dev/null) |\
+ while IFS=$'\t' read _ name _ _ _; do
+ printf "%s\n" "$name"
+- done < <(pactl list sources short 2> /dev/null)
++ done
+ }
+
+ __sink_inputs () {
++ (pactl list sink-inputs short 2> /dev/null) |\
+ while IFS=$'\t' read idx _ _ _ _; do
+ printf "%s\n" "$idx"
+- done < <(pactl list sink-inputs short 2> /dev/null)
++ done
+ }
+
+ __source_outputs () {
++ (pactl list source-outputs short 2> /dev/null) |\
+ while IFS=$'\t' read idx _ _ _ _; do
+ printf "%s\n" "$idx"
+- done < <(pactl list source-outputs short 2> /dev/null)
++ done
+ }
+
+ __ports () {
+@@ -77,28 +83,32 @@
+ }
+
+ __all_modules () {
++ (pulseaudio --dump-modules 2> /dev/null) |\
+ while read name; do
+ name=${name%% *}
+ printf "%s\n" "$name"
+- done < <(pulseaudio --dump-modules 2> /dev/null)
++ done
+ }
+
+ __loaded_modules () {
++ (pactl list modules short 2> /dev/null) |\
+ while IFS=$'\t' read idx name _; do
+ printf "%s %s\n" "$idx" "$name"
+- done < <(pactl list modules short 2> /dev/null)
++ done
+ }
+
+ __resample_methods () {
++ (pulseaudio --dump-resample-methods 2> /dev/null) |\
+ while read name; do
+ printf "%s\n" "$name"
+- done < <(pulseaudio --dump-resample-methods 2> /dev/null)
++ done
+ }
+
+ _pacat_file_formats () {
++ (pacat --list-file-formats 2> /dev/null) |\
+ while IFS=$'\t' read name _; do
+ printf "%s\n" "$name"
+- done < <(pacat --list-file-formats 2> /dev/null)
++ done
+ }
+
+ in_array() {
diff --git a/audio/pulseaudio/README b/audio/pulseaudio/README
index b8d3234a3a..7e45020fa2 100644
--- a/audio/pulseaudio/README
+++ b/audio/pulseaudio/README
@@ -2,7 +2,10 @@ pulseaudio is a networked sound server for Unix-like operating systems
and Microsoft Windows. It is intended to be an improved drop-in replacement
for the Enlightened Sound Daemon (ESOUND).
-Optional deps: jack-audio-connection-kit, avahi, lirc, libasyncns, orc
+Optional deps: sbc, jack-audio-connection-kit, avahi, lirc, libasyncns, orc
+
+Bluetooth support requires the optional sbc package (in addition to the
+standard bluez package).
USAGE:
In almost all cases, pulseaudio should be run as a normal user daemon
diff --git a/audio/pulseaudio/pulseaudio.SlackBuild b/audio/pulseaudio/pulseaudio.SlackBuild
index 231a2ad6f5..60f91c9908 100644
--- a/audio/pulseaudio/pulseaudio.SlackBuild
+++ b/audio/pulseaudio/pulseaudio.SlackBuild
@@ -3,11 +3,11 @@
# Slackware build script for pulseaudio
# Written by crocket (crockabiscuit@gmail.com)
-# Maintained by Christoph Willing <chris.willing@iinet.net.au>
+# Maintained by Christoph Willing <chris.willing@linux.com>
PRGNAM=pulseaudio
VERSION=${VERSION:-6.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -46,6 +46,7 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
patch -p0 < $CWD/020_no-parallel-make.diff
+patch -p0 < $CWD/030_posix-completion.diff
sed -i -e '/@PA_BINARY@/ imkdir -p \$HOME/.config/pulse' src/daemon/start-pulseaudio-x11.in
echo "X-MATE-Autostart-Phase=Initialization" >>src/daemon/pulseaudio.desktop.in
diff --git a/audio/pulseaudio/pulseaudio.info b/audio/pulseaudio/pulseaudio.info
index be2888b98b..5aa4be6946 100644
--- a/audio/pulseaudio/pulseaudio.info
+++ b/audio/pulseaudio/pulseaudio.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="json-c speex"
MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@iinet.net.au"
+EMAIL="chris.willing@linux.com"