audio/exhale: Updated for version 1.1.1, cmake changes, gcc flags.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

2 files changed, 23 insertions, 22 deletions

diff --git a/audio/exhale/exhale.SlackBuild b/audio/exhale/exhale.SlackBuild
index 7b69e069b804e..fa74a977bff43 100644
--- a/audio/exhale/exhale.SlackBuild
+++ b/audio/exhale/exhale.SlackBuild
@@ -2,7 +2,7 @@
 # ----------------------------------------------------------------------
 # Slackware build script for exhale
 #
-# Copyright (c) 2020 Andrew Strong, Blue Mountains, Australia.
+# Copyright (c) 2020 - 2021 Andrew Strong, Blue Mountains, Australia.
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -24,7 +24,7 @@
 # ----------------------------------------------------------------------
 
 PRGNAM=exhale
-VERSION=${VERSION:-1.0.7}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,26 +41,22 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# SLKCFLAGS and LIBDIRSUFFIX are not used but remain in place for possible
-# future use as exhale's installation routine matures. 'BUILD32=1' will
-# build a 32bit exhale while 'BUILD32=0' will build a 64bit exhale:
+# The compiler flag '-std=c++11' is required for a succesful compile
+# under Slackware 14.2 and gcc 5.3.0. This flag is not required for
+# versions of Slackware > 14.2.
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=c++11"
   LIBDIRSUFFIX=""
-  BUILDTARGET="BUILD32=1"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11"
   LIBDIRSUFFIX=""
-  BUILDTARGET="BUILD32=1"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -std=c++11"
   LIBDIRSUFFIX="64"
-  BUILDTARGET="BUILD32=0"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -std=c++11"
   LIBDIRSUFFIX=""
-  BUILDTARGET="BUILD32=0"
 fi
 
 set -e 
@@ -79,12 +75,17 @@ 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 {} \;
 
-# I will switch to the newer cmake build system and also install the newer
-# shared library when support for exhale is added to FFmpeg and / or any
-# other major Linux application. But for the moment:
-
-make $BUILDTARGET release
-install -D -s -m 0755 bin/exhale $PKG/usr/bin/exhale
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.md include/{License.htm,Release.htm,styles.css} $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/audio/exhale/exhale.info b/audio/exhale/exhale.info
index 139267bd8496a..1c4fee3cc535a 100644
--- a/audio/exhale/exhale.info
+++ b/audio/exhale/exhale.info
@@ -1,8 +1,8 @@
 PRGNAM="exhale"
-VERSION="1.0.7"
+VERSION="1.1.1"
 HOMEPAGE="https://gitlab.com/ecodis/exhale"
-DOWNLOAD="https://gitlab.com/ecodis/exhale/-/archive/v1.0.7/exhale-v1.0.7.tar.gz"
-MD5SUM="92b9e2a8401f1b5c9cb0bac994a9167d"
+DOWNLOAD="https://gitlab.com/ecodis/exhale/-/archive/v1.1.1/exhale-v1.1.1.tar.gz"
+MD5SUM="432130dfbcd6b219268b235973dcca83"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""