[SM-Commit] GIT changes to master grimoire by Thomas Orgis (6990bf90c82b94a79ebbfb881b829410bc2f374c)

Thomas Orgis scm at sourcemage.org
Thu Jun 26 08:32:37 EDT 2008


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

 audio-libs/lilypond/DETAILS                     |    4 
 audio-libs/lilypond/HISTORY                     |    4 
 audio-libs/lilypond/PRE_BUILD                   |    3 
 audio-libs/lilypond/lilypond-2.10.33-gcc43.diff |  111 ++++++++++++++++++++++++
 audio-libs/tse3/DEPENDS                         |    1 
 audio-libs/tse3/DETAILS                         |    3 
 audio-libs/tse3/HISTORY                         |    6 +
 audio-libs/tse3/tse3-0.3.1-fixes.diff.bz2       |binary
 audio-libs/tse3/tse3-0.3.1.tar.gz.sig           |    0 
 audio-libs/tse3/tse3-awe.diff.bz2               |binary
 dev/null                                        |binary
 11 files changed, 127 insertions(+), 5 deletions(-)

New commits:
commit 6990bf90c82b94a79ebbfb881b829410bc2f374c
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    lilypond: make it build again with gcc-4.3

commit c69b5b89eee1c9552e20166b87ede22c8d8144fb
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    lilypond: update to 2.10.33

commit 6ebac8efac98d5db413eb7952577560ab8622fc3
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    tse3: general fixup to make it work

diff --git a/audio-libs/lilypond/DETAILS b/audio-libs/lilypond/DETAILS
index e93d2c8..f4de9a6 100755
--- a/audio-libs/lilypond/DETAILS
+++ b/audio-libs/lilypond/DETAILS
@@ -1,11 +1,11 @@
            SPELL=lilypond
-         VERSION=2.10.29
+         VERSION=2.10.33
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.linuxaudio.org/lilypond/sources/v${VERSION%.*}/$SOURCE
         WEB_SITE=http://lilypond.org/web
          ENTERED=20050210
-     SOURCE_HASH=sha512:a9c60a9572bdd3ee48c98890ee1bd7480c2904c403f4b7f24d66c07566fc3ae5378f3ca416bd84323314beedb81a7ddd8af050b46737bb1d9539f76a90525199
+     SOURCE_HASH=sha512:b92743c8c1c1d0fd6cc510e4ef14a5c16f4c316147709052f6333318ad265592aa4782ed877e0af0d7f7c0fdeaa4812d37f5851a8e30a80cb2aefc3581724c82
       LICENSE[0]=GPL
         KEYWORDS="music audio libs"
            SHORT="Format music notation beautifully"
diff --git a/audio-libs/lilypond/HISTORY b/audio-libs/lilypond/HISTORY
index 14ab57b..8e7db42 100644
--- a/audio-libs/lilypond/HISTORY
+++ b/audio-libs/lilypond/HISTORY
@@ -1,3 +1,7 @@
+2008-06-26 Thomas Orgis <sobukus at sourcemage.org>
+	* DETAILS: updated to 2.10.33
+	* lilypond-2.10.33-gcc43.diff, PRE_BUILD: build with gcc-4.3
+
 2007-08-29 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DETAILS: updated spell to 2.10.29
 
diff --git a/audio-libs/lilypond/PRE_BUILD b/audio-libs/lilypond/PRE_BUILD
new file mode 100755
index 0000000..b39adc6
--- /dev/null
+++ b/audio-libs/lilypond/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -Np1 < "$SCRIPT_DIRECTORY/lilypond-2.10.33-gcc43.diff"
diff --git a/audio-libs/lilypond/lilypond-2.10.33-gcc43.diff b/audio-libs/lilypond/lilypond-2.10.33-gcc43.diff
new file mode 100644
index 0000000..561a21c
--- /dev/null
+++ b/audio-libs/lilypond/lilypond-2.10.33-gcc43.diff
@@ -0,0 +1,111 @@
+diff -ru lilypond-2.10.33.orig/flower/file-name.cc lilypond-2.10.33/flower/file-name.cc
+--- lilypond-2.10.33.orig/flower/file-name.cc	2007-09-19 16:21:55.000000000 +0200
++++ lilypond-2.10.33/flower/file-name.cc	2008-06-26 12:32:25.000000000 +0200
+@@ -12,6 +12,7 @@
+ #include <cstdio>
+ #include <cerrno>
+ #include <unistd.h>
++#include <limits.h>
+ 
+ using namespace std;
+ 
+diff -ru lilypond-2.10.33.orig/flower/include/rational.hh lilypond-2.10.33/flower/include/rational.hh
+--- lilypond-2.10.33.orig/flower/include/rational.hh	2007-09-19 16:21:55.000000000 +0200
++++ lilypond-2.10.33/flower/include/rational.hh	2008-06-26 12:33:03.000000000 +0200
+@@ -13,6 +13,8 @@
+ 
+ #include "std-string.hh"
+ 
++#include <limits.h>
++
+ /**
+    Rational numbers.  Included is support for + and - infinity.
+ */
+diff -ru lilypond-2.10.33.orig/flower/include/std-vector.hh lilypond-2.10.33/flower/include/std-vector.hh
+--- lilypond-2.10.33.orig/flower/include/std-vector.hh	2007-09-19 16:21:55.000000000 +0200
++++ lilypond-2.10.33/flower/include/std-vector.hh	2008-06-26 12:27:33.000000000 +0200
+@@ -19,6 +19,7 @@
+ #endif
+ #endif
+ 
++#include <string>
+ #include <algorithm>   /* find, reverse, sort */
+ #include <functional>  /* unary_function */
+ #include <cassert>
+diff -ru lilypond-2.10.33.orig/lily/midi-stream.cc lilypond-2.10.33/lily/midi-stream.cc
+--- lilypond-2.10.33.orig/lily/midi-stream.cc	2007-09-19 16:21:55.000000000 +0200
++++ lilypond-2.10.33/lily/midi-stream.cc	2008-06-26 12:48:21.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include "midi-stream.hh"
+ 
+ #include <cerrno>
++#include <cstring>
+ using namespace std;
+ 
+ #include "international.hh"
+diff -ru lilypond-2.10.33.orig/lily/piano-pedal-engraver.cc lilypond-2.10.33/lily/piano-pedal-engraver.cc
+--- lilypond-2.10.33.orig/lily/piano-pedal-engraver.cc	2007-09-19 16:21:55.000000000 +0200
++++ lilypond-2.10.33/lily/piano-pedal-engraver.cc	2008-06-26 12:51:34.000000000 +0200
+@@ -10,6 +10,8 @@
+   bracketed pedals.
+ */
+ 
++#include <cstring>
++
+ #include "engraver.hh"
+ 
+ #include "axis-group-interface.hh"
+@@ -37,7 +39,7 @@
+ */
+ 
+ /* Ugh: This declaration is duplicated in piano-pedal-performer */
+-typedef enum Pedal_type {
++enum Pedal_type {
+   SOSTENUTO,
+   SUSTAIN,
+   UNA_CORDA,
+diff -ru lilypond-2.10.33.orig/lily/prob.cc lilypond-2.10.33/lily/prob.cc
+--- lilypond-2.10.33.orig/lily/prob.cc	2007-09-19 16:21:55.000000000 +0200
++++ lilypond-2.10.33/lily/prob.cc	2008-06-26 13:08:40.000000000 +0200
+@@ -6,6 +6,7 @@
+   (c) 2004--2007 Jan Nieuwenhuizen <janneke at gnu.org>
+ */
+ 
++#include <cstring>
+ #include "prob.hh"
+ #include "main.hh"
+ #include "item.hh"
+diff -ru lilypond-2.10.33.orig/lily/relocate.cc lilypond-2.10.33/lily/relocate.cc
+--- lilypond-2.10.33.orig/lily/relocate.cc	2007-09-19 16:21:55.000000000 +0200
++++ lilypond-2.10.33/lily/relocate.cc	2008-06-26 13:09:13.000000000 +0200
+@@ -16,6 +16,7 @@
+ 
+ #include <sys/types.h>
+ #include <dirent.h>
++#include <cstring>
+ 
+ #if HAVE_GETTEXT
+ #include <libintl.h>
+diff -ru lilypond-2.10.33.orig/lily/source-file.cc lilypond-2.10.33/lily/source-file.cc
+--- lilypond-2.10.33.orig/lily/source-file.cc	2007-09-19 16:21:55.000000000 +0200
++++ lilypond-2.10.33/lily/source-file.cc	2008-06-26 13:58:37.000000000 +0200
+@@ -18,6 +18,7 @@
+ #endif
+ 
+ #include <cstdio>
++#include <cstring>
+ 
+ #if HAVE_SSTREAM
+ #include <sstream>
+diff -ru lilypond-2.10.33.orig/lily/translator.cc lilypond-2.10.33/lily/translator.cc
+--- lilypond-2.10.33.orig/lily/translator.cc	2007-09-19 16:21:55.000000000 +0200
++++ lilypond-2.10.33/lily/translator.cc	2008-06-26 14:02:09.000000000 +0200
+@@ -6,6 +6,8 @@
+   (c) 1997--2007 Han-Wen Nienhuys <hanwen at xs4all.nl>
+ */
+ 
++#include <cstring>
++
+ #include "translator.hh"
+ 
+ #include "context-def.hh"
diff --git a/audio-libs/tse3/DEPENDS b/audio-libs/tse3/DEPENDS
deleted file mode 100755
index a69731c..0000000
--- a/audio-libs/tse3/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gcc34
diff --git a/audio-libs/tse3/DETAILS b/audio-libs/tse3/DETAILS
index 5d06ed9..b2dc139 100755
--- a/audio-libs/tse3/DETAILS
+++ b/audio-libs/tse3/DETAILS
@@ -1,10 +1,9 @@
            SPELL=tse3
          VERSION=0.3.1
           SOURCE=$SPELL-$VERSION.tar.gz
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      SOURCE_HASH=sha512:cff94f274f90e61257eeda532f56b77ef0d2d03371876c2e6fb739ac32dcf107254702464c9c62a672e7c3e31bd063dc84a311daa0218df710bada8399d49860
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     GCC_VERSION=3.4
         WEB_SITE=http://tse3.sourceforge.net/
          ENTERED=20020417
       LICENSE[0]=GPL
diff --git a/audio-libs/tse3/HISTORY b/audio-libs/tse3/HISTORY
index 14bb917..5d9a357 100644
--- a/audio-libs/tse3/HISTORY
+++ b/audio-libs/tse3/HISTORY
@@ -1,3 +1,9 @@
+2008-06-23 Thomas Orgis <sobukus at sourcemage.org>
+	* DETAILS: drop the invalid guru sig, use SHA512; no GCC_VERSION
+	* DEPENDS: no dep on gcc34 anymore
+	* tse3-awe.diff.bz2, tse3-0.3.1-fixes.diff.bz2, PRE_BUILD: make it build with current gcc and
+	  included the header for AWE synth that's missing on a SMGL system.
+
 2008-02-06 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: removed mktemp (deprecated), is a part
 	  of coreutils now (which included in basesystem)
diff --git a/audio-libs/tse3/tse3-0.3.1-fixes.diff.bz2 b/audio-libs/tse3/tse3-0.3.1-fixes.diff.bz2
new file mode 100644
index 0000000..8da774c
Binary files /dev/null and b/audio-libs/tse3/tse3-0.3.1-fixes.diff.bz2 differ
diff --git a/audio-libs/tse3/tse3-0.3.1.tar.gz.sig b/audio-libs/tse3/tse3-0.3.1.tar.gz.sig
deleted file mode 100644
index de45180..0000000
Binary files a/audio-libs/tse3/tse3-0.3.1.tar.gz.sig and /dev/null differ
diff --git a/audio-libs/tse3/tse3-awe.diff.bz2 b/audio-libs/tse3/tse3-awe.diff.bz2
new file mode 100644
index 0000000..be038e9
Binary files /dev/null and b/audio-libs/tse3/tse3-awe.diff.bz2 differ



More information about the SM-Commit mailing list