From e3d32f2ff76e988aaf8209a6cd4fbfa5598377f4 Mon Sep 17 00:00:00 2001
From: Ryan P.C. McQuen
Date: Fri, 19 Dec 2014 20:58:22 -0800
Subject: audio/apulse: Fix build.

Signed-off-by: Ryan P.C. McQuen <ryan.q@linux.com>
---
 audio/apulse/apulse.SlackBuild | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'audio')

diff --git a/audio/apulse/apulse.SlackBuild b/audio/apulse/apulse.SlackBuild
index adf4fcb0e8..ed51c47f35 100644
--- a/audio/apulse/apulse.SlackBuild
+++ b/audio/apulse/apulse.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=apulse
 VERSION=${VERSION:-0.1.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 
@@ -68,7 +68,6 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-rm -fr $PRGNAM-master
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -78,28 +77,22 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ "$COMPAT32" = "no" ]; then
-  sed -i "s|lib/apulse|lib${LIBDIRSUFFIX}/apulse|" CMakeLists.txt
+if [ "$COMPAT32" = "yes" ]; then
+  mkdir -pv build-m32
+  cd build-m32
+  CFLAGS=-m32 \
+  cmake -DAPULSEPATH=/usr/lib -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install DESTDIR=$PKG
+  cd ..
 fi
-
 mkdir -pv build
 cd build
-  if [ "$COMPAT32" = "yes" ]; then
-    CFLAGS=-m32 \
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
-  else
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
-  fi
+  cmake -DAPULSEPATH=/usr/lib${LIBDIRSUFFIX} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
   make install DESTDIR=$PKG
 cd ..
 
-if [ "$COMPAT32" = "yes" ]; then
-  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/apulse/
-  cp $PKG/usr/lib/apulse/* $PKG/usr/lib${LIBDIRSUFFIX}/apulse/
-fi
-
-
 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
 
-- 
cgit v1.2.3