[packages/libffado] - updated to 2.3.0 - updated detect-x32 patch - removed obsolete c++ patch

[qboosh]

commit 8b68848edfe01a0e488f83bb955aa97a7a3e1a0e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Oct 6 18:25:46 2016 +0200

    - updated to 2.3.0
    - updated detect-x32 patch
    - removed obsolete c++ patch

 detect-x32.patch   | 32 ++++++++++++++++----------------
 libffado-c++.patch | 22 ----------------------
 libffado.spec      | 14 ++++++--------
 3 files changed, 22 insertions(+), 46 deletions(-)
---
diff --git a/libffado.spec b/libffado.spec
index c5d87a3..90f0d20 100644
--- a/libffado.spec
+++ b/libffado.spec
@@ -7,16 +7,15 @@
 Summary:	Free FireWire audio driver library
 Summary(pl.UTF-8):	Wolnodostępna biblioteka sterownika dźwięku FireWire
 Name:		libffado
-Version:	2.2.1
-Release:	5
+Version:	2.3.0
+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:	e113d828835051f835fb4a329cb0cbd4
+# Source0-md5:	8f452977267200cfaf9b8e16ba3c92df
 Patch0:		%{name}-api-doc-only.patch
 Patch1:		detect-x32.patch
-Patch2:		%{name}-c++.patch
 URL:		http://www.ffado.org/
 BuildRequires:	alsa-lib-devel >= 0.9
 BuildRequires:	dbus-c++-devel
@@ -32,7 +31,8 @@ BuildRequires:	libavc1394-devel >= 0.5.3
 BuildRequires:	libconfig-c++-devel
 BuildRequires:	libiec61883-devel >= 1.1.0
 BuildRequires:	libraw1394-devel >= 2.0.5
-BuildRequires:	libstdc++-devel >= 6:4.3
+# -std=gnu++11 for libxml++ 2.40+
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libxml++2-devel >= 2.13.0
 BuildRequires:	pkgconfig
 BuildRequires:	scons
@@ -128,12 +128,10 @@ Graficzny mikser dla FFADO.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-# libxml++ 2.40+ requires C++ 11
 %{__scons} \
-	COMPILE_FLAGS="%{rpmcxxflags} -std=gnu++0x" \
+	COMPILE_FLAGS="%{rpmcxxflags}" \
 	ENABLE_ALL=True \
 	PREFIX=%{_prefix} \
 	MANDIR=%{_mandir} \
diff --git a/detect-x32.patch b/detect-x32.patch
index 639b0dc..2762c37 100644
--- a/detect-x32.patch
+++ b/detect-x32.patch
@@ -7,9 +7,9 @@ Description: detect x32
  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):
+--- libffado-2.3.0/SConstruct.orig	2016-10-06 17:05:43.420336610 +0200
++++ libffado-2.3.0/SConstruct	2016-10-06 17:08:28.043668063 +0200
+@@ -709,6 +709,21 @@
      return answer
  
  
@@ -31,16 +31,16 @@ Author: Adam Borowski <kilobyte at angband.pl>
  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:
+@@ -809,7 +824,11 @@
+             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:
diff --git a/libffado-c++.patch b/libffado-c++.patch
deleted file mode 100644
index 80a661f..0000000
--- a/libffado-c++.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libffado-2.2.1/tests/test-enhanced-mixer.cpp.orig	2008-05-29 10:24:21.000000000 +0200
-+++ libffado-2.2.1/tests/test-enhanced-mixer.cpp	2016-02-16 18:02:11.361870351 +0100
-@@ -77,7 +77,7 @@
-         exit(0);
-     }
- 
--    int errno = 0;
-+    errno = 0;
-     char* tail;
-     int node_id = strtol( argv[1], &tail, 0 );
-     int fb_id   = strtol( argv[2], &tail, 0 );
---- libffado-2.2.1/tests/test-volume.cpp.orig	2008-05-05 23:29:40.000000000 +0200
-+++ libffado-2.2.1/tests/test-volume.cpp	2016-02-16 18:12:32.575177616 +0100
-@@ -127,7 +127,7 @@
-         exit(0);
-     }
- 
--    int errno = 0;
-+    errno = 0;
-     char* tail;
-     int node_id = strtol( argv[1], &tail, 0 );
-     int fb_id   = strtol( argv[2], &tail, 0 );
================================================================

---- gitweb:

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