[packages/libffado] - updated to 2.2.1 - added x32 fix from http://debian-x32.org/

[baggins]

commit affc08470c1e8d75fbd6304aafc488f9f05d94ed
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Mar 9 17:55:21 2015 +0100

    - updated to 2.2.1
    - added x32 fix from http://debian-x32.org/

 detect-x32.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 libffado.spec    |  7 +++++--
 2 files changed, 51 insertions(+), 2 deletions(-)
---
diff --git a/libffado.spec b/libffado.spec
index 544129e..18afccf 100644
--- a/libffado.spec
+++ b/libffado.spec
@@ -7,14 +7,15 @@
 Summary:	Free FireWire audio driver library
 Summary(pl.UTF-8):	Wolnodostępna biblioteka sterownika dźwięku FireWire
 Name:		libffado
-Version:	2.1.0
+Version:	2.2.1
 Release:	1
 License:	GPL v2 or GPL v3
 Group:		Libraries
 #Source0Download: http://www.ffado.org/?q=node/5
 Source0:	http://www.ffado.org/files/%{name}-%{version}.tgz
-# Source0-md5:	26bce2be0b9c1fa4e614f2f494edf388
+# Source0-md5:	e113d828835051f835fb4a329cb0cbd4
 Patch0:		%{name}-api-doc-only.patch
+Patch1:		detect-x32.patch
 URL:		http://www.ffado.org/
 BuildRequires:	alsa-lib-devel >= 0.9
 BuildRequires:	dbus-c++-devel
@@ -46,6 +47,7 @@ BuildRequires:	texlive-xetex
 %if %{with gui}
 BuildRequires:	desktop-file-utils
 BuildRequires:	python-PyQt4-devel-tools >= 4
+BuildRequires:	python-PyQt4-uic >= 4
 BuildRequires:	python-dbus-devel >= 0.82.0
 %endif
 Requires:	libavc1394 >= 0.5.3
@@ -121,6 +123,7 @@ Graficzny mikser dla FFADO.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__scons} \
diff --git a/detect-x32.patch b/detect-x32.patch
new file mode 100644
index 0000000..639b0dc
--- /dev/null
+++ b/detect-x32.patch
@@ -0,0 +1,46 @@
+Description: detect x32
+ This patch fixes misdetection of x32 as i386, and makes it pass -mx32 instead
+ of -m32 (what's the purpose of forcing this flag???).
+ .
+ Unlike detection of 32/64-bitness, it asks the configured compiler instead of
+ objdumping /bin/mount.  If somehow you prefer that way instead, the string
+ would be: "file format elf32-x86-64".
+Author: Adam Borowski <kilobyte at angband.pl>
+
+--- libffado-2.2.1.orig/SConstruct
++++ libffado-2.2.1/SConstruct
+@@ -659,6 +659,21 @@ def is_userspace_32bit(cpuinfo):
+     return answer
+ 
+ 
++def is_userspace_x32():
++    """Check if the chosen compiler targets x32.
++    """
++    # Doing this instead of bizarre checks for /bin/mounts, this works
++    # in multiarch/multilib or crosscompiling scenarios.
++    cc = os.getenv('CC')
++    if cc == None:
++        cc = 'cc'
++    x = outputof(cc, '-dumpmachine')
++    for line in x.split('\n'):
++        if line.endswith('x32'):
++            return True
++    return None
++
++
+ def cc_flags_x86(cpuinfo, enable_optimizations):
+     """add certain gcc -m flags based on CPU features
+     """
+@@ -758,7 +773,11 @@ if cpuinfo.is_powerpc:
+         machineflags = { 'CXXFLAGS' : ['-m64'] }
+     env.MergeFlags( machineflags )
+ elif cpuinfo.is_x86:
+-    if m32:
++    if is_userspace_x32():
++        print "Doing an x32 %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
++        machineflags = { 'CXXFLAGS' : ['-mx32'] }
++        needs_fPIC = True
++    elif m32:
+         print "Doing a 32-bit %s build for %s" % (cpuinfo.machine, cpuinfo.model_name)
+         machineflags = { 'CXXFLAGS' : ['-m32'] }
+     else:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libffado.git/commitdiff/affc08470c1e8d75fbd6304aafc488f9f05d94ed