Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8ef35f7143bab797173bd1219fb8189e96c576b8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8ef35f7143bab797173bd1219fb8189e96c576b8)
  • Date: Sat, 17 Apr 2010 08:48:00 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

audio-creation/muse/DEPENDS | 11 ++++
audio-creation/muse/DETAILS | 2
audio-creation/muse/HISTORY | 6 ++
audio-creation/muse/PRE_BUILD | 8 ---
audio-creation/muse/configure_fix.diff | 64
--------------------------
audio-creation/muse/muse_debian_0.8.1a-2.diff | 62
-------------------------
6 files changed, 17 insertions(+), 136 deletions(-)

New commits:
commit a0e458a965eb91c14668c03b97dc96a3ac3a77f2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-creation/muse: version 1.0.1

diff --git a/audio-creation/muse/DEPENDS b/audio-creation/muse/DEPENDS
index 02c0766..2b3038d 100755
--- a/audio-creation/muse/DEPENDS
+++ b/audio-creation/muse/DEPENDS
@@ -11,7 +11,16 @@ optional_depends fluidsynth \
optional_depends lash \
"--enable-lash" \
"--disable-lash" \
- "for Linux Audio Session Handler support"
+ "for Linux Audio Session Handler support" &&
+optional_depends python \
+ "--enable-python" \
+ "--disable-python" \
+ "build python bindings" &&
+
+optional_depends dssi \
+ "--enable-dssi" \
+ "--disable-dssi" \
+ "build DSSI + DSSI-Vst support"

# Notice: MusE can depend on FST for VST plugin hosting, but the
# supported FST version is an obsolete 1.6 which won't compile with
diff --git a/audio-creation/muse/DETAILS b/audio-creation/muse/DETAILS
index 15f9b3f..cda2587 100755
--- a/audio-creation/muse/DETAILS
+++ b/audio-creation/muse/DETAILS
@@ -1,5 +1,5 @@
SPELL=muse
- VERSION=0.8.1a
+ VERSION=1.0.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%a}
SOURCE_URL[0]=$SOURCEFORGE_URL/lmuse/$SOURCE
diff --git a/audio-creation/muse/HISTORY b/audio-creation/muse/HISTORY
index eabcc06..1603cde 100644
--- a/audio-creation/muse/HISTORY
+++ b/audio-creation/muse/HISTORY
@@ -1,3 +1,9 @@
+2010-04-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.1
+ * PRE_BUILD configure_fix.diff muse_debian_0.8.1a-2.diff: removed
+ * DEPENDS: added optional dependencies on
+ python and dssi
+
2006-08-31 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 0.8.1a, updated WEB_SITE & descriptions,
removed UPDATED & BUILD_API.
diff --git a/audio-creation/muse/PRE_BUILD b/audio-creation/muse/PRE_BUILD
deleted file mode 100755
index 39e0e3b..0000000
--- a/audio-creation/muse/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-# Apply patch to fix --disable-fluidsynth configure option
-patch -p0 < $SCRIPT_DIRECTORY/configure_fix.diff &&
-
-# Apply bugfixes from Debian package
-patch -p1 < $SCRIPT_DIRECTORY/muse_debian_0.8.1a-2.diff
diff --git a/audio-creation/muse/configure_fix.diff
b/audio-creation/muse/configure_fix.diff
deleted file mode 100644
index 9fba002..0000000
--- a/audio-creation/muse/configure_fix.diff
+++ /dev/null
@@ -1,64 +0,0 @@
---- configure~ 2006-08-31 01:19:49.000000000 +0300
-+++ configure 2006-08-31 01:20:03.000000000 +0300
-@@ -22373,14 +22373,12 @@
- muse_enable_fluidlib="yes"
- synth_fluidsynth="fluidsynth"
- synth_fluid="fluid"
--synth_fluidsynth_build="yes"
- # Check whether --enable-fluidsynth or --disable-fluidsynth was given.
- if test "${enable_fluidsynth+set}" = set; then
- enableval="$enable_fluidsynth"
-
- case "$enableval" in
- "yes")
-- synth_fluidsynth_build="yes"
- synth_fluidsynth="fluidsynth"
- synth_fluid="fluid"
- ;;
-@@ -22388,7 +22386,6 @@
- muse_enable_fluidlib="no"
- synth_fluidsynth=""
- synth_fluid=""
-- synth_fluidsynth_build="no"
-
- ;;
- *)
-@@ -22410,7 +22407,6 @@
- fi
-
-
--if test "$muse_enable_fluidlib" = "yes"; then
-
-
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-@@ -22575,8 +22571,11 @@
- _ACEOF
-
- fi
--fi
-
-+if test "$muse_enable_fluidlib" = "no"; then
-+ synth_fluidsynth=""
-+ synth_fluid=""
-+fi
-
-
-
-@@ -24985,7 +24984,7 @@
-
- Software synths
- ---------------
-- FluidSynth: $synth_fluidsynth_build
-+ FluidSynth: $muse_enable_fluidlib
-
- " >&5
- echo "$as_me:
-@@ -25014,7 +25013,7 @@
-
- Software synths
- ---------------
-- FluidSynth: $synth_fluidsynth_build
-+ FluidSynth: $muse_enable_fluidlib
-
- " >&6;}
-
diff --git a/audio-creation/muse/muse_debian_0.8.1a-2.diff
b/audio-creation/muse/muse_debian_0.8.1a-2.diff
deleted file mode 100644
index 99503ab..0000000
--- a/audio-creation/muse/muse_debian_0.8.1a-2.diff
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/synti/simpledrums/ssplugin.h 2004-12-13 22:41:01.000000000 +0200
-+++ b/synti/simpledrums/ssplugin.h 2006-08-31 00:33:31.000000000 +0300
-@@ -15,6 +15,7 @@
-
- //#include <ladspa.h>
- #include "muse/ladspa.h"
-+#include "muse/fastlog.h"
- #include <math.h>
-
- //---------------------------------------------------------
-@@ -133,27 +134,6 @@
-
- };
-
--
--static inline float fast_log2 (float val)
-- {
-- /* don't use reinterpret_cast<> because that prevents this
-- from being used by pure C code (for example, GnomeCanvasItems)
-- */
-- int* const exp_ptr = (int *)(&val);
-- int x = *exp_ptr;
-- const int log_2 = ((x >> 23) & 255) - 128;
-- x &= ~(255 << 23);
-- x += 127 << 23;
-- *exp_ptr = x;
-- val = ((-1.0f/3) * val + 2) * val - 2.0f/3; // (1)
-- return (val + log_2);
-- }
--
--static inline float fast_log10 (const float val)
-- {
-- return fast_log2(val) / 3.312500f;
-- }
--
- //---------------------------------------------------------
- // PluginList
- //---------------------------------------------------------
---- a/synti/vam/vamgui.cpp 2006-01-01 23:11:05.000000000 +0200
-+++ b/synti/vam/vamgui.cpp 2006-08-31 00:33:39.000000000 +0300
-@@ -558,7 +558,7 @@
- "Select a preset");
- if (fn.isEmpty())
- return;
-- bool popenFlag;
-+ //bool popenFlag;
- FILE* f = fopen(fn.ascii(),"r");//fileOpen(this, fn, QString(".pre"),
"r", popenFlag, true);
- if (f == 0)
- return;
-@@ -605,9 +605,9 @@
- }
- }
- ende:
-- if (popenFlag)
-- pclose(f);
-- else
-+ //if (popenFlag)
-+ // pclose(f);
-+ //else
- fclose(f);
-
- if (presetFileName) delete presetFileName;



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8ef35f7143bab797173bd1219fb8189e96c576b8), Florian Franzmann, 04/17/2010

Archive powered by MHonArc 2.6.24.

Top of Page