From de40343a1db85e9c173db1c195923e0157d93cfe Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 14 Sep 2019 07:57:43 +0200
Subject: 20190914.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 libraries/libffado/libffado.SlackBuild | 23 ++++++++---------------
 libraries/libffado/libffado.info       |  8 ++++----
 2 files changed, 12 insertions(+), 19 deletions(-)

(limited to 'libraries/libffado')

diff --git a/libraries/libffado/libffado.SlackBuild b/libraries/libffado/libffado.SlackBuild
index f0bc67fb3b..ca8687e62b 100644
--- a/libraries/libffado/libffado.SlackBuild
+++ b/libraries/libffado/libffado.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libffado
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-2.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   TARGET="i386"
 elif [ "$ARCH" = "i686" ]; then
@@ -69,25 +69,18 @@ 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 {} \;
 
-# Use our CFLAGS
-sed -i "s/-O2 -DNDEBUG/$SLKCFLAGS -DNDEBUG/" SConstruct
-
-patch -p1 < $CWD/libffado-mixer.patch
-
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=gnu++11 -Wno-deprecated-declarations" \
 scons \
   PREFIX=/usr \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} \
   DIST_TARGET="$TARGET" \
-  COMPILE_FLAGS="$CFLAGS -std=gnu++11" \
+  CUSTOM_ENV="True" \
   DEBUG="False"
 
 scons \
-  --implicit-deps-unchanged \
-  PREFIX=/usr \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  DIST_TARGET="$TARGET" \
-  DEBUG="False" \
   DESTDIR=$PKG \
+  WILL_DEAL_WITH_XDG_MYSELF="True" \
   install
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
diff --git a/libraries/libffado/libffado.info b/libraries/libffado/libffado.info
index 04eee7ed85..9abbad539d 100644
--- a/libraries/libffado/libffado.info
+++ b/libraries/libffado/libffado.info
@@ -1,10 +1,10 @@
 PRGNAM="libffado"
-VERSION="2.2.1"
+VERSION="2.4.1"
 HOMEPAGE="http://www.ffado.org/"
-DOWNLOAD="http://www.ffado.org/files/libffado-2.2.1.tgz"
-MD5SUM="e113d828835051f835fb4a329cb0cbd4"
+DOWNLOAD="http://www.ffado.org/files/libffado-2.4.1.tgz"
+MD5SUM="58d42bae946a9a98d0c8e4efa56f99f5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libconfig libiec61883 libxml++"
+REQUIRES="libconfig libdbus-c++ libiec61883 libxml++"
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-- 
cgit v1.2.3