Blob Blame History Raw
diff -rupN libffado-2.4.1.org/SConstruct libffado-2.4.1/SConstruct
--- libffado-2.4.1.org/SConstruct	2018-03-04 01:13:17.000000000 -0500
+++ libffado-2.4.1/SConstruct	2019-09-18 19:38:12.105388609 -0400
@@ -719,8 +719,8 @@ def is_userspace_32bit(cpuinfo):
         # /bin/mount:     file format elf64-x86-64
         # or like this:
         # /bin/mount:     file format elf32-powerpc
-        for line in x.split(b'\n'):
-            line = line.strip().decode()
+        for line in x.split('\n'):
+            line = line.strip()
             if line.startswith(real_exe):
                 x, fmt = line.rsplit(None, 1)
                 answer = 'elf32' in fmt
diff -rupN libffado-2.4.1.org/support/mixer-qt4/SConscript libffado-2.4.1/support/mixer-qt4/SConscript
--- libffado-2.4.1.org/support/mixer-qt4/SConscript	2015-04-12 07:18:15.000000000 -0400
+++ libffado-2.4.1/support/mixer-qt4/SConscript	2019-09-18 19:37:50.112436538 -0400
@@ -29,16 +29,13 @@ Import( 'env' )
 if env['BUILD_MIXER'] == 'true':
     e = env.Clone()
 
-    def findfiles( arg, dirname, names ):
-        for name in names:
+    pythonfiles = [ 'ffado/config.py' ]
+    for dirpath, dirnames, files in os.walk( "ffado"):
+        for name in files:
             if name.startswith("."):
-                names.remove(name)
-        for name in names:
+                continue
             if '.pyc' not in name and '.in' not in name:
-                arg.append( os.path.join( dirname, name ) )
-
-    pythonfiles = [ 'ffado/config.py' ]
-    os.path.walk( "ffado", findfiles, pythonfiles )
+                pythonfiles.append(os.path.join(dirpath, name))
 
     e.ScanReplace( "ffado/config.py.in" )
     e.Depends( "ffado/config.py", "#/SConstruct" )