3 files changed, 31 insertions, 29 deletions
diff --git a/audio/apulse/README b/audio/apulse/README
index d6ec81f97a..f8510b081e 100644
--- a/audio/apulse/README
+++ b/audio/apulse/README
@@ -14,25 +14,17 @@ to bypass this, run:
 
     # COMPAT32=no sh apulse.SlackBuild
 
-The multilib version will create two binaries,
-apulse (64-bit) and apulse32 (32-bit), unless 
-you choose to install the libraries globally.
-
 The default is for libraries to be installed in:
 
     /usr/lib${LIBDIRSUFFIX}/apulse
 
 To override this setting and install the libraries 
-directly into the /usr/lib*/ directories, run:
+directly into the /usr/lib${LIBDIRSUFFIX}/ directories, run:
 
     GLOBAL_LIBS=yes sh apulse.SlackBuild
 
-The advantage of this, is the ability for pulseaudio 
-emulation in several applications beyond those 
-originally intended by the apulse project, such 
-as games from gog.com. The disadvantage of this 
+This may increase pulseaudio compatibility with 
+some applications. The disadvantage of this 
 'global' build type, is that some programs (such as 
 Google Chrome) will believe you have pulseaudio 
 installed and may not have sound.
-
-
diff --git a/audio/apulse/apulse.SlackBuild b/audio/apulse/apulse.SlackBuild
index 4f53eb3766..fecd4022a5 100644
--- a/audio/apulse/apulse.SlackBuild
+++ b/audio/apulse/apulse.SlackBuild
@@ -23,10 +23,13 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=apulse
-VERSION=${VERSION:-0.1.5}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-20150103}
+SRCVERSION=${SRCVERSION:-aa73e4ecf972537649438e2076e10a40cc965bda}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+DOCS="LICENSE.MIT README.md"
+
 ## build with GLOBAL_LIBS=yes
 ## to install pulse libraries 
 ## directly in lib* directories
@@ -76,13 +79,13 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-if [ -e $CWD/v$VERSION.tar.gz ]; then
-  tar xvf $CWD/v$VERSION.tar.gz
+rm -rf $PRGNAM-$SRCVERSION
+if [ -e $CWD/$SRCVERSION.tar.gz ]; then
+  tar xvf $CWD/$SRCVERSION.tar.gz
 else
-  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+  tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
 fi
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -94,26 +97,33 @@ if [ "$COMPAT32" = "yes" ]; then
   mkdir -pv build-m32
   cd build-m32
   CFLAGS=-m32 \
-  cmake -DAPULSEPATH=/usr/lib${APULSELIBPATHSUFFIX} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+  cmake \
+    -DAPULSEPATH=/usr/lib${APULSELIBPATHSUFFIX} \
+    -DAPULSE_SEARCH_PATHS=/usr/lib${APULSELIBPATHSUFFIX}:/usr/lib${LIBDIRSUFFIX}${APULSELIBPATHSUFFIX} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
   make VERBOSE=1
   make install DESTDIR=$PKG
-  if [ "$GLOBAL_LIBS" = no ]; then
-    mv $PKG/usr/bin/${PRGNAM} $PKG/usr/bin/${PRGNAM}32
-  fi
   cd ..
 fi
 mkdir -pv build
 cd build
-  cmake -DAPULSEPATH=/usr/lib${LIBDIRSUFFIX}${APULSELIBPATHSUFFIX} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
-  make VERBOSE=1
-  make install DESTDIR=$PKG
+cmake \
+  -DAPULSEPATH=/usr/lib${LIBDIRSUFFIX}${APULSELIBPATHSUFFIX} \
+  -DAPULSE_SEARCH_PATHS=/usr/lib${APULSELIBPATHSUFFIX}:/usr/lib${LIBDIRSUFFIX}${APULSELIBPATHSUFFIX} \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_BUILD_TYPE=Release \
+  ..
+make VERBOSE=1
+make install DESTDIR=$PKG
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
-cp -a LICENSE.MIT README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/apulse/apulse.info b/audio/apulse/apulse.info
index 83b1db1688..69199655e8 100644
--- a/audio/apulse/apulse.info
+++ b/audio/apulse/apulse.info
@@ -1,8 +1,8 @@
 PRGNAM="apulse"
-VERSION="0.1.5"
+VERSION="20150103"
 HOMEPAGE="https://github.com/i-rinat/apulse"
-DOWNLOAD="https://github.com/i-rinat/apulse/archive/v0.1.5.tar.gz"
-MD5SUM="48cd971011f2c9d864cf3dad24803c32"
+DOWNLOAD="https://github.com/i-rinat/apulse/archive/aa73e4ecf972537649438e2076e10a40cc965bda.tar.gz"
+MD5SUM="a6ac21cc73272a9374c6bda728195b14"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""