Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6fea114d16c57ec82c9fadc8cee7341a30480605)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6fea114d16c57ec82c9fadc8cee7341a30480605)
  • Date: Mon, 9 Jun 2008 18:01:03 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-creation/beast/HISTORY | 4
audio-creation/beast/PRE_BUILD | 5
audio-creation/beast/beast-deprec.diff | 13 +
audio-creation/beast/beast-gcc43.diff | 377
+++++++++++++++++++++++++++++++++
4 files changed, 398 insertions(+), 1 deletion(-)

New commits:
commit 214f2068d8adc581ccb4feb73d5f8d6b88e9403c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

beast: make it compile in current grimoire

diff --git a/audio-creation/beast/HISTORY b/audio-creation/beast/HISTORY
index 1f06309..d8cfcce 100644
--- a/audio-creation/beast/HISTORY
+++ b/audio-creation/beast/HISTORY
@@ -1,3 +1,7 @@
+2008-06-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, beast-gcc43.diff, beast-deprec.diff:
+ Make it build again in current grimoire with patches from debian.
+
2007-04-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.7.1
* CONFIGURE: removed
diff --git a/audio-creation/beast/PRE_BUILD b/audio-creation/beast/PRE_BUILD
index 29f899a..b4b2a4b 100755
--- a/audio-creation/beast/PRE_BUILD
+++ b/audio-creation/beast/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/beast-guile-1.8.diff
+patch -p1 < $SPELL_DIRECTORY/beast-guile-1.8.diff &&
+# Two patches for 0.7.1 .
+patch -p1 < $SPELL_DIRECTORY/beast-gcc43.diff &&
+patch -p1 < $SPELL_DIRECTORY/beast-deprec.diff
diff --git a/audio-creation/beast/beast-deprec.diff
b/audio-creation/beast/beast-deprec.diff
new file mode 100644
index 0000000..9e7dbf0
--- /dev/null
+++ b/audio-creation/beast/beast-deprec.diff
@@ -0,0 +1,13 @@
+--- beast-0.7.1.orig/bse/Makefile.in
++++ beast-0.7.1/bse/Makefile.in
+@@ -422,7 +422,7 @@
+ # need -I$(srcdir) for "bseserver.h" in .genprc.c
+ # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
+ INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. \
+- $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
++ $(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS
+ EXTRA_HEADERS =
+ MAINTAINERCLEANFILES = $(GENERATED) $(am__append_2)
+ # -Wl,-Bsymbolic
+only in patch2:
+unchanged:
diff --git a/audio-creation/beast/beast-gcc43.diff
b/audio-creation/beast/beast-gcc43.diff
new file mode 100644
index 0000000..6780006
--- /dev/null
+++ b/audio-creation/beast/beast-gcc43.diff
@@ -0,0 +1,377 @@
+Index: beast-0.7.1/bse/tests/resamplehandle.cc
+===================================================================
+--- beast-0.7.1.orig/bse/tests/resamplehandle.cc 2006-11-29
01:05:01.000000000 +0000
++++ beast-0.7.1/bse/tests/resamplehandle.cc 2008-03-24 14:10:47.000000000
+0000
+@@ -24,6 +24,7 @@
+ #include <bse/gsldatautils.h>
+ #include <bse/bseblockutils.hh>
+ #include <vector>
++#include <cstdlib>
+
+ using std::vector;
+ using std::max;
+Index: beast-0.7.1/bse/tests/firhandle.cc
+===================================================================
+--- beast-0.7.1.orig/bse/tests/firhandle.cc 2006-12-10 16:55:16.000000000
+0000
++++ beast-0.7.1/bse/tests/firhandle.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <math.h>
+ #include <complex>
+ #include <vector>
++#include <cstdlib>
+
+ using std::vector;
+ using std::min;
+Index: beast-0.7.1/bse/tests/filtertest.cc
+===================================================================
+--- beast-0.7.1.orig/bse/tests/filtertest.cc 2006-12-11 00:19:16.000000000
+0000
++++ beast-0.7.1/bse/tests/filtertest.cc 2008-03-24 14:10:47.000000000
+0000
+@@ -26,6 +26,7 @@
+ #include "topconfig.h"
+ #include <math.h>
+ #include <complex>
++#include <cstdlib>
+
+ typedef std::complex<double> Complex;
+ using namespace Birnet;
+Index: beast-0.7.1/bse/bseresamplerimpl.hh
+===================================================================
+--- beast-0.7.1.orig/bse/bseresamplerimpl.hh 2006-11-25 16:04:33.000000000
+0000
++++ beast-0.7.1/bse/bseresamplerimpl.hh 2008-03-24 14:10:47.000000000
+0000
+@@ -23,6 +23,8 @@
+ #include <bse/bseresampler.hh>
+ #include <birnet/birnet.hh>
+ #include <math.h>
++#include <cstring>
++#include <cstdlib>
+ #ifdef __SSE__
+ #include <xmmintrin.h>
+ #endif
+Index: beast-0.7.1/bse/bseprocidl.cc
+===================================================================
+--- beast-0.7.1.orig/bse/bseprocidl.cc 2006-11-25 16:04:31.000000000 +0000
++++ beast-0.7.1/bse/bseprocidl.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <string>
+ #include <set>
++#include <cstring>
+
+ std::set<std::string> needTypes;
+ std::set<std::string> needClasses;
+Index: beast-0.7.1/bse/bsecxxplugin.hh
+===================================================================
+--- beast-0.7.1.orig/bse/bsecxxplugin.hh 2006-11-27 00:34:30.000000000
+0000
++++ beast-0.7.1/bse/bsecxxplugin.hh 2008-03-24 14:32:56.000000000 +0000
+@@ -18,6 +18,14 @@
+ #ifndef __BSE_CXX_PLUGIN_H__
+ #define __BSE_CXX_PLUGIN_H__
+
++#define static_template static
++#if defined __GNUC__
++# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
++# undef static_template
++# define static_template
++# endif
++#endif
++
+ #include <bse/bsecxxmodule.hh>
+ #include <bse/bseexports.h>
+ #include <bse/bseparam.h>
+@@ -56,7 +64,7 @@
+ #define BSE_CXX_REGISTER_STATIC_HOOK(HookType) BSE_CXX_REGISTER_HOOK_NODE
(HookType, 1)
+ #define BSE_CXX_REGISTER_HOOK_NODE(HookType, __static) \
+ template<class E> static BseExportNode* bse_export_node (); \
+- template<> static BseExportNode* \
++ template<> static_template BseExportNode* \
+ bse_export_node<HookType> () \
+ { \
+ static BseExportNodeHook hnode = { \
+@@ -91,7 +99,7 @@
+ (::NameSpace::bse_type_keeper__3##EnumType.get_type ())
+ #define BSE_CXX_DECLARE_ENUM(EnumType,EnumName,N,ICode) \
+ template<class E> static BseExportNode* bse_export_node (); \
+- template<> static BseExportNode* \
++ template<> static_template BseExportNode* \
+ bse_export_node<EnumType> () \
+ { \
+ static BseExportNodeEnum enode = { \
+@@ -145,7 +153,7 @@
+ (::NameSpace::bse_type_keeper__1##RecordType.get_type ())
+ #define BSE_CXX_DECLARE_RECORD(RecordType) \
+ template<class E> static BseExportNode* bse_export_node (); \
+- template<> static BseExportNode* \
++ template<> static_template BseExportNode* \
+ bse_export_node<RecordType> () \
+ { \
+ static BseExportNodeBoxed bnode = { \
+@@ -181,7 +189,7 @@
+ (::NameSpace::bse_type_keeper__2##SequenceType.get_type ())
+ #define BSE_CXX_DECLARE_SEQUENCE(SequenceType)
\
+ template<class E> static BseExportNode* bse_export_node ();
\
+- template<> static BseExportNode*
\
++ template<> static_template BseExportNode*
\
+ bse_export_node<SequenceType> ()
\
+ {
\
+ static BseExportNodeBoxed bnode = {
\
+@@ -219,7 +227,7 @@
+ extern ::Bse::ExportTypeKeeper bse_type_keeper__9##ProcType;
+ #define BSE_CXX_REGISTER_PROCEDURE(ProcType)
\
+ template<class C> static ::BseExportNode* bse_export_node ();
\
+- template<> static ::BseExportNode*
\
++ template<> static_template ::BseExportNode*
\
+ bse_export_node<Procedure::ProcType> ()
\
+ {
\
+ static ::BseExportNodeProc pnode = {
\
+@@ -259,7 +267,7 @@
+ #define BSE_CXX_REGISTER_EFFECT(Effect)
\
+ BSE_CXX_DEFINE_STATIC_DATA (Effect##Base);
\
+ template<class C> static ::BseExportNode* bse_export_node ();
\
+- template<> static ::BseExportNode*
\
++ template<> static_template ::BseExportNode*
\
+ bse_export_node<Effect> ()
\
+ {
\
+ static ::BseExportNodeClass cnode = {
\
+Index: beast-0.7.1/bse/bseloader-guspatch.cc
+===================================================================
+--- beast-0.7.1.orig/bse/bseloader-guspatch.cc 2006-11-25 16:04:31.000000000
+0000
++++ beast-0.7.1/bse/bseloader-guspatch.cc 2008-03-24 14:10:47.000000000
+0000
+@@ -22,6 +22,7 @@
+ #include <errno.h>
+ #include <vector>
+ #include <string>
++#include <cstring>
+
+ #undef WITH_GUSPATCH_XINFOS
+ static SFI_MSG_TYPE_DEFINE (debug_guspatch, "guspatch", SFI_MSG_DEBUG,
NULL);
+Index: beast-0.7.1/bse/bsesequencer.cc
+===================================================================
+--- beast-0.7.1.orig/bse/bsesequencer.cc 2006-12-26 21:41:25.000000000
+0000
++++ beast-0.7.1/bse/bsesequencer.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -30,6 +30,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <vector>
++#include <cstring>
+
+ /* due to a linker/compiler bug on SuSE 9.2, we need to
+ * define extern "C" symbols outside of any C++ namespace,
+Index: beast-0.7.1/sfi/sfidl-cxxbase.cc
+===================================================================
+--- beast-0.7.1.orig/sfi/sfidl-cxxbase.cc 2005-03-07 06:23:55.000000000
+0000
++++ beast-0.7.1/sfi/sfidl-cxxbase.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <cstring>
+ #include "sfidl-namespace.hh"
+ #include "sfidl-options.hh"
+ #include "sfidl-parser.hh"
+Index: beast-0.7.1/sfi/sfidl-namespace.cc
+===================================================================
+--- beast-0.7.1.orig/sfi/sfidl-namespace.cc 2005-03-07 06:23:55.000000000
+0000
++++ beast-0.7.1/sfi/sfidl-namespace.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <list>
+ #include <string>
+ #include <map>
++#include <algorithm>
+ #include "sfidl-namespace.hh"
+ #include <sfi/glib-extra.h>
+
+Index: beast-0.7.1/sfi/sfidl-options.cc
+===================================================================
+--- beast-0.7.1.orig/sfi/sfidl-options.cc 2005-03-07 06:23:55.000000000
+0000
++++ beast-0.7.1/sfi/sfidl-options.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include "topconfig.h"
+ #include <sfi/glib-extra.h>
+ #include <stdio.h>
++#include <cstring>
+
+ /* FIXME: should be filled out and written into topconfig.h by configure */
+ #define SFIDL_VERSION BST_VERSION
+Index: beast-0.7.1/sfi/sficxx.hh
+===================================================================
+--- beast-0.7.1.orig/sfi/sficxx.hh 2006-10-05 10:21:50.000000000 +0000
++++ beast-0.7.1/sfi/sficxx.hh 2008-03-24 14:10:47.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include <sfi/sfi.h>
+ #include <string>
+ #include <new>
++#include <cstring>
+
+ namespace Sfi {
+
+Index: beast-0.7.1/sfi/sfidl-factory.cc
+===================================================================
+--- beast-0.7.1.orig/sfi/sfidl-factory.cc 2005-03-07 06:23:55.000000000
+0000
++++ beast-0.7.1/sfi/sfidl-factory.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -18,6 +18,7 @@
+ */
+ #include "sfidl-factory.hh"
+ #include "glib-extra.h"
++#include <algorithm>
+
+ using namespace Sfidl;
+ using namespace std;
+Index: beast-0.7.1/sfi/sfidl-parser.cc
+===================================================================
+--- beast-0.7.1.orig/sfi/sfidl-parser.cc 2006-11-14 22:51:36.000000000
+0000
++++ beast-0.7.1/sfi/sfidl-parser.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -27,6 +27,9 @@
+ #include <iostream>
+ #include <set>
+ #include <stack>
++#include <cstring>
++#include <cstdlib>
++#include <algorithm>
+
+ const std::string
+ Sfidl::string_from_int (long long int lli)
+Index: beast-0.7.1/tests/bse/filtertest.cc
+===================================================================
+--- beast-0.7.1.orig/tests/bse/filtertest.cc 2006-12-04 00:01:08.000000000
+0000
++++ beast-0.7.1/tests/bse/filtertest.cc 2008-03-24 14:10:47.000000000
+0000
+@@ -28,6 +28,7 @@
+ #include <birnet/birnettests.h>
+ #include "topconfig.h"
+ #include <errno.h>
++#include <cstdlib>
+
+ using std::string;
+ using std::vector;
+Index: beast-0.7.1/tools/bsewavetool.cc
+===================================================================
+--- beast-0.7.1.orig/tools/bsewavetool.cc 2006-12-11 19:00:07.000000000
+0000
++++ beast-0.7.1/tools/bsewavetool.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -34,6 +34,7 @@
+ #include <fcntl.h>
+ #include <vector>
+ #include <map>
++#include <algorithm>
+
+
+ namespace BseWaveTool {
+Index: beast-0.7.1/tools/bsefcompare.cc
+===================================================================
+--- beast-0.7.1.orig/tools/bsefcompare.cc 2006-12-04 00:01:06.000000000
+0000
++++ beast-0.7.1/tools/bsefcompare.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <cstring>
+
+ #include "topconfig.h"
+
+Index: beast-0.7.1/tools/bsefextract.cc
+===================================================================
+--- beast-0.7.1.orig/tools/bsefextract.cc 2006-11-05 02:21:30.000000000
+0000
++++ beast-0.7.1/tools/bsefextract.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -27,6 +27,8 @@
+ #include <errno.h>
+ #include <assert.h>
+ #include "topconfig.h"
++#include <cstring>
++#include <cstdlib>
+
+ #include <map>
+ #include <string>
+Index: beast-0.7.1/birnet/tests/sorting.cc
+===================================================================
+--- beast-0.7.1.orig/birnet/tests/sorting.cc 2006-10-21 15:13:41.000000000
+0000
++++ beast-0.7.1/birnet/tests/sorting.cc 2008-03-24 14:10:47.000000000
+0000
+@@ -19,6 +19,8 @@
+ // #define TEST_VERBOSE
+ #include <birnet/birnettests.h>
+ #include <math.h>
++#include <cstdlib>
++#include <algorithm>
+
+ namespace {
+ using namespace Birnet;
+Index: beast-0.7.1/birnet/tests/strings.cc
+===================================================================
+--- beast-0.7.1.orig/birnet/tests/strings.cc 2006-12-18 17:58:23.000000000
+0000
++++ beast-0.7.1/birnet/tests/strings.cc 2008-03-24 14:10:47.000000000
+0000
+@@ -18,6 +18,7 @@
+ */
+ //#define TEST_VERBOSE
+ #include <birnet/birnettests.h>
++#include <cstdlib>
+ using namespace Birnet;
+
+ namespace {
+Index: beast-0.7.1/birnet/tests/threads.cc
+===================================================================
+--- beast-0.7.1.orig/birnet/tests/threads.cc 2006-10-21 15:12:11.000000000
+0000
++++ beast-0.7.1/birnet/tests/threads.cc 2008-03-24 14:10:47.000000000
+0000
+@@ -18,6 +18,7 @@
+ */
+ //#define TEST_VERBOSE
+ #include <birnet/birnettests.h>
++#include <cstdlib>
+
+ namespace {
+ using namespace Birnet;
+Index: beast-0.7.1/birnet/birnetutils.cc
+===================================================================
+--- beast-0.7.1.orig/birnet/birnetutils.cc 2006-12-18 17:58:24.000000000
+0000
++++ beast-0.7.1/birnet/birnetutils.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <algorithm>
+ #include <cxxabi.h>
+ #include <signal.h>
++#include <cstring>
+
+ #ifndef _
+ #define _(s) s
+Index: beast-0.7.1/birnet/birnetsignal.hh
+===================================================================
+--- beast-0.7.1.orig/birnet/birnetsignal.hh 2006-10-06 21:57:38.000000000
+0000
++++ beast-0.7.1/birnet/birnetsignal.hh 2008-03-24 14:10:47.000000000 +0000
+@@ -435,7 +435,7 @@
+ /* --- predefined signals --- */
+ template<class Emitter>
+ struct SignalFinalize : Signal0 <Emitter, void,
ScopeReferenceFinalizationMark> {
+- typedef Signal0<Emitter, void, ScopeReferenceFinalizationMark> Signal0;
++ typedef Birnet::Signals::Signal0<Emitter, void,
ScopeReferenceFinalizationMark> Signal0;
+ explicit SignalFinalize (Emitter &emitter) :
Signal0 (emitter) {}
+ explicit SignalFinalize (Emitter &emitter, void (Emitter::*method) ()) :
Signal0 (emitter, method) {}
+ BIRNET_PRIVATE_CLASS_COPY (SignalFinalize);
+@@ -443,7 +443,7 @@
+
+ template<class Emitter>
+ struct SignalVoid : Signal0 <Emitter, void> {
+- typedef Signal0<Emitter, void> Signal0;
++ typedef Birnet::Signals::Signal0<Emitter, void> Signal0;
+ explicit SignalVoid (Emitter &emitter) :
Signal0 (emitter) {}
+ explicit SignalVoid (Emitter &emitter, void (Emitter::*method) (void)) :
Signal0 (emitter, method) {}
+ BIRNET_PRIVATE_CLASS_COPY (SignalVoid);
+Index: beast-0.7.1/birnet/birnetmsg.cc
+===================================================================
+--- beast-0.7.1.orig/birnet/birnetmsg.cc 2006-11-21 01:31:27.000000000
+0000
++++ beast-0.7.1/birnet/birnetmsg.cc 2008-03-24 14:10:47.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include "birnetthread.hh"
+ #include <syslog.h>
+ #include <errno.h>
++#include <cstring>
+
+ #ifndef _ // FIXME
+ #define _(x) (x)
+Index: beast-0.7.1/birnet/birnetsignaltemplate.hh
+===================================================================
+--- beast-0.7.1.orig/birnet/birnetsignaltemplate.hh 2006-10-03
23:12:43.000000000 +0000
++++ beast-0.7.1/birnet/birnetsignaltemplate.hh 2008-03-24 14:10:47.000000000
+0000
+@@ -165,7 +165,7 @@
+ template<class Emitter, typename R0, typename A1, typename A2, typename A3,
class Collector>
+ struct Signal<Emitter, R0 (A1, A2, A3), Collector> : Signal3<Emitter, R0,
A1, A2, A3, Collector>
+ {
+- typedef Signal3<Emitter, R0, A1, A2, A3, Collector> Signal3;
++ typedef Birnet::Signals::Signal3<Emitter, R0, A1, A2, A3, Collector>
Signal3;
+ explicit Signal (Emitter &emitter) :
+ Signal3 (emitter)
+ {}



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6fea114d16c57ec82c9fadc8cee7341a30480605), Thomas Orgis, 06/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page