Version bump. Patch to stop using lash private api. Patch to build with GCC 4.3. Patch to fix some of the anti-aliasing rules.

(Portage version: 2.1.5_rc10)
 (Unsigned Manifest commit)

5 files changed, 211 insertions, 4 deletions

diff --git a/media-sound/museseq/Manifest b/media-sound/museseq/Manifest
index c5b435339876..958107cb4fa7 100644
--- a/media-sound/museseq/Manifest
+++ b/media-sound/museseq/Manifest
@@ -1,7 +1,10 @@
-AUX museseq-0.9_pre2-asneeded.patch 670 RMD160 3d259bac0b78a7bbd37b9306a8e9044652054002 SHA1 4042aa5a6a4880efb7ff94b913f79b7488682ecc SHA256 203656facd86906fa3b898c0229073110cd9189c33edf12715c8b1798d48a9bc
+AUX 0.9/01_all_gcc43.patch 3873 RMD160 b80cf449d5b87fa90388ef5902fd8778f0d5e291 SHA1 237457c16cef92e10ba454c6dc7960e191fb32a2 SHA256 f77cd16f4ddaa3a2fd62671d96623a2838cab14a3e9e41123484bc30357dca6d
+AUX 0.9/02_all_log2f_aliasing.patch 1219 RMD160 571c7aecc73c98696a6673ee240054bde3f7c526 SHA1 6c94569e0dce6542b75c3c078a7fe52cae5800f7 SHA256 e92704bef93fd70d1f22c05763e46edd814116a805bcd46586682881f536c28b
+AUX 0.9/03_all_lash_private_api.patch 1479 RMD160 5f200e5ddcf27af0d73ffe335df424cf3591b72e SHA1 87deabe20563ff0aba58003b4e8aad6864177d5f SHA256 943d8c16df562c43c4a825f7fd24ecadafcaf8abfec6352a5ab7efcc07a27160
+AUX 0.9/04_all_asneeded.patch 670 RMD160 3d259bac0b78a7bbd37b9306a8e9044652054002 SHA1 4042aa5a6a4880efb7ff94b913f79b7488682ecc SHA256 203656facd86906fa3b898c0229073110cd9189c33edf12715c8b1798d48a9bc
 DIST muse-0.8.1a.tar.gz 2371095 RMD160 2f193ee8ba86432835f0cc5df5257cf2a8ec2cb2 SHA1 f8e969b88fe13c3c16ecc49b4bd82e2ccafc6aec SHA256 b203eef1d9907844b0a14a2e0ecb2a40140d82700db749e8a04f38395d8101ae
-DIST muse-0.9pre2.tar.gz 2343753 RMD160 104eb9602cf86f93789a5201643f04a82075f0b3 SHA1 9c826904de8e6423d0a842cb1333b38256734e22 SHA256 e8b59e24e4427254f95de85bf573a36b71fed17a8bc1feaf854ba8dc50cc0860
+DIST muse-0.9.tar.gz 2350391 RMD160 ec8c46a72502fcfc9e86cac0a27fdf4562cf044f SHA1 d3921ba97d00381bc3f87415719ea86b0ea592dc SHA256 27dfc6ae1460538e03ff400ce1d6c5c06b0fbe05cf0664412a320195501ec8f6
 EBUILD museseq-0.8.1-r1.ebuild 1797 RMD160 09174af87b2cc2434e82baeab4900698606a3b39 SHA1 711f42eb882175ea85836907a47400c9321987ed SHA256 1d473845e24cd120a15e5e52cc38be6d1814e0bfec211b63c1a9646b4add4243
-EBUILD museseq-0.9_pre2.ebuild 1724 RMD160 65ae8244481611578d06615e50e4e7d9f97e3c9a SHA1 627ce19549e0efdd531e47cbe0191311c6b51874 SHA256 7bb0d500fd4466f692e95ae4b0b4b22819ac5c0ba02077a19bfa3d8f3ece0bf3
-MISC ChangeLog 8575 RMD160 fe70e410735671b4f65c758f39b4822978e1ba67 SHA1 5899faebde40422a175021d0c7799f6c198082d0 SHA256 bb9df3ea00484f662b9d94276bbc844f6b113835569ed7480e476aaa95c5c480
+EBUILD museseq-0.9.ebuild 1691 RMD160 442c319394002a6dc8343da3072f394626164542 SHA1 5bfbe413aa411a3ec0ca1cc2f5ddc959cbe8ebd7 SHA256 d43ef0cd9367b538f7fb3a13430b151a1ad616492a3bf4ecdd47d837b6f8a1c6
+MISC ChangeLog 9028 RMD160 bb4436cb1e722ccdecc06cd0a4841bb1eaef0466 SHA1 deea09ceb8112798132a9b2ccd855dd4310efc99 SHA256 7ba5b7e00d91ed1b65db3ee1226726dc50d9f2d8d39cdc28104f87072316870c
 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e
diff --git a/media-sound/museseq/files/0.9/01_all_gcc43.patch b/media-sound/museseq/files/0.9/01_all_gcc43.patch
new file mode 100644
index 000000000000..7d3ddf87d163
--- /dev/null
+++ b/media-sound/museseq/files/0.9/01_all_gcc43.patch
@@ -0,0 +1,111 @@
+diff -ur muse-0.9.orig/muse/ctrl.cpp muse-0.9/muse/ctrl.cpp
+--- muse-0.9.orig/muse/ctrl.cpp	2006-11-23 22:59:05.000000000 +0200
++++ muse-0.9/muse/ctrl.cpp	2008-05-16 14:40:07.000000000 +0300
+@@ -9,6 +9,7 @@
+ //=========================================================
+ 
+ 
++#include <cstdlib>
+ #include "globals.h"
+ #include "ctrl.h"
+ #include "xml.h"
+diff -ur muse-0.9.orig/muse/evdata.h muse-0.9/muse/evdata.h
+--- muse-0.9.orig/muse/evdata.h	2006-11-23 00:22:32.000000000 +0200
++++ muse-0.9/muse/evdata.h	2008-05-16 14:43:25.000000000 +0300
+@@ -9,6 +9,7 @@
+ #ifndef __EVDATA_H__
+ #define __EVDATA_H__
+ 
++#include <cstring>
+ #include <memory.h>
+ 
+ //---------------------------------------------------------
+diff -ur muse-0.9.orig/muse/help.cpp muse-0.9/muse/help.cpp
+--- muse-0.9.orig/muse/help.cpp	2006-11-23 00:22:32.000000000 +0200
++++ muse-0.9/muse/help.cpp	2008-05-16 14:40:07.000000000 +0300
+@@ -6,6 +6,7 @@
+ //  (C) Copyright 1999/2000 Werner Schweer (ws@seh.de)
+ //=========================================================
+ 
++#include <cstdlib>
+ #include <unistd.h>
+ #include <qmessagebox.h>
+ #include <qprocess.h>
+diff -ur muse-0.9.orig/muse/memory.h muse-0.9/muse/memory.h
+--- muse-0.9.orig/muse/memory.h	2004-06-08 00:46:08.000000000 +0300
++++ muse-0.9/muse/memory.h	2008-05-16 14:43:39.000000000 +0300
+@@ -9,6 +9,7 @@
+ #ifndef __MEMORY_H__
+ #define __MEMORY_H__
+ 
++#include <cstdlib>
+ #include <stdio.h>
+ #include <map>
+ 
+diff -ur muse-0.9.orig/muse/mixer/panknob.cpp muse-0.9/muse/mixer/panknob.cpp
+--- muse-0.9.orig/muse/mixer/panknob.cpp	2004-01-23 10:41:38.000000000 +0200
++++ muse-0.9/muse/mixer/panknob.cpp	2008-05-16 14:40:07.000000000 +0300
+@@ -6,6 +6,7 @@
+ //  (C) Copyright 2000 Werner Schweer (ws@seh.de)
+ //=========================================================
+ 
++#include <cstring>
+ #include "../audio.h"
+ #include "panknob.h"
+ 
+diff -ur muse-0.9.orig/muse/thread.cpp muse-0.9/muse/thread.cpp
+--- muse-0.9.orig/muse/thread.cpp	2006-11-23 00:22:41.000000000 +0200
++++ muse-0.9/muse/thread.cpp	2008-05-16 14:33:01.000000000 +0300
+@@ -8,6 +8,7 @@
+ 
+ #include "thread.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <sys/poll.h>
+diff -ur muse-0.9.orig/muse/widgets/poslabel.cpp muse-0.9/muse/widgets/poslabel.cpp
+--- muse-0.9.orig/muse/widgets/poslabel.cpp	2004-01-11 20:55:37.000000000 +0200
++++ muse-0.9/muse/widgets/poslabel.cpp	2008-05-16 14:42:43.000000000 +0300
+@@ -6,6 +6,7 @@
+ //=========================================================
+ 
+ #include <cmath>
++#include <cstdlib>
+ #include <qapplication.h>
+ #include <qstyle.h>
+ 
+diff -ur muse-0.9.orig/synti/deicsonze/deicsonze.cpp muse-0.9/synti/deicsonze/deicsonze.cpp
+--- muse-0.9.orig/synti/deicsonze/deicsonze.cpp	2007-08-22 21:33:05.000000000 +0300
++++ muse-0.9/synti/deicsonze/deicsonze.cpp	2008-05-16 14:42:16.000000000 +0300
+@@ -27,6 +27,8 @@
+ // 02111-1307, USA or point your web browser to http://www.gnu.org.
+ //===========================================================================
+ 
++#include <cstdlib>
++#include <climits>
+ #include <cmath>
+ #include <list>
+ 
+diff -ur muse-0.9.orig/synti/libsynti/evdata.h muse-0.9/synti/libsynti/evdata.h
+--- muse-0.9.orig/synti/libsynti/evdata.h	2004-02-13 15:55:03.000000000 +0200
++++ muse-0.9/synti/libsynti/evdata.h	2008-05-16 14:29:13.000000000 +0300
+@@ -10,6 +10,7 @@
+ #define __EVDATA_H__
+ 
+ #include <memory.h>
++#include <string.h>
+ 
+ //---------------------------------------------------------
+ //   EvData
+diff -ur muse-0.9.orig/synti/simpledrums/ssplugin.cpp muse-0.9/synti/simpledrums/ssplugin.cpp
+--- muse-0.9.orig/synti/simpledrums/ssplugin.cpp	2005-05-08 00:24:37.000000000 +0300
++++ muse-0.9/synti/simpledrums/ssplugin.cpp	2008-05-16 14:44:04.000000000 +0300
+@@ -10,6 +10,7 @@
+ //
+ //
+ 
++#include <cstdlib>
+ #include <dlfcn.h>
+ #include "ssplugin.h"
+ #include "common.h"
diff --git a/media-sound/museseq/files/0.9/02_all_log2f_aliasing.patch b/media-sound/museseq/files/0.9/02_all_log2f_aliasing.patch
new file mode 100644
index 000000000000..ff7105c07523
--- /dev/null
+++ b/media-sound/museseq/files/0.9/02_all_log2f_aliasing.patch
@@ -0,0 +1,39 @@
+diff -ur muse-0.9.orig/synti/simpledrums/ssplugin.h muse-0.9/synti/simpledrums/ssplugin.h
+--- muse-0.9.orig/synti/simpledrums/ssplugin.h	2007-08-22 21:33:06.000000000 +0300
++++ muse-0.9/synti/simpledrums/ssplugin.h	2008-05-16 14:47:24.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
+ //---------------------------------------------------------
diff --git a/media-sound/museseq/files/0.9/03_all_lash_private_api.patch b/media-sound/museseq/files/0.9/03_all_lash_private_api.patch
new file mode 100644
index 000000000000..3c0f2c927ede
--- /dev/null
+++ b/media-sound/museseq/files/0.9/03_all_lash_private_api.patch
@@ -0,0 +1,34 @@
+diff -ur muse-0.9.orig/muse/app.cpp muse-0.9/muse/app.cpp
+--- muse-0.9.orig/muse/app.cpp	2007-08-22 21:33:00.000000000 +0300
++++ muse-0.9/muse/app.cpp	2008-05-16 14:44:58.000000000 +0300
+@@ -2720,13 +2720,14 @@
+         case LASH_Save_File:
+     {
+           /* save file */
+-          const char *name = lash_get_fqn (lash_event_get_string (event), "lash-project-muse.med");
+-          int ok = save (name, false);
++	  QFileInfo name(QDir(lash_event_get_string (event)),
++	                 QString("lash-project-muse.med"));
++          int ok = save (name.filePath(), false);
+           if (ok) {
+-                project.setFile(name);
++                project.setFile(name.filePath());
+                 setCaption(tr("MusE: Song: ") + project.baseName(true));
+-                addProject(name);
+-                museProject = QFileInfo(name).dirPath(true);
++                addProject(name.filePath());
++                museProject = name.dirPath(true);
+                 }
+           lash_send_event (lash_client, event);
+     }
+@@ -2735,7 +2736,9 @@
+         case LASH_Restore_File: 
+     {
+           /* load file */
+-          loadProjectFile (lash_get_fqn (lash_event_get_string (event), "lash-project-muse.med" ), false, true);
++	  QFileInfo name(QDir(lash_event_get_string (event)),
++	                 QString("lash-project-muse.med"));
++          loadProjectFile (name.filePath(), false, true);
+           lash_send_event (lash_client, event);
+     }
+           break;
diff --git a/media-sound/museseq/files/0.9/04_all_asneeded.patch b/media-sound/museseq/files/0.9/04_all_asneeded.patch
new file mode 100644
index 000000000000..6c9026c4ca06
--- /dev/null
+++ b/media-sound/museseq/files/0.9/04_all_asneeded.patch
@@ -0,0 +1,20 @@
+Index: muse-0.9pre2/muse/Makefile.in
+===================================================================
+--- muse-0.9pre2.orig/muse/Makefile.in
++++ muse-0.9pre2/muse/Makefile.in
+@@ -390,11 +390,12 @@ muse_LDADD = \
+ 	cliplist/libcliplist.a \
+       instruments/libinstruments.a \
+ 	widgets/libwidgets.a \
+-      ../synti/libsynti/libsynti.la
+-
+-muse_LDFLAGS = -fno_exceptions $(X_LIBS) $(QT_LIBS) \
++      ../synti/libsynti/libsynti.la \
++	$(X_LIBS) $(QT_LIBS) \
+ 	-lasound $(SNDFILE_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(FST_LIBS)
+ 
++muse_LDFLAGS = -fno_exceptions 
++
+ CLEANFILES = stamp-chown
+ DISTCLEANFILES = .muse.bin.bak
+ MAINTAINERCLEANFILES = depcomp config.guess \