[SCM] beast/master: Cherry-pick GCC-4.7 fixes.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit eb261897d8d7dfa0b08797673420cd1b884a9738
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 5 11:25:24 2012 +0000

    Cherry-pick GCC-4.7 fixes.

diff --git a/debian/patches/500-gcc47.patch b/debian/patches/500-gcc47.patch
index e6a2f4a..393dcb4 100644
--- a/debian/patches/500-gcc47.patch
+++ b/debian/patches/500-gcc47.patch
@@ -1,12 +1,16 @@
 Description: Fix #includes to avoid FTBFS with GCC 4.7.
+ Applied upstream, commits:
+  - 71ac19f78569f287f7e6db0147b6627a4d4acb0d
+  - c17259d4b29dbc47a9657f172322d4d908fcd4cf
 Author: Alessio Treglia <alessio at debian.org>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672030
-Forwarded: no
 ---
  birnet/birnetutils.cc   |    1 +
  birnet/tests/threads.cc |    1 +
  sfi/sfidl-parser.hh     |    2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
+ tools/bsewavetool.hh    |    1 +
+ tools/bwtwave.cc        |    1 +
+ 5 files changed, 5 insertions(+), 1 deletion(-)
 
 --- beast.orig/birnet/birnetutils.cc
 +++ beast/birnet/birnetutils.cc
@@ -39,3 +43,23 @@ Forwarded: no
      if (i != this->end())
        return i->second;
      else
+--- beast.orig/tools/bsewavetool.hh
++++ beast/tools/bsewavetool.hh
+@@ -18,6 +18,7 @@
+ #include <bse/gslwavechunk.h>
+ #include "bseloopfuncs.h"
+ #include "bwtwave.hh"
++#include <unistd.h>
+ #include <typeinfo>
+ #include <string>
+ 
+--- beast.orig/tools/bwtwave.cc
++++ beast/tools/bwtwave.cc
+@@ -21,6 +21,7 @@
+ #include <bse/bseloader.h>
+ #include <bse/bsecxxutils.hh>
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <stdio.h>

-- 
beast packaging