[SCM] ffado/master: Refresh x32.patch

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 10a8f4edcddd36c3aa12a63cfba193cd44a64e64
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Aug 11 15:39:25 2016 +0200

    Refresh x32.patch
    
    This needs to be forwarded upstream. Will do.

diff --git a/debian/patches/x32.patch b/debian/patches/x32.patch
index ce051f1..89d22ca 100644
--- a/debian/patches/x32.patch
+++ b/debian/patches/x32.patch
@@ -6,17 +6,19 @@ Author: Thorsten Glaser <t.glaser at tarent.de>
  SConstruct |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
---- ffado.orig/SConstruct
-+++ ffado/SConstruct
-@@ -760,7 +760,10 @@ if cpuinfo.is_powerpc:
- elif cpuinfo.is_x86:
-     if m32:
-         print "Doing a 32-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
--        machineflags = { 'CXXFLAGS' : ['-m32'] }
-+        if cpuinfo.machine == 'x86_64':
-+            machineflags = { 'CXXFLAGS' : ['-mx32'] }
-+        else:
-+            machineflags = { 'CXXFLAGS' : ['-m32'] }
-     else:
-         print "Doing a 64-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
-         machineflags = { 'CXXFLAGS' : ['-m64'] }
+Index: libffado/SConstruct
+===================================================================
+--- libffado.orig/SConstruct
++++ libffado/SConstruct
+@@ -811,7 +811,10 @@ if env['DETECT_USERSPACE_ENV']:
+     elif cpuinfo.is_x86:
+         if m32:
+             print "Doing a 32-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
+-            machineflags = { 'CXXFLAGS' : ['-m32'] }
++            if cpuinfo.machine == 'x86_64':
++                machineflags = { 'CXXFLAGS' : ['-mx32'] }
++            else:
++                machineflags = { 'CXXFLAGS' : ['-m32'] }
+         else:
+             print "Doing a 64-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
+             machineflags = { 'CXXFLAGS' : ['-m64'] }

-- 
Free Firewire Audio Drivers (ffado.org) packaging