summaryrefslogtreecommitdiff
path: root/audio/pulseaudio
diff options
context:
space:
mode:
Diffstat (limited to 'audio/pulseaudio')
-rw-r--r--audio/pulseaudio/README2
-rw-r--r--audio/pulseaudio/doinst.sh13
-rw-r--r--audio/pulseaudio/pulseaudio.SlackBuild17
-rw-r--r--audio/pulseaudio/pulseaudio.info6
-rw-r--r--audio/pulseaudio/rc.pulseaudio43
5 files changed, 71 insertions, 10 deletions
diff --git a/audio/pulseaudio/README b/audio/pulseaudio/README
index a5471047a6..1644d4cfa5 100644
--- a/audio/pulseaudio/README
+++ b/audio/pulseaudio/README
@@ -10,3 +10,5 @@ on the gid and uid assignments.
Requires: speex
Optional: jack-audio-connection-kit, avahi, lirc, libasyncns, GConf
+
+Available build option(s) : ORC=yes
diff --git a/audio/pulseaudio/doinst.sh b/audio/pulseaudio/doinst.sh
index 8fa296faf5..795ff51137 100644
--- a/audio/pulseaudio/doinst.sh
+++ b/audio/pulseaudio/doinst.sh
@@ -11,6 +11,19 @@ config() {
# Otherwise, we leave the .new copy for the admin to consider...
}
+preserve_perms() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ if [ -e $OLD ]; then
+ cp -a $OLD ${NEW}.incoming
+ cat $NEW > ${NEW}.incoming
+ mv ${NEW}.incoming $NEW
+ fi
+ config $NEW
+}
+
+
config etc/pulse/client.conf.new
config etc/pulse/default.pa.new
config etc/pulse/daemon.conf.new
+preserve_perms etc/rc.d/rc.pulseaudio.new
diff --git a/audio/pulseaudio/pulseaudio.SlackBuild b/audio/pulseaudio/pulseaudio.SlackBuild
index 127e3f6d89..3bb8d3b954 100644
--- a/audio/pulseaudio/pulseaudio.SlackBuild
+++ b/audio/pulseaudio/pulseaudio.SlackBuild
@@ -5,7 +5,7 @@
# Written by crocket (crockabiscuit@gmail.com)
PRGNAM=pulseaudio
-VERSION=0.9.23
+VERSION=1.1
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -52,7 +52,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find . \
@@ -61,8 +61,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-patch -p1 < $CWD/pulseaudio-$VERSION.diff
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -71,10 +69,12 @@ CXXFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
- --enable-tcpwrap \
+ --disable-tcpwrap \
+ --enable-orc=${ORC:-"no"} \
--disable-static \
- --disable-hal \
+ --disable-hal --disable-hal-compat \
--disable-solaris \
+ --disable-waveout \
--with-system-user=pulse \
--with-system-group=pulse \
--with-access-group=audio \
@@ -87,11 +87,14 @@ mv $PKG/etc/pulse/client.conf $PKG/etc/pulse/client.conf.new
mv $PKG/etc/pulse/default.pa $PKG/etc/pulse/default.pa.new
mv $PKG/etc/pulse/daemon.conf $PKG/etc/pulse/daemon.conf.new
+mkdir -p $PKG/etc/rc.d
+cp $CWD/rc.pulseaudio $PKG/etc/rc.d/rc.pulseaudio.new
+
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS *GPL LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT-NLS *GPL LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/audio/pulseaudio/pulseaudio.info b/audio/pulseaudio/pulseaudio.info
index d398235a98..71b0335f3b 100644
--- a/audio/pulseaudio/pulseaudio.info
+++ b/audio/pulseaudio/pulseaudio.info
@@ -1,9 +1,9 @@
PRGNAM="pulseaudio"
-VERSION="0.9.23"
+VERSION="1.1"
HOMEPAGE="http://www.pulseaudio.org"
-DOWNLOAD="http://freedesktop.org/software/pulseaudio/releases/pulseaudio-0.9.23.tar.gz"
+DOWNLOAD="http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz"
DOWNLOAD_x86_64=""
-MD5SUM="7391205a337d1e04a9ff38025f684034"
+MD5SUM="17d21df798cee407b769c6355fae397a"
MD5SUM_x86_64=""
MAINTAINER="crocket"
EMAIL="crockabiscuit@gmail.com"
diff --git a/audio/pulseaudio/rc.pulseaudio b/audio/pulseaudio/rc.pulseaudio
new file mode 100644
index 0000000000..81c9361d50
--- /dev/null
+++ b/audio/pulseaudio/rc.pulseaudio
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+start()
+{
+ if /usr/bin/sudo -u pulse /usr/bin/pulseaudio --check; then
+ echo "pulseaudio is running."
+ else
+ echo "Starting pulseaudio..."
+ /usr/bin/sudo -u pulse /usr/bin/pulseaudio --start --use-pid-file=yes
+ fi
+}
+
+stop()
+{
+ if /usr/bin/sudo -u pulse /usr/bin/pulseaudio --check; then
+ printf "Stopping pulseaudio..."
+ /usr/bin/sudo -u pulse /usr/bin/pulseaudio --kill
+ while /usr/bin/sudo -u pulse /usr/bin/pulseaudio --check; do
+ printf "."
+ sleep 1
+ done
+ echo "Done"
+ else
+ echo "pulseaudio is not running."
+ fi
+}
+
+status()
+{
+ if /usr/bin/sudo -u pulse /usr/bin/pulseaudio --check; then
+ echo "pulseaudio is running."
+ else
+ echo "pulseaudio is not running."
+ fi
+}
+
+case "$1" in
+'start')start;;
+'stop')stop;;
+'restart')stop;start;;
+'status')status;;
+*)echo "$0 start|stop|restart|status"
+esac