4 files changed, 37 insertions, 63 deletions
diff --git a/libraries/libffado/libffado-2.4.2-python38.patch b/libraries/libffado/libffado-2.4.2-python38.patch
new file mode 100644
index 0000000000..d0ad2e956d
--- /dev/null
+++ b/libraries/libffado/libffado-2.4.2-python38.patch
@@ -0,0 +1,24 @@
+diff -ruN a/support/mixer-qt4/ffado/configuration.py b/support/mixer-qt4/ffado/configuration.py
+--- a/support/mixer-qt4/ffado/configuration.py	2017-03-28 13:38:34.000000000 +0200
++++ b/support/mixer-qt4/ffado/configuration.py	2019-11-24 20:55:05.284341627 +0100
+@@ -20,7 +20,8 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
+-import re, os
++import os
++import dbus
+ 
+ import shlex
+ 
+@@ -53,6 +54,10 @@
+                 self.addDevice( dev )
+ 
+     def getDeviceById( self, vendor, model ):
++        if isinstance(vendor, dbus.Int32):
++            vendor = str(int(vendor))
++        if isinstance(model, dbus.Int32):
++            model = str(int(model))
+         log.debug("DeviceList::getDeviceById( %s, %s )" % (vendor, model ))
+         for dev in self.devices:
+             if int("%s" % dev['vendorid'], 0) == int("%s" % vendor, 0) and \
diff --git a/libraries/libffado/libffado-mixer.patch b/libraries/libffado/libffado-mixer.patch
deleted file mode 100644
index 30ab57ce1d..0000000000
--- a/libraries/libffado/libffado-mixer.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/tests/test-enhanced-mixer.cpp
-+++ b/tests/test-enhanced-mixer.cpp
-@@ -77,7 +77,7 @@
-         exit(0);
-     }
- 
--    int errno = 0;
-+    extern int errno;
-     char* tail;
-     int node_id = strtol( argv[1], &tail, 0 );
-     int fb_id   = strtol( argv[2], &tail, 0 );
---- a/tests/test-mixer.cpp
-+++ b/tests/test-mixer.cpp
-@@ -227,7 +227,7 @@
-         exit(0);
-     }
- 
--    int errno = 0;
-+    extern int errno;
-     char* tail;
-     int port = strtol( argv[1], &tail, 0 );
-     int node_id = strtol( argv[2], &tail, 0 );
---- a/tests/test-pan.cpp
-+++ b/tests/test-pan.cpp
-@@ -131,7 +131,7 @@
-         exit(0);
-     }
- 
--    int errno = 0;
-+    extern int errno;
-     char* tail;
-     int node_id = strtol( argv[1], &tail, 0 );
-     int fb_id   = strtol( argv[2], &tail, 0 );
---- a/tests/test-volume.cpp
-+++ b/tests/test-volume.cpp
-@@ -127,7 +127,7 @@
-         exit(0);
-     }
- 
--    int errno = 0;
-+    extern int errno;
-     char* tail;
-     int node_id = strtol( argv[1], &tail, 0 );
-     int fb_id   = strtol( argv[2], &tail, 0 );
-
diff --git a/libraries/libffado/libffado.SlackBuild b/libraries/libffado/libffado.SlackBuild
index f0bc67fb3b..3bdea71f19 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.2}
 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,20 @@ 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
+patch -p1 < $CWD/libffado-2.4.2-python38.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..69c2e4e9cb 100644
--- a/libraries/libffado/libffado.info
+++ b/libraries/libffado/libffado.info
@@ -1,10 +1,10 @@
 PRGNAM="libffado"
-VERSION="2.2.1"
+VERSION="2.4.2"
 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.2.tgz"
+MD5SUM="2b7eddffeaac68cdd145928a6cb62540"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libconfig libiec61883 libxml++"
+REQUIRES="libconfig libdbus-c++ libiec61883 libxml++"
 MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"