From 4bc12e1b18759dda8f94ff0524b690f95d655713 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Wed, 22 Jan 2020 18:49:45 +0300
Subject: [PATCH] libffado 2.4.2

---
 hardware/firewire/libffado/actions.py         |  3 ++-
 .../files/libffado-2.4.2-python38.patch       | 24 +++++++++++++++++++
 hardware/firewire/libffado/pspec.xml          | 15 +++++++++---
 3 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 hardware/firewire/libffado/files/libffado-2.4.2-python38.patch

diff --git a/hardware/firewire/libffado/actions.py b/hardware/firewire/libffado/actions.py
index 17b19f1e39..fadb78da5a 100644
--- a/hardware/firewire/libffado/actions.py
+++ b/hardware/firewire/libffado/actions.py
@@ -14,7 +14,8 @@ shelltools.export("PYTHONDONTWRITEBYTECODE", "1")
 def build():
     scons.make('PREFIX=/usr \
                 COMPILE_FLAGS="%s %s -lpthread" \
-                BUILD_TESTS=0' % (get.CXXFLAGS(), get.LDFLAGS()))
+                BUILD_TESTS=0 \
+                PYTHON_INTERPRETER="/usr/bin/python3" ' % (get.CXXFLAGS(), get.LDFLAGS()))
 
 def install():
     scons.install("install WILL_DEAL_WITH_XDG_MYSELF=1 DESTDIR=%s" % get.installDIR())
diff --git a/hardware/firewire/libffado/files/libffado-2.4.2-python38.patch b/hardware/firewire/libffado/files/libffado-2.4.2-python38.patch
new file mode 100644
index 0000000000..d0ad2e956d
--- /dev/null
+++ b/hardware/firewire/libffado/files/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/hardware/firewire/libffado/pspec.xml b/hardware/firewire/libffado/pspec.xml
index f45f71b6f2..104f5a05dd 100644
--- a/hardware/firewire/libffado/pspec.xml
+++ b/hardware/firewire/libffado/pspec.xml
@@ -12,7 +12,7 @@
         <License>GPLv3</License>
         <Summary>Free firewire audio drivers</Summary>
         <Description>libffado tries to provide open-source drivers for all FireWire based pro-audio devices.</Description>
-        <Archive sha1sum="98983022cc088c28db6fb9420a5e313ee4d5cf6c" type="targz">http://www.ffado.org/files/libffado-2.4.0.tgz</Archive>
+        <Archive sha1sum="ae67b519358492afe705cdac4f70dd88d748271a" type="targz">http://www.ffado.org/files/libffado-2.4.2.tgz</Archive>
         <BuildDependencies>
             <Dependency>xdg-utils</Dependency>
             <Dependency>glibmm-devel</Dependency>
@@ -33,11 +33,12 @@
         </BuildDependencies>
         <Patches>
             <Patch level="1">flags.patch</Patch>
-            <Patch level="1">libffado-2.4.0-rme-bigendian-fix.patch</Patch>
+<!--            <Patch level="1">libffado-2.4.0-rme-bigendian-fix.patch</Patch>
             <Patch level="1">libffado-2.4.0-pyqt5-dbus-detection.patch</Patch>
             <Patch level="1">libffado-2.4.0-py3-pyqt5-fixes.patch</Patch>
             <Patch level="1">libffado-2.4.0-additional-py3-fixes.patch</Patch>
-            <Patch level="1">libffado-2.4.0-crossbar-router-fix.patch</Patch>
+            <Patch level="1">libffado-2.4.0-crossbar-router-fix.patch</Patch>-->
+			<Patch level="1">libffado-2.4.2-python38.patch</Patch>
         </Patches>
     </Source>
 
@@ -99,6 +100,7 @@
         <Files>
             <Path fileType="executable">/usr/bin/ffado-mixer*</Path>
             <Path fileType="data">/usr/share/applications</Path>
+			<Path fileType="data">/usr/share/metainfo/ffado-mixer.appdata.xml</Path>
             <Path fileType="data">/usr/share/pixmaps</Path>
         </Files>
         <AdditionalFiles>
@@ -107,6 +109,13 @@
     </Package>
 
     <History>
+		<Update release="6">
+            <Date>2020-01-22</Date>
+            <Version>2.4.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="5">
             <Date>2018-08-03</Date>
             <Version>2.4.0</Version>