audio/pulseaudio: Updated for version 2.0 (+new maintainer)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 19 insertions, 17 deletions

diff --git a/audio/pulseaudio/README b/audio/pulseaudio/README
index f1b1726f0b..7ea7258d5f 100644
--- a/audio/pulseaudio/README
+++ b/audio/pulseaudio/README
@@ -9,6 +9,4 @@ or something similar.  See http://slackbuilds.org/uid_gid.txt for details
 on the gid and uid assignments.
 
 Requires: speex, json-c
-Optional: jack-audio-connection-kit, avahi, lirc, libasyncns, GConf
-
-Available build option(s) : ORC=yes
+Optional: jack-audio-connection-kit, avahi, lirc, libasyncns, GConf, orc
diff --git a/audio/pulseaudio/doinst.sh b/audio/pulseaudio/doinst.sh
index 795ff51137..4d34b37081 100644
--- a/audio/pulseaudio/doinst.sh
+++ b/audio/pulseaudio/doinst.sh
@@ -10,7 +10,6 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-
 preserve_perms() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -21,8 +20,6 @@ preserve_perms() {
   fi
   config $NEW
 }
-
-
 config etc/pulse/client.conf.new
 config etc/pulse/default.pa.new
 config etc/pulse/daemon.conf.new
diff --git a/audio/pulseaudio/pulseaudio.SlackBuild b/audio/pulseaudio/pulseaudio.SlackBuild
index 3bb8d3b954..299bb3c318 100644
--- a/audio/pulseaudio/pulseaudio.SlackBuild
+++ b/audio/pulseaudio/pulseaudio.SlackBuild
@@ -5,7 +5,7 @@
 # Written by crocket (crockabiscuit@gmail.com)
 
 PRGNAM=pulseaudio
-VERSION=1.1
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,7 +46,7 @@ elif ! grep -q ^pulse: /etc/passwd ; then
   exit 1
 fi
 
-set -e
+set -eu
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -61,6 +61,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if pkg-config --exists orc-0.4 ; then 
+  ORC=yes
+else
+  ORC=no
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -70,9 +76,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --disable-tcpwrap \
-  --enable-orc=${ORC:-"no"} \
+  --enable-orc=${ORC} \
   --disable-static \
-  --disable-hal --disable-hal-compat \
+  --disable-hal \
+  --enable-hal-compat \
   --disable-solaris \
   --disable-waveout \
   --with-system-user=pulse \
@@ -94,7 +101,7 @@ 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 *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 71b0335f3b..3b28895d9c 100644
--- a/audio/pulseaudio/pulseaudio.info
+++ b/audio/pulseaudio/pulseaudio.info
@@ -1,10 +1,10 @@
 PRGNAM="pulseaudio"
-VERSION="1.1"
+VERSION="2.0"
 HOMEPAGE="http://www.pulseaudio.org"
-DOWNLOAD="http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz"
+DOWNLOAD="http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.0.tar.xz"
+MD5SUM="9bbde657c353fe675c3b693054175a8e"
 DOWNLOAD_x86_64=""
-MD5SUM="17d21df798cee407b769c6355fae397a"
 MD5SUM_x86_64=""
-MAINTAINER="crocket"
-EMAIL="crockabiscuit@gmail.com"
-APPROVED="Erik Hanson"
+MAINTAINER="drhouse"
+EMAIL="housegregory299@gmail.com"
+APPROVED="rworkman"