3 files changed, 25 insertions, 53 deletions
diff --git a/libraries/OpenAL/OpenAL.SlackBuild b/libraries/OpenAL/OpenAL.SlackBuild
index bd9f43cc59..a7eea27caf 100644
--- a/libraries/OpenAL/OpenAL.SlackBuild
+++ b/libraries/OpenAL/OpenAL.SlackBuild
@@ -1,15 +1,16 @@
 #!/bin/sh
 
-# Slackware build script for OpenAL
+# Slackware build script for OpenAL Soft
 # Written by Erik Hanson erik@slackbuilds.org
 # Modified by the SlackBuilds.org project
 
 PRGNAM=OpenAL
-SRCNAM=openal
-VERSION=0.0.8
+SRCNAM=openal-soft
+VERSION=1.7.411
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -17,43 +18,36 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar -zxvf $CWD/$SRCNAM-$VERSION.tar.gz || exit 1
-cd openal-$VERSION || exit 1
-
-# Fix when compiling other things against OpenAL using GCC 4.2.
-# Begotten from debian.
-patch -p1 < $CWD/fix_gcc-4.2.diff || exit 1
-
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+cd $SRCNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var/lib || exit 1
-
-make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+cmake \
+  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}
 
-# This package has no man pages or info pages
+make
+make install/strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS NOTES README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuilld
 
 mkdir -p $PKG/install
diff --git a/libraries/OpenAL/OpenAL.info b/libraries/OpenAL/OpenAL.info
index 28afeabbc5..ba983a3a5a 100644
--- a/libraries/OpenAL/OpenAL.info
+++ b/libraries/OpenAL/OpenAL.info
@@ -1,8 +1,8 @@
 PRGNAM="OpenAL"
-VERSION="0.0.8"
-HOMEPAGE="http://www.openal.org/"
-DOWNLOAD="http://stuff.mit.edu/afs/sipb/project/ghc/src/tarfiles/openal-0.0.8.tar.gz"
-MD5SUM="641cf53761f35ee979f3e888614797a0"
+VERSION="1.7.411"
+HOMEPAGE="http://kcat.strangesoft.net/openal.html"
+DOWNLOAD="http://kcat.strangesoft.net/openal-releases/openal-soft-1.7.411.tar.bz2"
+MD5SUM="e8a14e6e0591b943c078c0616da0d413"
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="rworkman"
diff --git a/libraries/OpenAL/fix_gcc-4.2.diff b/libraries/OpenAL/fix_gcc-4.2.diff
deleted file mode 100644
index ecc629b50b..0000000000
--- a/libraries/OpenAL/fix_gcc-4.2.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: openal-0.0.8/common/include/AL/alc.h
-===================================================================
---- openal-0.0.8.orig/common/include/AL/alc.h	2007-06-28 15:56:06.000000000 +0000
-+++ openal-0.0.8/common/include/AL/alc.h	2007-06-28 16:03:26.000000000 +0000
-@@ -187,7 +187,7 @@
- 
- ALC_API void            ALC_APIENTRY alcDestroyContext( ALCcontext *context );
- 
--ALC_API ALCcontext *    ALC_APIENTRY alcGetCurrentContext( ALCvoid );
-+ALC_API ALCcontext *    ALC_APIENTRY alcGetCurrentContext( void );
- 
- ALC_API ALCdevice*      ALC_APIENTRY alcGetContextsDevice( ALCcontext *context );
- 
-@@ -248,7 +248,7 @@
- typedef void           (ALC_APIENTRY *LPALCPROCESSCONTEXT)( ALCcontext *context );
- typedef void           (ALC_APIENTRY *LPALCSUSPENDCONTEXT)( ALCcontext *context );
- typedef void           (ALC_APIENTRY *LPALCDESTROYCONTEXT)( ALCcontext *context );
--typedef ALCcontext *   (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( ALCvoid );
-+typedef ALCcontext *   (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( void );
- typedef ALCdevice *    (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)( ALCcontext *context );
- typedef ALCdevice *    (ALC_APIENTRY *LPALCOPENDEVICE)( const ALCchar *devicename );
- typedef ALCboolean     (ALC_APIENTRY *LPALCCLOSEDEVICE)( ALCdevice *device );