Bug#667245: libffado: ftbfs with GCC-4.7

[Matthias Klose]

tags 667245 + patch
thanks

-------------- next part --------------
diff -Nru libffado-2.0.99+svn2019/debian/changelog libffado-2.0.99+svn2019/debian/changelog
--- libffado-2.0.99+svn2019/debian/changelog	2012-01-19 19:06:46.000000000 +0100
+++ libffado-2.0.99+svn2019/debian/changelog	2012-04-16 21:28:23.000000000 +0200
@@ -1,3 +1,10 @@
+libffado (2.0.99+svn2019-1.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7. Closes: #667245.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 16 Apr 2012 21:27:43 +0200
+
 libffado (2.0.99+svn2019-1) unstable; urgency=low
 
   * Imported Upstream version 2.0.99+svn2019
diff -Nru libffado-2.0.99+svn2019/debian/patches/fix-ftbfs-gcc4.7.diff libffado-2.0.99+svn2019/debian/patches/fix-ftbfs-gcc4.7.diff
--- libffado-2.0.99+svn2019/debian/patches/fix-ftbfs-gcc4.7.diff	1970-01-01 01:00:00.000000000 +0100
+++ libffado-2.0.99+svn2019/debian/patches/fix-ftbfs-gcc4.7.diff	2012-04-16 21:42:24.000000000 +0200
@@ -0,0 +1,99 @@
+Index: libffado-2.0.99+svn2019/tests/test-dice-eap.cpp
+===================================================================
+--- libffado-2.0.99+svn2019.orig/tests/test-dice-eap.cpp	2012-01-11 08:54:59.000000000 +0000
++++ libffado-2.0.99+svn2019/tests/test-dice-eap.cpp	2012-04-16 19:27:37.868892965 +0000
+@@ -22,6 +22,7 @@
+  *
+  */
+ 
++#include <unistd.h>
+ #include <libraw1394/raw1394.h>
+ #include <libiec61883/iec61883.h>
+ 
+Index: libffado-2.0.99+svn2019/tests/test-messagequeue.cpp
+===================================================================
+--- libffado-2.0.99+svn2019.orig/tests/test-messagequeue.cpp	2012-01-11 08:54:59.000000000 +0000
++++ libffado-2.0.99+svn2019/tests/test-messagequeue.cpp	2012-04-16 19:33:26.240884341 +0000
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <iostream>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ #include <semaphore.h>
+ #include <cstring>
+Index: libffado-2.0.99+svn2019/tests/test-fw410.cpp
+===================================================================
+--- libffado-2.0.99+svn2019.orig/tests/test-fw410.cpp	2012-01-11 08:54:59.000000000 +0000
++++ libffado-2.0.99+svn2019/tests/test-fw410.cpp	2012-04-16 19:34:55.804882124 +0000
+@@ -26,6 +26,7 @@
+ 
+ #include <argp.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <iostream>
+ 
+ using namespace std;
+Index: libffado-2.0.99+svn2019/tests/test-ieee1394service.cpp
+===================================================================
+--- libffado-2.0.99+svn2019.orig/tests/test-ieee1394service.cpp	2012-01-11 08:54:59.000000000 +0000
++++ libffado-2.0.99+svn2019/tests/test-ieee1394service.cpp	2012-04-16 19:35:07.504881834 +0000
+@@ -27,6 +27,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <string.h>
+ #include <endian.h>
+ 
+Index: libffado-2.0.99+svn2019/tests/test-ipcringbuffer.cpp
+===================================================================
+--- libffado-2.0.99+svn2019.orig/tests/test-ipcringbuffer.cpp	2012-01-11 08:54:59.000000000 +0000
++++ libffado-2.0.99+svn2019/tests/test-ipcringbuffer.cpp	2012-04-16 19:35:41.600880990 +0000
+@@ -28,6 +28,7 @@
+ 
+ #include <argp.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <iostream>
+ #include <signal.h>
+ 
+Index: libffado-2.0.99+svn2019/tests/test-scs.cpp
+===================================================================
+--- libffado-2.0.99+svn2019.orig/tests/test-scs.cpp	2012-01-11 08:54:59.000000000 +0000
++++ libffado-2.0.99+svn2019/tests/test-scs.cpp	2012-04-16 19:37:36.768878139 +0000
+@@ -477,8 +477,8 @@
+         }
+         #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");
+Index: libffado-2.0.99+svn2019/tests/test-shm.cpp
+===================================================================
+--- libffado-2.0.99+svn2019.orig/tests/test-shm.cpp	2012-01-11 08:54:59.000000000 +0000
++++ libffado-2.0.99+svn2019/tests/test-shm.cpp	2012-04-16 19:38:08.368877355 +0000
+@@ -27,6 +27,7 @@
+ 
+ #include <argp.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <iostream>
+ #include <signal.h>
+ 
+Index: libffado-2.0.99+svn2019/tests/test-streamdump.cpp
+===================================================================
+--- libffado-2.0.99+svn2019.orig/tests/test-streamdump.cpp	2012-01-11 08:54:59.000000000 +0000
++++ libffado-2.0.99+svn2019/tests/test-streamdump.cpp	2012-04-16 19:38:35.768876678 +0000
+@@ -27,6 +27,7 @@
+ 
+ #include <argp.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <iostream>
+ 
+ using namespace std;
diff -Nru libffado-2.0.99+svn2019/debian/patches/series libffado-2.0.99+svn2019/debian/patches/series
--- libffado-2.0.99+svn2019/debian/patches/series	2012-01-19 19:04:42.000000000 +0100
+++ libffado-2.0.99+svn2019/debian/patches/series	2012-04-16 21:27:07.000000000 +0200
@@ -1 +1,2 @@
 exitcrash.patch
+fix-ftbfs-gcc4.7.diff