sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (7f12534e76cef5da80ea08aab3c2febf4483bbba)
- From: Juuso Alasuutari <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (7f12534e76cef5da80ea08aab3c2febf4483bbba)
- Date: Wed, 30 Aug 2006 17:51:55 -0500
GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:
audio-creation/muse/BUILD | 10 +---
audio-creation/muse/DEPENDS | 14 ++++-
audio-creation/muse/DETAILS | 36 ++++++++++----
audio-creation/muse/HISTORY | 11 ++++
audio-creation/muse/PRE_BUILD | 14 +++--
audio-creation/muse/configure_fix.diff | 64
++++++++++++++++++++++++++
audio-creation/muse/muse_debian_0.8.1a-2.diff | 62
+++++++++++++++++++++++++
7 files changed, 186 insertions(+), 25 deletions(-)
New commits:
commit 7f12534e76cef5da80ea08aab3c2febf4483bbba
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>
muse: Behold, MusE 0.8.1a - and it actually works! :) After a long
battle I have subdued this beast of a sequencer for the common good.
diff --git a/audio-creation/muse/BUILD b/audio-creation/muse/BUILD
index f246e74..bfa48c4 100755
--- a/audio-creation/muse/BUILD
+++ b/audio-creation/muse/BUILD
@@ -1,7 +1,5 @@
-./configure --prefix=/usr \
- --with-qt-includes=/usr/include/qt \
- --with-qt-libraries=/usr/lib/qt \
- --enable-optimize \
- $OPTS &&
+OPTS="--with-qt-includes=/usr/include/qt \
+ --with-qt-libraries=/usr/lib/qt \
+ --enable-optimize $OPTS" &&
-make
+default_build
diff --git a/audio-creation/muse/DEPENDS b/audio-creation/muse/DEPENDS
index 86c0b22..02c0766 100755
--- a/audio-creation/muse/DEPENDS
+++ b/audio-creation/muse/DEPENDS
@@ -1,9 +1,19 @@
depends qt-x11 &&
+depends alsa-lib &&
depends libsndfile &&
depends libsamplerate &&
depends JACK-DRIVER &&
optional_depends fluidsynth \
- "" \
+ "--enable-fluidsynth" \
"--disable-fluidsynth" \
- "for sf2 support"
+ "for FluidSynth softsynth plugin" &&
+optional_depends lash \
+ "--enable-lash" \
+ "--disable-lash" \
+ "for Linux Audio Session Handler 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
+# recent Wine versions. Hopefully VST hosting will again work in MusE
+# 1.0 which should be out soon.
diff --git a/audio-creation/muse/DETAILS b/audio-creation/muse/DETAILS
index bee5f65..15f9b3f 100755
--- a/audio-creation/muse/DETAILS
+++ b/audio-creation/muse/DETAILS
@@ -1,18 +1,32 @@
SPELL=muse
- VERSION=0.7.1
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ VERSION=0.8.1a
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%a}
SOURCE_URL[0]=$SOURCEFORGE_URL/lmuse/$SOURCE
-
SOURCE_HASH=sha512:516201a21166dad3f47281e9ae6d5f8c423bfb72a74e45d07c80dd1b9e2a9d6ea24d164e70d4d90d083ea65e4bc17236e192e562838749ca7013b287554bd9aa
- WEB_SITE=http://lmuse.sf.net/
+
SOURCE_HASH=sha512:6258af73d3ab8d8fed63fe32b947616242d660fa20abc76243996931958f038e681f71fb79c25539c738d28652f21362c6c5fb7634b8755cf52954ac9a0b2a9b
+ WEB_SITE=http://www.muse-sequencer.org
ENTERED=20031209
- UPDATED=20031209
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="editors audio"
- SHORT="Multitrack virtual studio for Linux"
+ SHORT="A MIDI/Audio sequencer with recording and editing
capabilities."
cat << EOF
-MusE is a multitrack virtual studio for Linux that has support for
-sequencing of both midi and audio and has, among other things,
-support for LADSPA, Jack and ALSA
+MusE is a MIDI/Audio sequencer with recording and editing capabilities
written
+by Werner Schweer. MusE aims to be a complete multitrack virtual studio for
+Linux, it is published under the GNU General Public License. MusE has among
+other things support for:
+
+* Midi sequencing
+ * Record/Playback/Import
+ * Input filter
+* Audio sequencing
+ * Record/Playback several mono/stereo inputs/outputs.
+ * Use effects
+ * Nice routing features
+ * AudioGroups
+* LADSPA
+ * Perform audio effects like chorus/flanger!
+* Jack
+ * Use the Jack Audio Connection Kit for midi/audio routing.
+ * Internal Audio Routing Interface
+* ALSA - based on the Advanced Linux Sound Architecture
EOF
diff --git a/audio-creation/muse/HISTORY b/audio-creation/muse/HISTORY
index 504b017..5488652 100644
--- a/audio-creation/muse/HISTORY
+++ b/audio-creation/muse/HISTORY
@@ -1,3 +1,14 @@
+2006-08-31 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.8.1a, updated WEB_SITE & descriptions,
+ removed UPDATED & BUILD_API.
+ * DEPENDS: Added depends alsa-lib, added comment about missing
+ fst depends (read it if you're wondering about VST support).
+ * PRE_BUILD: Removed outdated sedits, added fix for configure
+ script bug and bugfixes from Debian package.
+ * BUILD: Edited to use default_build.
+ * configure_fix.diff: Added.
+ * muse_debian_0.8.1-2.diff: Added.
+
2006-07-15 Eric Sandall <eric AT sandall.us>
* PRE_BUILD: Remove the -fmove-all-movables from MUSECXXFLAGS (Bug
#12867)
diff --git a/audio-creation/muse/PRE_BUILD b/audio-creation/muse/PRE_BUILD
index 587faa8..39e0e3b 100755
--- a/audio-creation/muse/PRE_BUILD
+++ b/audio-creation/muse/PRE_BUILD
@@ -1,6 +1,8 @@
-default_pre_build &&
-#
-# Fix Bug #12867
-#
-sedit 's:-fmove-all-movables::g' $SOURCE_DIRECTORY/configure.ac &&
-sedit 's:-fmove-all-movables::g' $SOURCE_DIRECTORY/configure
+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
new file mode 100644
index 0000000..9fba002
--- /dev/null
+++ b/audio-creation/muse/configure_fix.diff
@@ -0,0 +1,64 @@
+--- 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
new file mode 100644
index 0000000..99503ab
--- /dev/null
+++ b/audio-creation/muse/muse_debian_0.8.1a-2.diff
@@ -0,0 +1,62 @@
+--- 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 Juuso Alasuutari (7f12534e76cef5da80ea08aab3c2febf4483bbba), Juuso Alasuutari, 08/30/2006
Archive powered by MHonArc 2.6.24.