[SCM] beast/master: Refresh
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Fri May 6 15:18:02 UTC 2011
The following commit has been merged in the master branch:
commit 5be02b379b40310f81c5934a212b5e7279c7ef28
Author: Alessio Treglia <alessio at debian.org>
Date: Fri May 6 17:15:17 2011 +0200
Refresh
diff --git a/debian/patches/212_gcc44.diff b/debian/patches/212_gcc44.diff
index b8f9063..736879c 100644
--- a/debian/patches/212_gcc44.diff
+++ b/debian/patches/212_gcc44.diff
@@ -1,17 +1,12 @@
-Index: birnet/birnetmsg.cc
-===================================================================
---- birnet/birnetmsg.cc.orig
-+++ birnet/birnetmsg.cc
-@@ -22,6 +22,7 @@
- #include <syslog.h>
- #include <errno.h>
- #include <cstring>
-+#include <cstdio>
-
- #ifndef _ // FIXME
- #define _(x) (x)
-Index: birnet/birnetutils.hh
-===================================================================
+---
+ birnet/birnetutils.hh | 1 +
+ bse/tests/filtertest.cc | 1 +
+ tests/bse/cxxbinding.cc | 1 +
+ tests/latency/bselatencytest.cc | 1 +
+ tests/perftest.cc | 1 +
+ tools/bwtwave.cc | 1 +
+ 6 files changed, 6 insertions(+)
+
--- birnet/birnetutils.hh.orig
+++ birnet/birnetutils.hh
@@ -23,6 +23,7 @@
@@ -19,74 +14,22 @@ Index: birnet/birnetutils.hh
#include <vector>
#include <map>
+#include <cstdarg>
+ #include <stdarg.h>
namespace Birnet {
-
-Index: birnet/birnetutils.cc
-===================================================================
---- birnet/birnetutils.cc.orig
-+++ birnet/birnetutils.cc
-@@ -32,6 +32,7 @@
- #include <cxxabi.h>
- #include <signal.h>
- #include <cstring>
-+#include <cstdio>
-
- #ifndef _
- #define _(s) s
-Index: birnet/tests/strings.cc
-===================================================================
---- birnet/tests/strings.cc.orig
-+++ birnet/tests/strings.cc
-@@ -19,6 +19,7 @@
- //#define TEST_VERBOSE
- #include <birnet/birnettests.h>
- #include <cstdlib>
-+#include <cstdio>
- using namespace Birnet;
-
- namespace {
-Index: bse/bseresamplerimpl.hh
-===================================================================
---- bse/bseresamplerimpl.hh.orig
-+++ bse/bseresamplerimpl.hh
-@@ -25,6 +25,7 @@
- #include <math.h>
- #include <cstring>
- #include <cstdlib>
-+#include <cstdio>
- #ifdef __SSE__
- #include <xmmintrin.h>
- #endif
-Index: bse/tests/filtertest.cc
-===================================================================
--- bse/tests/filtertest.cc.orig
+++ bse/tests/filtertest.cc
@@ -27,6 +27,7 @@
- #include <math.h>
+ #include <stdio.h>
#include <complex>
#include <cstdlib>
+#include <cstdio>
typedef std::complex<double> Complex;
using namespace Birnet;
-Index: tests/bse/filtertest.cc
-===================================================================
---- tests/bse/filtertest.cc.orig
-+++ tests/bse/filtertest.cc
-@@ -29,6 +29,7 @@
- #include "topconfig.h"
- #include <errno.h>
- #include <cstdlib>
-+#include <cstdio>
-
- using std::string;
- using std::vector;
-Index: tools/bwtwave.cc
-===================================================================
--- tools/bwtwave.cc.orig
+++ tools/bwtwave.cc
-@@ -28,6 +28,7 @@
+@@ -27,6 +27,7 @@
#include <algorithm>
#include <vector>
#include <map>
@@ -94,39 +37,33 @@ Index: tools/bwtwave.cc
namespace BseWaveTool {
-Index: tests/perftest.cc
-===================================================================
---- tests/perftest.cc.orig
-+++ tests/perftest.cc
-@@ -21,6 +21,7 @@
- #include <unistd.h>
- #include <sys/time.h>
- #include <time.h>
-+#include <cstdio>
-
- static SfiGlueContext *bse_context = NULL;
-
-Index: tests/bse/cxxbinding.cc
-===================================================================
--- tests/bse/cxxbinding.cc.orig
+++ tests/bse/cxxbinding.cc
-@@ -19,6 +19,7 @@
+@@ -17,6 +17,7 @@
#include "bsecxxapi.hh"
#include <bse/bse.h>
#include <unistd.h>
+#include <cstdio>
+ #include <stdio.h>
static SfiGlueContext *bse_context = NULL;
-
-Index: tests/latency/bselatencytest.cc
-===================================================================
--- tests/latency/bselatencytest.cc.orig
+++ tests/latency/bselatencytest.cc
-@@ -20,6 +20,7 @@
- #include <sys/time.h>
+@@ -19,6 +19,7 @@
#include <string>
#include <errno.h>
+ #include <stdio.h>
+#include <cstdio>
using namespace std;
using namespace Sfi;
+--- tests/perftest.cc.orig
++++ tests/perftest.cc
+@@ -19,6 +19,7 @@
+ #include <unistd.h>
+ #include <sys/time.h>
+ #include <time.h>
++#include <cstdio>
+ #include <stdio.h>
+
+ static SfiGlueContext *bse_context = NULL;
--
beast packaging
More information about the pkg-multimedia-commits
mailing list