[SCM] ffado/master: Fix build failure with GCC 4.7

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e374fa0ec78bd2f5b3383fce9f14fad965593749
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 17 00:08:19 2012 +0200

    Fix build failure with GCC 4.7
    
    Closes: #667245
    Thanks: Matthias Klose for the report and patch.
    Forwarded: http://subversion.ffado.org/ticket/351

diff --git a/debian/patches/fix-ftbfs-gcc4.7.diff b/debian/patches/fix-ftbfs-gcc4.7.diff
new file mode 100644
index 0000000..9a8d460
--- /dev/null
+++ b/debian/patches/fix-ftbfs-gcc4.7.diff
@@ -0,0 +1,98 @@
+Description: Fix build failure with GCC 4.7
+Debian-Bug: http://bugs.debian.org/667245.
+Author: Matthias Klose <doko at debian.org>
+Forwarded: http://subversion.ffado.org/ticket/351
+---
+ tests/test-dice-eap.cpp        |    1 +
+ tests/test-fw410.cpp           |    1 +
+ tests/test-ieee1394service.cpp |    1 +
+ tests/test-ipcringbuffer.cpp   |    1 +
+ tests/test-messagequeue.cpp    |    1 +
+ tests/test-scs.cpp             |    4 ++--
+ tests/test-shm.cpp             |    1 +
+ tests/test-streamdump.cpp      |    1 +
+ 8 files changed, 9 insertions(+), 2 deletions(-)
+
+--- ffado.orig/tests/test-dice-eap.cpp
++++ ffado/tests/test-dice-eap.cpp
+@@ -22,6 +22,7 @@
+  *
+  */
+ 
++#include <unistd.h>
+ #include <libraw1394/raw1394.h>
+ #include <libiec61883/iec61883.h>
+ 
+--- ffado.orig/tests/test-messagequeue.cpp
++++ ffado/tests/test-messagequeue.cpp
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <iostream>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ #include <semaphore.h>
+ #include <cstring>
+--- ffado.orig/tests/test-fw410.cpp
++++ ffado/tests/test-fw410.cpp
+@@ -26,6 +26,7 @@
+ 
+ #include <argp.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <iostream>
+ 
+ using namespace std;
+--- ffado.orig/tests/test-ieee1394service.cpp
++++ ffado/tests/test-ieee1394service.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <string.h>
+ #include <endian.h>
+ 
+--- ffado.orig/tests/test-ipcringbuffer.cpp
++++ ffado/tests/test-ipcringbuffer.cpp
+@@ -28,6 +28,7 @@
+ 
+ #include <argp.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <iostream>
+ #include <signal.h>
+ 
+--- ffado.orig/tests/test-scs.cpp
++++ ffado/tests/test-scs.cpp
+@@ -477,8 +477,8 @@ main(int argc, char **argv)
+         }
+         #endif
+ 
+-        BridgeMapIterator it = seqport2bridgemap.find(portNumber);
+-        if(it == seqport2bridgemap.end()) {
++        BridgeMapIterator it2 = seqport2bridgemap.find(portNumber);
++        if(it2 == seqport2bridgemap.end()) {
+             seqport2bridgemap[portNumber] = bridge;
+         } else {
+             debugError("BUG: port already present in bridge map, duplicate port.\n");
+--- ffado.orig/tests/test-shm.cpp
++++ ffado/tests/test-shm.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include <argp.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <iostream>
+ #include <signal.h>
+ 
+--- ffado.orig/tests/test-streamdump.cpp
++++ ffado/tests/test-streamdump.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include <argp.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <iostream>
+ 
+ using namespace std;
diff --git a/debian/patches/series b/debian/patches/series
index 9a7c2f7..8de4f3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 exitcrash.patch
+fix-ftbfs-gcc4.7.diff

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