diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2008-05-13 05:33:01 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2008-05-13 05:33:01 +0000 |
commit | 8b9be9e393725e4ce1fb770a5f038230050336da (patch) | |
tree | 2f3a3bd843173d46a7088e3f00eaab2be5f36d4f | |
parent | whitespace (diff) | |
download | historical-8b9be9e393725e4ce1fb770a5f038230050336da.tar.gz historical-8b9be9e393725e4ce1fb770a5f038230050336da.tar.bz2 historical-8b9be9e393725e4ce1fb770a5f038230050336da.zip |
old
Package-Manager: portage-2.1.5_rc10
-rw-r--r-- | media-sound/museseq/Manifest | 12 | ||||
-rw-r--r-- | media-sound/museseq/files/museseq-0.6.2-drumport.patch | 11 | ||||
-rw-r--r-- | media-sound/museseq/files/museseq-0.6.2-fPIC.patch | 47 | ||||
-rw-r--r-- | media-sound/museseq/files/museseq-0.6.2-gcc34.patch | 114 | ||||
-rw-r--r-- | media-sound/museseq/files/museseq-0.6.2-int2ptr.patch | 539 | ||||
-rw-r--r-- | media-sound/museseq/files/museseq-0.6.2-memory.patch | 58 | ||||
-rw-r--r-- | media-sound/museseq/files/museseq-0.7.2_pre5-rtctimerfix.patch | 12 | ||||
-rw-r--r-- | media-sound/museseq/museseq-0.6.2-r1.ebuild | 103 | ||||
-rw-r--r-- | media-sound/museseq/museseq-0.7.1.ebuild | 57 | ||||
-rw-r--r-- | media-sound/museseq/museseq-0.7.2_pre5.ebuild | 62 |
10 files changed, 0 insertions, 1015 deletions
diff --git a/media-sound/museseq/Manifest b/media-sound/museseq/Manifest index 931b831469e9..3dc3710613b0 100644 --- a/media-sound/museseq/Manifest +++ b/media-sound/museseq/Manifest @@ -1,18 +1,6 @@ -AUX museseq-0.6.2-drumport.patch 771 RMD160 a701a83a322ebd03d4f682b3846cca0aa2cbcd6b SHA1 c05907b3b2074f7f1753f8417150cb2a5a624657 SHA256 2dc2a1b64c5dfe4bb3e27a9d36ffc45792e7b9998659af01ec2d7e3fab707b33 -AUX museseq-0.6.2-fPIC.patch 4002 RMD160 1332d900dfc671d8f8d631a840d151f5c815630a SHA1 1e7cdf17fb01dba27451e316be06e70c3e0348c1 SHA256 00e6bf5f01c82a4db5705a3854789fd395c96cdc8b2ff45ca03b51e62ae395bd -AUX museseq-0.6.2-gcc34.patch 5500 RMD160 9cba354ade16eed9089dcf8e4789db539afb23d2 SHA1 1f832839caa351bbf59e77907ab7dc2d02393000 SHA256 c35aee58322ddac32ef1621a7094b4c9d946bcc820bd2088b7e9ecea74e13a77 -AUX museseq-0.6.2-int2ptr.patch 20425 RMD160 d03e545bdc1f0df3e5370b159b5a5d30aa30aaa3 SHA1 4909fde357abe3ccfea083cd922836da6d690ff0 SHA256 4567f94666d165270002624bb179e297cf74a6ef5558ba2ebb6b7020243a030b -AUX museseq-0.6.2-memory.patch 2032 RMD160 5c53d5ffc0ada346482dba74faa8bfe14cb7b747 SHA1 718498932fc599584e035ad8ed8cce80eea61ea9 SHA256 962f0e39c7aba8997a4767d958ccb0f6efc6e9dafdc117a1ff048e37a9035ccf -AUX museseq-0.7.2_pre5-rtctimerfix.patch 509 RMD160 fe785c892e886ef562e9927736055a0946b6561a SHA1 cd174ce2c333073e11379d0b2baf7f27b34ee934 SHA256 37333b5a59eb209546fcc345d8316830baabb7d1813e16b8832b36f8e0738850 AUX museseq-0.9_pre2-asneeded.patch 670 RMD160 3d259bac0b78a7bbd37b9306a8e9044652054002 SHA1 4042aa5a6a4880efb7ff94b913f79b7488682ecc SHA256 203656facd86906fa3b898c0229073110cd9189c33edf12715c8b1798d48a9bc -DIST muse-0.6.2.tar.bz2 1263832 RMD160 962234e2236f28483cc9bdbc6e20ffa505a6e315 SHA1 577ca98ac62777bf2a05fd3e836752530f520c65 SHA256 ce1bb12d532a90b907511e34b531082c5694cbfc4d124194a2a313aac41b0424 -DIST muse-0.7.1fixed.tar.bz2 1644403 RMD160 3786fb60a087ebfb22728900010d067494493b0b SHA1 3c946b437d869696928926cc5dd6220dbd4454fa SHA256 baa30e5ea90508d4e54fc36faba9652a09e5c5dd364b08b2b3f57ff7e9fe1d48 -DIST muse-0.7.2pre5.tar.gz 2326657 RMD160 cbadcaf84136075613c57b471a8f4522040a7ba9 SHA1 a151f2abc9a11c4badced8f3e260c8de8154e860 SHA256 53bf88830b94522bb124afa5a07dc8a7fd362c6c06736256a2bc9fa73be8e7a1 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 -EBUILD museseq-0.6.2-r1.ebuild 3163 RMD160 d9db402f8a8c1ca73b3581dd7efead7dd2be88db SHA1 c81a3b42ab9677836a355768db30285fa9d58f27 SHA256 cedc135af3c71f5bbe620b1c67ad8e3e2fc727af2df0bc70c68c01364faff21a -EBUILD museseq-0.7.1.ebuild 1761 RMD160 ccf21a5402cae0fd2c2076906fe52953f03f628f SHA1 c59e23aae31e17068d7a833a11b9cd52d6e2490a SHA256 bdbd0a2e1bc0717a6a260732945c5bf44ad78c334b6f78f77141d7179ec9050c -EBUILD museseq-0.7.2_pre5.ebuild 1821 RMD160 e2b196d0af7c6b5c20970baff3fccaa44df63846 SHA1 058f0fbd82c87f14297af8bdc566095cc0a7fc0f SHA256 4be66c073325b7236d242450ef37bb0754ca039ab531bddef3a5af3bbbd5e710 EBUILD museseq-0.8.1-r1.ebuild 1780 RMD160 4ca48a7762d6e5f9da3e98f48a43c5846c3c0c49 SHA1 7daf300ff26a7aeb892c3789c8df77777395c853 SHA256 0ea00bf27b6c47398f42032edd4ad57666c7c557b7ae82ce8ab64082f4ea274a EBUILD museseq-0.9_pre2.ebuild 1724 RMD160 65ae8244481611578d06615e50e4e7d9f97e3c9a SHA1 627ce19549e0efdd531e47cbe0191311c6b51874 SHA256 7bb0d500fd4466f692e95ae4b0b4b22819ac5c0ba02077a19bfa3d8f3ece0bf3 MISC ChangeLog 8441 RMD160 acff75ba90e3dbd85ebb128c4788738deab9687f SHA1 a83c41a57ce4d7ce3ff7f7cb8f568449d5714dff SHA256 b1d21d5c004dc27281db6e09ee7e10b8549d382db7d6c1a16d7df8c60639e774 diff --git a/media-sound/museseq/files/museseq-0.6.2-drumport.patch b/media-sound/museseq/files/museseq-0.6.2-drumport.patch deleted file mode 100644 index e60374e174c4..000000000000 --- a/media-sound/museseq/files/museseq-0.6.2-drumport.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- muse-0.6.2-orig/midithread.cpp 2004-07-11 02:36:40.102556216 +0200 -+++ muse-0.6.2/midithread.cpp 2004-07-11 03:54:11.612419232 +0200 -@@ -1015,7 +1015,7 @@ - if (track->type() == Track::DRUM) { //Map drum-notes to the drum-map values - int instr = drumInmap[ev->pitch()]; - pitch = drumMap[instr].anote; -- port = drumMap[instr].port; -+ //port = drumMap[instr].port; // respect the specified output port! - channel = drumMap[instr].channel; - } - else diff --git a/media-sound/museseq/files/museseq-0.6.2-fPIC.patch b/media-sound/museseq/files/museseq-0.6.2-fPIC.patch deleted file mode 100644 index 53c039495f0c..000000000000 --- a/media-sound/museseq/files/museseq-0.6.2-fPIC.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- widgets/Makefile.in 2004-04-16 13:38:18.525257991 +0000 -+++ widgets/Makefile.in 2004-04-16 13:39:12.334069714 +0000 -@@ -765,7 +765,7 @@ - -rm -rf ./$(DEPDIR) - - .cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -fPIC -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ - @am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ - @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ - @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@@ -798,7 +798,7 @@ - @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - xml.o: $(top_srcdir)/xml.cpp --@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xml.o -MD -MP -MF "$(DEPDIR)/xml.Tpo" \ -+@am__fastdepCXX_TRUE@ if $(CXX) -fPIC $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xml.o -MD -MP -MF "$(DEPDIR)/xml.Tpo" \ - @am__fastdepCXX_TRUE@ -c -o xml.o `test -f '$(top_srcdir)/xml.cpp' || echo '$(srcdir)/'`$(top_srcdir)/xml.cpp; \ - @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/xml.Tpo" "$(DEPDIR)/xml.Po"; \ - @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/xml.Tpo"; exit 1; \ -@@ -831,7 +831,7 @@ - @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xml.lo `test -f '$(top_srcdir)/xml.cpp' || echo '$(srcdir)/'`$(top_srcdir)/xml.cpp - - tempo.o: $(top_srcdir)/tempo.cpp --@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tempo.o -MD -MP -MF "$(DEPDIR)/tempo.Tpo" \ -+@am__fastdepCXX_TRUE@ if $(CXX) -fPIC $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tempo.o -MD -MP -MF "$(DEPDIR)/tempo.Tpo" \ - @am__fastdepCXX_TRUE@ -c -o tempo.o `test -f '$(top_srcdir)/tempo.cpp' || echo '$(srcdir)/'`$(top_srcdir)/tempo.cpp; \ - @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/tempo.Tpo" "$(DEPDIR)/tempo.Po"; \ - @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/tempo.Tpo"; exit 1; \ -@@ -864,7 +864,7 @@ - @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tempo.lo `test -f '$(top_srcdir)/tempo.cpp' || echo '$(srcdir)/'`$(top_srcdir)/tempo.cpp - - sig.o: $(top_srcdir)/sig.cpp --@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sig.o -MD -MP -MF "$(DEPDIR)/sig.Tpo" \ -+@am__fastdepCXX_TRUE@ if $(CXX) -fPIC $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sig.o -MD -MP -MF "$(DEPDIR)/sig.Tpo" \ - @am__fastdepCXX_TRUE@ -c -o sig.o `test -f '$(top_srcdir)/sig.cpp' || echo '$(srcdir)/'`$(top_srcdir)/sig.cpp; \ - @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/sig.Tpo" "$(DEPDIR)/sig.Po"; \ - @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/sig.Tpo"; exit 1; \ -@@ -897,7 +897,7 @@ - @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sig.lo `test -f '$(top_srcdir)/sig.cpp' || echo '$(srcdir)/'`$(top_srcdir)/sig.cpp - - pos.o: $(top_srcdir)/pos.cpp --@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pos.o -MD -MP -MF "$(DEPDIR)/pos.Tpo" \ -+@am__fastdepCXX_TRUE@ if $(CXX) -fPIC $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pos.o -MD -MP -MF "$(DEPDIR)/pos.Tpo" \ - @am__fastdepCXX_TRUE@ -c -o pos.o `test -f '$(top_srcdir)/pos.cpp' || echo '$(srcdir)/'`$(top_srcdir)/pos.cpp; \ - @am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/pos.Tpo" "$(DEPDIR)/pos.Po"; \ - @am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/pos.Tpo"; exit 1; \ diff --git a/media-sound/museseq/files/museseq-0.6.2-gcc34.patch b/media-sound/museseq/files/museseq-0.6.2-gcc34.patch deleted file mode 100644 index 06c372a74bba..000000000000 --- a/media-sound/museseq/files/museseq-0.6.2-gcc34.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -ru muse-0.6.2-orig/arranger/pcanvas.cpp muse-0.6.2/arranger/pcanvas.cpp ---- muse-0.6.2-orig/arranger/pcanvas.cpp 2004-07-11 02:36:40.000000000 +0200 -+++ muse-0.6.2/arranger/pcanvas.cpp 2004-07-11 04:23:31.686847248 +0200 -@@ -262,7 +262,7 @@ - Part* spart = npart->part(); - Track* track = npart->track(); - int dtick = newpos.x(); -- unsigned ntrack = y2pitch(item->mp().y()); -+ int ntrack = y2pitch(item->mp().y()); - Track::TrackType type = track->type(); - - if (tracks->index(track) == ntrack && (dtick == spart->posTick())) { -@@ -389,7 +389,7 @@ - CItem* PartCanvas::newItem(const QPoint& pos, int) - { - int x = sigmap.raster(pos.x(), *_raster); -- unsigned trackIndex = y2pitch(pos.y()); -+ int trackIndex = y2pitch(pos.y()); - if (trackIndex == -1) - return 0; - Track* track = tracks->findIdx(trackIndex); -@@ -1409,7 +1409,7 @@ - int x = sigmap.raster(event->pos().x(), *_raster); - if (x < 0) - x = 0; -- unsigned trackNo = y2pitch(event->pos().y()); -+ int trackNo = y2pitch(event->pos().y()); - Track* track = 0; - if (trackNo < tracks->size()) - track = tracks->findIdx(trackNo); - -diff -ru muse-0.6.2-orig/midiedit/dlist.cpp muse-0.6.2/midiedit/dlist.cpp ---- muse-0.6.2-orig/midiedit/dlist.cpp 2004-07-11 02:36:38.000000000 +0200 -+++ muse-0.6.2/midiedit/dlist.cpp 2004-07-11 04:16:22.592079568 +0200 -@@ -246,7 +246,7 @@ - for (int i=0; i<DRUM_MAPSIZE; i++) { - if (drumMap[i].enote == val && &drumMap[i] != dm) { - printf("drumMap %s, index %d had the same note!\n",drumMap[i].name.ascii(),i); -- drumInmap[dm->enote] = i; -+ drumInmap[(int)(dm->enote)] = i; - printf("Setting drumInmap[%d] to point to instrument %d\n",dm->enote, i); - drumMap[i].enote = dm->enote; - //TODO: Set all notes on the track with pitch=val to pitch=dm->enote -@@ -585,10 +585,10 @@ - drumMap[sPitch] = drumMap[dPitch]; - drumMap[dPitch] = dm; - setCursor(QCursor(arrowCursor)); -- drumInmap[drumMap[sPitch].enote] = sPitch; -- drumOutmap[drumMap[sPitch].anote] = sPitch; -- drumInmap[drumMap[dPitch].enote] = dPitch; -- drumOutmap[drumMap[dPitch].anote] = dPitch; -+ drumInmap[(int)(drumMap[sPitch].enote)] = sPitch; -+ drumOutmap[(int)(drumMap[sPitch].anote)] = sPitch; -+ drumInmap[(int)(drumMap[dPitch].enote)] = dPitch; -+ drumOutmap[(int)(drumMap[dPitch].anote)] = dPitch; - currentlySelected = &drumMap[dPitch]; - emit mapChanged(); - } -diff -ru muse-0.6.2-orig/midiedit/drummap.cpp muse-0.6.2/midiedit/drummap.cpp ---- muse-0.6.2-orig/midiedit/drummap.cpp 2004-07-11 02:36:38.000000000 +0200 -+++ muse-0.6.2/midiedit/drummap.cpp 2004-07-11 04:17:25.970444592 +0200 -@@ -174,8 +174,8 @@ - memset(drumInmap, 0, sizeof(drumInmap)); - memset(drumOutmap, 0, sizeof(drumOutmap)); - for (int i = 0; i < DRUM_MAPSIZE; ++i) { -- drumInmap[drumMap[i].enote] = i; -- drumOutmap[drumMap[i].anote] = i; -+ drumInmap[(int)(drumMap[i].enote)] = i; -+ drumOutmap[(int)(drumMap[i].anote)] = i; - } - } - -@@ -361,8 +361,8 @@ - memset(drumInmap, 0, sizeof(drumInmap)); - memset(drumOutmap, 0, sizeof(drumOutmap)); - for (int i = 0; i < DRUM_MAPSIZE; ++i) { -- drumInmap[drumMap[i].enote] = i; -- drumOutmap[drumMap[i].anote] = i; -+ drumInmap[(int)(drumMap[i].enote)] = i; -+ drumOutmap[(int)(drumMap[i].anote)] = i; - } - return; - } -diff -ru muse-0.6.2-orig/widgets/genset.cpp muse-0.6.2/widgets/genset.cpp ---- muse-0.6.2-orig/widgets/genset.cpp 2004-07-11 02:36:40.000000000 +0200 -+++ muse-0.6.2/widgets/genset.cpp 2004-07-11 04:18:34.338051136 +0200 -@@ -43,7 +43,7 @@ - } - } - guiRefreshSelect->setValue(guiRefresh); -- minSliderSelect->setValue(minSlider); -+ minSliderSelect->setValue((int)minSlider); - minMeterSelect->setValue(minMeter); - helpBrowser->setText(::helpBrowser); - -diff -ru muse-0.6.2-orig/midithread.cpp muse-0.6.2/midithread.cpp ---- muse-0.6.2-orig/midithread.cpp 2004-07-11 05:00:52.132247776 +0200 -+++ muse-0.6.2/midithread.cpp 2004-07-11 05:01:23.853425424 +0200 -@@ -1,4 +1,4 @@ --//========================================================= -+ - // MusE - // Linux Music Editor - // $Id: museseq-0.6.2-gcc34.patch,v 1.1 2004/07/11 22:21:52 fvdpol Exp $ -@@ -570,7 +570,7 @@ - panic(); - break; - case SEQM_MIDI_CTRL: -- midiPorts[msg->port].setCtrl(msg->channel, msg->ctrl, msg->a); -+ midiPorts[(int)msg->port].setCtrl(msg->channel, msg->ctrl, msg->a); - break; - case SEQM_MIDI_MASTER_VOLUME: - for (int i = 0; i < MIDI_PORTS; ++i) - diff --git a/media-sound/museseq/files/museseq-0.6.2-int2ptr.patch b/media-sound/museseq/files/museseq-0.6.2-int2ptr.patch deleted file mode 100644 index d66ac629f53d..000000000000 --- a/media-sound/museseq/files/museseq-0.6.2-int2ptr.patch +++ /dev/null @@ -1,539 +0,0 @@ -diff -Nur muse-0.6.2-orig/app.cpp muse-0.6.2/app.cpp ---- muse-0.6.2-orig/app.cpp 2003-11-01 19:49:06.000000000 +0000 -+++ muse-0.6.2/app.cpp 2004-06-29 00:05:35.712525381 +0000 -@@ -1190,7 +1190,7 @@ - song->setName(project.baseName()); - setCaption(QString("MusE: Song: ") + project.baseName()); - arranger->reset(); -- arranger->setMode(int(song->mtype())); -+ arranger->setMode(long(song->mtype())); - newSongFlag = true; - song->dirty = false; - -@@ -1257,8 +1257,8 @@ - { - PianoRoll* pianoroll = new PianoRoll(pl, this); - pianoroll->show(); -- toplevels.push_back(Toplevel(Toplevel::PIANO_ROLL, int(pianoroll), pianoroll)); -- connect(pianoroll, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ toplevels.push_back(Toplevel( Toplevel::PIANO_ROLL, pianoroll, pianoroll)); -+ connect(pianoroll, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - - //--------------------------------------------------------- -@@ -1277,8 +1277,8 @@ - { - Score* scoreEditor = new Score(pl); - scoreEditor->show(); -- toplevels.push_back(Toplevel(Toplevel::NOTEN, int(scoreEditor), scoreEditor)); -- connect(scoreEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ toplevels.push_back(Toplevel(Toplevel::NOTEN, scoreEditor, scoreEditor)); -+ connect(scoreEditor, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - - //--------------------------------------------------------- -@@ -1297,8 +1297,8 @@ - { - ListEdit* listEditor = new ListEdit(pl); - listEditor->show(); -- toplevels.push_back(Toplevel(Toplevel::LISTE, int(listEditor), listEditor)); -- connect(listEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ toplevels.push_back(Toplevel(Toplevel::LISTE, listEditor, listEditor)); -+ connect(listEditor, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - - //--------------------------------------------------------- -@@ -1309,8 +1309,8 @@ - { - MasterEdit* masterEditor = new MasterEdit(); - masterEditor->show(); -- toplevels.push_back(Toplevel(Toplevel::MASTER, int(masterEditor), masterEditor)); -- connect(masterEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ toplevels.push_back(Toplevel(Toplevel::MASTER, masterEditor, masterEditor)); -+ connect(masterEditor, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - - //--------------------------------------------------------- -@@ -1321,8 +1321,8 @@ - { - LMaster* lmaster = new LMaster(); - lmaster->show(); -- toplevels.push_back(Toplevel(Toplevel::LMASTER, int(lmaster), lmaster)); -- connect(lmaster, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ toplevels.push_back(Toplevel(Toplevel::LMASTER, lmaster, lmaster)); -+ connect(lmaster, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - - //--------------------------------------------------------- -@@ -1341,8 +1341,8 @@ - { - DrumEdit* drumEditor = new DrumEdit(pl, this); - drumEditor->show(); -- toplevels.push_back(Toplevel(Toplevel::DRUM, int(drumEditor), drumEditor)); -- connect(drumEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ toplevels.push_back(Toplevel(Toplevel::DRUM, drumEditor, drumEditor)); -+ connect(drumEditor, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - - //--------------------------------------------------------- -@@ -1363,8 +1363,8 @@ - { - WaveEdit* waveEditor = new WaveEdit(pl); - waveEditor->show(); -- toplevels.push_back(Toplevel(Toplevel::WAVE, int(waveEditor), waveEditor)); -- connect(waveEditor, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ toplevels.push_back(Toplevel(Toplevel::WAVE, waveEditor, waveEditor)); -+ connect(waveEditor, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - - //--------------------------------------------------------- -@@ -1375,10 +1375,10 @@ - { - if (midiMixer == 0) { - midiMixer = new Mixer(); -- toplevels.push_back(Toplevel(Toplevel::M_MIXER, int(midiMixer), midiMixer)); -+ toplevels.push_back(Toplevel(Toplevel::M_MIXER, midiMixer, midiMixer)); - connect(midiMixer, SIGNAL(ctrlChanged(int,int,int,int)), song, SLOT(ctrlChanged(int,int,int,int))); - connect(midiMixer, SIGNAL(masterVolChanged(int)), song, SLOT(masterVolChanged(int))); -- connect(midiMixer, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ connect(midiMixer, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - midiMixer->show(); - menu_functions->setItemChecked(midid1, true); -@@ -1401,8 +1401,8 @@ - { - if (markerView == 0) { - markerView = new MarkerView(this); -- toplevels.push_back(Toplevel(Toplevel::MARKER, int(markerView), markerView)); --// connect(markerView, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ toplevels.push_back(Toplevel(Toplevel::MARKER, markerView, markerView)); -+// connect(markerView, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - markerView->show(); - } -@@ -1415,8 +1415,8 @@ - { - if (audioMixer == 0) { - audioMixer = new AudioMixerApp(); -- toplevels.push_back(Toplevel(Toplevel::A_MIXER, int(audioMixer), audioMixer)); -- connect(audioMixer, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ toplevels.push_back(Toplevel(Toplevel::A_MIXER, audioMixer, audioMixer)); -+ connect(audioMixer, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - audioMixer->show(); - menu_audio->setItemChecked(aid1, true); -@@ -1430,8 +1430,8 @@ - { - if (clipListEdit == 0) { - clipListEdit = new ClipListEdit(); -- toplevels.push_back(Toplevel(Toplevel::CLIPLIST, int(clipListEdit), clipListEdit)); -- connect(clipListEdit, SIGNAL(deleted(int)), SLOT(toplevelDeleted(int))); -+ toplevels.push_back(Toplevel(Toplevel::CLIPLIST, clipListEdit, clipListEdit)); -+ connect(clipListEdit, SIGNAL(deleted(void*)), SLOT(toplevelDeleted(long))); - } - clipListEdit->show(); - menu_audio->setItemChecked(aid2, true); -@@ -1476,10 +1476,10 @@ - // toplevelDeleted - //--------------------------------------------------------- - --void MusE::toplevelDeleted(int tl) -+void MusE::toplevelDeleted(void* tl) - { - for (iToplevel i = toplevels.begin(); i != toplevels.end(); ++i) { -- if (i->object() == tl) { -+ if ( i->object() == tl ) { - switch(i->type()) { - case Toplevel::M_MIXER: - menu_functions->setItemChecked(midid1, false); -@@ -2156,7 +2156,7 @@ - Toplevel tl = *i; - if (tl.type() == Toplevel::WAVE) { - TopWin* obj = tl.cobject(); -- ((WaveEdit*)(obj))->setBg(WaveEdit::configBg()); -+ reinterpret_cast<WaveEdit*>(obj)->setBg(WaveEdit::configBg()); - } - } - } -@@ -2593,7 +2593,7 @@ - again: - for (iToplevel i = toplevels.begin(); i != toplevels.end(); ++i) { - Toplevel tl = *i; -- int obj = tl.object(); -+ void* obj = tl.object(); - switch (tl.type()) { - case Toplevel::A_MIXER: - delete audioMixer; -@@ -2611,7 +2611,7 @@ - case Toplevel::WAVE: - case Toplevel::LMASTER: - case Toplevel::MIXDOWN: -- ((QWidget*)(obj))->close(true); -+ reinterpret_cast<QWidget*>(obj)->close(true); - goto again; - } - } -diff -Nur muse-0.6.2-orig/app.h muse-0.6.2/app.h ---- muse-0.6.2-orig/app.h 2003-10-30 12:11:50.000000000 +0000 -+++ muse-0.6.2/app.h 2004-06-28 23:52:54.358355806 +0000 -@@ -227,7 +227,7 @@ - void ctrlChanged(); - void loadProjectFile(const QString&); - void startAudioMixer(); -- void toplevelDeleted(int tl); -+ void toplevelDeleted(void* tl); - void loadTheme(QString); - void setTransportHandleColor(QColor); - void setBigTimeForegroundColor(QColor); -diff -Nur muse-0.6.2-orig/cliplist/cliplist.cpp muse-0.6.2/cliplist/cliplist.cpp ---- muse-0.6.2-orig/cliplist/cliplist.cpp 2003-10-29 10:06:37.000000000 +0000 -+++ muse-0.6.2/cliplist/cliplist.cpp 2004-06-29 00:13:59.767149620 +0000 -@@ -184,7 +184,7 @@ - - void ClipListEdit::closeEvent(QCloseEvent* e) - { -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/cliplist/cliplist.h muse-0.6.2/cliplist/cliplist.h ---- muse-0.6.2-orig/cliplist/cliplist.h 2003-10-29 10:06:36.000000000 +0000 -+++ muse-0.6.2/cliplist/cliplist.h 2004-06-29 00:14:11.080311133 +0000 -@@ -37,7 +37,7 @@ - void clicked(QListViewItem*); - - signals: -- void deleted(int); -+ void deleted(void*); - - public: - ClipListEdit(); -diff -Nur muse-0.6.2-orig/cobject.h muse-0.6.2/cobject.h ---- muse-0.6.2-orig/cobject.h 2003-10-29 10:05:10.000000000 +0000 -+++ muse-0.6.2/cobject.h 2004-06-29 00:02:30.187403540 +0000 -@@ -44,18 +44,16 @@ - , M_PATCHBAY - #endif /* PATCHBAY */ - }; -- Toplevel(ToplevelType t, int obj, TopWin* cobj) { -- _type = t; -- _object = obj; -- _cobject = cobj; -- } -+ // Rethink that : saving void*_object ( formerly int) and TopWin* _cobject makes no sense! -+ Toplevel(ToplevelType t, void * obj, TopWin* cobj) -+ : _type(t), _object(obj), _cobject(cobj){ } - ToplevelType type() const { return _type; } -- int object() const { return _object; } -+ void* object() const { return _object; } - TopWin* cobject() const { return _cobject; } - - private: - ToplevelType _type; -- int _object; -+ void* _object; - TopWin* _cobject; - }; - -diff -Nur muse-0.6.2-orig/liste/listedit.cpp muse-0.6.2/liste/listedit.cpp ---- muse-0.6.2-orig/liste/listedit.cpp 2003-10-29 10:05:22.000000000 +0000 -+++ muse-0.6.2/liste/listedit.cpp 2004-06-28 23:37:13.000000000 +0000 -@@ -139,7 +139,7 @@ - - void ListEdit::closeEvent(QCloseEvent* e) - { -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/liste/listedit.h muse-0.6.2/liste/listedit.h ---- muse-0.6.2-orig/liste/listedit.h 2003-10-29 10:05:22.000000000 +0000 -+++ muse-0.6.2/liste/listedit.h 2004-06-28 23:37:23.000000000 +0000 -@@ -58,7 +58,7 @@ - void songChanged(int); - - signals: -- void deleted(int); -+ void deleted(void*); - - public: - ListEdit(PartList*); -diff -Nur muse-0.6.2-orig/marker/markerview.cpp muse-0.6.2/marker/markerview.cpp ---- muse-0.6.2-orig/marker/markerview.cpp 2003-10-29 10:06:13.000000000 +0000 -+++ muse-0.6.2/marker/markerview.cpp 2004-06-28 23:40:45.776186926 +0000 -@@ -136,7 +136,7 @@ - - void MarkerView::closeEvent(QCloseEvent* e) - { -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/marker/markerview.h muse-0.6.2/marker/markerview.h ---- muse-0.6.2-orig/marker/markerview.h 2003-10-29 10:06:13.000000000 +0000 -+++ muse-0.6.2/marker/markerview.h 2004-06-28 23:44:51.775914379 +0000 -@@ -67,7 +67,7 @@ - void songChanged(int); - - signals: -- void deleted(int); -+ void deleted(void*); - - public: - MarkerView(QWidget* parent); -diff -Nur muse-0.6.2-orig/master/lmaster.cpp muse-0.6.2/master/lmaster.cpp ---- muse-0.6.2-orig/master/lmaster.cpp 2003-10-29 10:06:13.000000000 +0000 -+++ muse-0.6.2/master/lmaster.cpp 2004-06-29 00:12:14.582240878 +0000 -@@ -26,7 +26,7 @@ - - void LMaster::closeEvent(QCloseEvent* e) - { -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/master/lmaster.h muse-0.6.2/master/lmaster.h ---- muse-0.6.2-orig/master/lmaster.h 2003-10-29 10:06:13.000000000 +0000 -+++ muse-0.6.2/master/lmaster.h 2004-06-29 00:12:32.127391543 +0000 -@@ -41,7 +41,7 @@ - void songChanged(int); - - signals: -- void deleted(int); -+ void deleted(void*); - - public: - LMaster(); -diff -Nur muse-0.6.2-orig/master/masteredit.cpp muse-0.6.2/master/masteredit.cpp ---- muse-0.6.2-orig/master/masteredit.cpp 2003-10-29 10:06:14.000000000 +0000 -+++ muse-0.6.2/master/masteredit.cpp 2004-06-29 00:12:42.339732011 +0000 -@@ -49,7 +49,7 @@ - - void MasterEdit::closeEvent(QCloseEvent* e) - { -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/master/masteredit.h muse-0.6.2/master/masteredit.h ---- muse-0.6.2-orig/master/masteredit.h 2003-10-29 10:06:13.000000000 +0000 -+++ muse-0.6.2/master/masteredit.h 2004-06-29 00:12:59.382962426 +0000 -@@ -59,7 +59,7 @@ - // void tempoChanged(double); - - signals: -- void deleted(int); -+ void deleted(void*); - - public: - MasterEdit(); -diff -Nur muse-0.6.2-orig/memory.h muse-0.6.2/memory.h ---- muse-0.6.2-orig/memory.h 2003-10-29 10:05:18.000000000 +0000 -+++ muse-0.6.2/memory.h 2004-06-28 23:30:01.906496190 +0000 -@@ -50,7 +50,7 @@ - { - int idx = ((n + sizeof(int) - 1) / sizeof(int)) - 1; - if (idx >= dimension) { -- printf("panic: alloc %d\n", n); -+ printf("panic: alloc %lu\n", n); - exit(-1); - } - if (head[idx] == 0) -@@ -68,7 +68,7 @@ - { - int idx = ((n + sizeof(int) - 1) / sizeof(int)) - 1; - if (idx >= dimension) { -- printf("panic: alloc %d\n", n); -+ printf("panic: alloc %lu\n", n); - exit(-1); - } - Verweis* p = static_cast<Verweis*>(b); -diff -Nur muse-0.6.2-orig/midi.cpp muse-0.6.2/midi.cpp ---- muse-0.6.2-orig/midi.cpp 2003-11-01 18:12:52.000000000 +0000 -+++ muse-0.6.2/midi.cpp 2004-06-28 23:48:57.449826762 +0000 -@@ -522,9 +522,9 @@ - MidiEvent* event = readEvent(track); - if (event == 0) - break; -- if (int(event) == -1) -+ if (long(event) == -1) - continue; -- if (int(event) == -2) // error -+ if (long(event) == -2) // error - return true; - if (lastchan == -1) { - el->add(event); // kann kein channel event sein -diff -Nur muse-0.6.2-orig/midiedit/drumedit.cpp muse-0.6.2/midiedit/drumedit.cpp ---- muse-0.6.2-orig/midiedit/drumedit.cpp 2003-10-29 10:06:08.000000000 +0000 -+++ muse-0.6.2/midiedit/drumedit.cpp 2004-06-28 23:33:26.000000000 +0000 -@@ -133,7 +133,7 @@ - _dlistWidthInit = *it; //There are only 2 values stored in the sizelist, size of dlist widget and dcanvas widget - it++; - _dcanvasWidthInit = *it; -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/midiedit/drumedit.h muse-0.6.2/midiedit/drumedit.h ---- muse-0.6.2-orig/midiedit/drumedit.h 2003-10-29 10:06:10.000000000 +0000 -+++ muse-0.6.2/midiedit/drumedit.h 2004-06-28 23:33:39.000000000 +0000 -@@ -120,7 +120,7 @@ - void dlistSelectionChanged(DrumMap*); // called by dlist - - signals: -- void deleted(int); -+ void deleted(void*); - void keyFilterChanged(int); - - public: -diff -Nur muse-0.6.2-orig/midiedit/pianoroll.cpp muse-0.6.2/midiedit/pianoroll.cpp ---- muse-0.6.2-orig/midiedit/pianoroll.cpp 2003-10-29 10:06:09.000000000 +0000 -+++ muse-0.6.2/midiedit/pianoroll.cpp 2004-06-28 23:30:56.037570909 +0000 -@@ -446,7 +446,7 @@ - - void PianoRoll::closeEvent(QCloseEvent* e) - { -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/midiedit/pianoroll.h muse-0.6.2/midiedit/pianoroll.h ---- muse-0.6.2-orig/midiedit/pianoroll.h 2003-10-29 10:06:07.000000000 +0000 -+++ muse-0.6.2/midiedit/pianoroll.h 2004-06-28 23:32:34.737301042 +0000 -@@ -108,7 +108,7 @@ - void songChanged1(int); - - signals: -- void deleted(int); -+ void deleted(void *); - - public: - PianoRoll(PartList*, QWidget* parent = 0, const char* name = 0); -diff -Nur muse-0.6.2-orig/mixer/amixer.cpp muse-0.6.2/mixer/amixer.cpp ---- muse-0.6.2-orig/mixer/amixer.cpp 2003-10-29 10:05:23.000000000 +0000 -+++ muse-0.6.2/mixer/amixer.cpp 2004-06-28 23:54:59.000000000 +0000 -@@ -753,7 +753,7 @@ - - void AudioMixerApp::closeEvent(QCloseEvent* e) - { -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/mixer/amixer.h muse-0.6.2/mixer/amixer.h ---- muse-0.6.2-orig/mixer/amixer.h 2003-10-29 10:05:24.000000000 +0000 -+++ muse-0.6.2/mixer/amixer.h 2004-06-28 23:55:11.316020930 +0000 -@@ -94,7 +94,7 @@ - void updateOutputRoute(); - - signals: -- void deleted(int); -+ void deleted(void*); - - private slots: - void heartBeat(); -diff -Nur muse-0.6.2-orig/mixer/mixer.cpp muse-0.6.2/mixer/mixer.cpp ---- muse-0.6.2-orig/mixer/mixer.cpp 2003-10-29 10:05:24.000000000 +0000 -+++ muse-0.6.2/mixer/mixer.cpp 2004-06-29 00:13:40.588266335 +0000 -@@ -226,7 +226,7 @@ - - void Mixer::closeEvent(QCloseEvent* e) - { -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/mixer/mixer.h muse-0.6.2/mixer/mixer.h ---- muse-0.6.2-orig/mixer/mixer.h 2003-10-29 10:05:23.000000000 +0000 -+++ muse-0.6.2/mixer/mixer.h 2004-06-29 00:13:52.681301128 +0000 -@@ -60,7 +60,7 @@ - void masterChanged(int val); - - signals: -- void deleted(int); -+ void deleted(void*); - void ctrlChanged(int port, int chan, int ctrl, int val); - void masterVolChanged(int val); - -diff -Nur muse-0.6.2-orig/score/score.cpp muse-0.6.2/score/score.cpp ---- muse-0.6.2-orig/score/score.cpp 2003-10-29 10:05:26.000000000 +0000 -+++ muse-0.6.2/score/score.cpp 2004-06-28 23:40:32.568460346 +0000 -@@ -360,7 +360,7 @@ - - void Score::closeEvent(QCloseEvent* e) - { -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/score/score.h muse-0.6.2/score/score.h ---- muse-0.6.2-orig/score/score.h 2003-10-29 10:05:24.000000000 +0000 -+++ muse-0.6.2/score/score.h 2004-06-28 23:41:15.037151699 +0000 -@@ -91,7 +91,7 @@ - signals: - void rasterChanged(int); - void quantChanged(int); -- void deleted(int); -+ void deleted(void*); - - public: - Score(PartList*); -diff -Nur muse-0.6.2-orig/synti/synth.cpp muse-0.6.2/synti/synth.cpp ---- muse-0.6.2-orig/synti/synth.cpp 2003-10-29 10:06:00.000000000 +0000 -+++ muse-0.6.2/synti/synth.cpp 2004-06-28 23:26:35.000000000 +0000 -@@ -334,7 +334,7 @@ - nsynthis = list->count(); - if (debugMsg) - printf("%d soft synth found\n", nsynthis); -- synthis = new (Synth*)[nsynthis]; -+ synthis = new Synth*[nsynthis]; - QFileInfoListIterator it(*list); - QFileInfo* fi; - int i = 0; -diff -Nur muse-0.6.2-orig/track.cpp muse-0.6.2/track.cpp ---- muse-0.6.2-orig/track.cpp 2003-10-29 22:14:12.000000000 +0000 -+++ muse-0.6.2/track.cpp 2004-06-28 23:49:48.000000000 +0000 -@@ -95,7 +95,7 @@ - - void Track::dump() const - { -- printf("Track <%s>: typ %d, parts %d sel %d\n", -+ printf("Track <%s>: typ %d, parts %lu sel %d\n", - _name.latin1(), _type, _parts.size(), _selected); - } - -diff -Nur muse-0.6.2-orig/waveedit/waveedit.cpp muse-0.6.2/waveedit/waveedit.cpp ---- muse-0.6.2-orig/waveedit/waveedit.cpp 2003-10-29 10:06:14.000000000 +0000 -+++ muse-0.6.2/waveedit/waveedit.cpp 2004-06-29 00:13:17.236061212 +0000 -@@ -57,7 +57,7 @@ - - void WaveEdit::closeEvent(QCloseEvent* e) - { -- emit deleted((int)this); -+ emit deleted(this); - e->accept(); - } - -diff -Nur muse-0.6.2-orig/waveedit/waveedit.h muse-0.6.2/waveedit/waveedit.h ---- muse-0.6.2-orig/waveedit/waveedit.h 2003-10-29 10:06:14.000000000 +0000 -+++ muse-0.6.2/waveedit/waveedit.h 2004-06-29 00:13:30.436915997 +0000 -@@ -48,7 +48,7 @@ - void soloChanged(bool flag); - - signals: -- void deleted(int); -+ void deleted(void*); - - public: - WaveEdit(PartList*); - diff --git a/media-sound/museseq/files/museseq-0.6.2-memory.patch b/media-sound/museseq/files/museseq-0.6.2-memory.patch deleted file mode 100644 index c111feeb11d0..000000000000 --- a/media-sound/museseq/files/museseq-0.6.2-memory.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naur muse-0.6.2-orig/memory.cpp muse-0.6.2/memory.cpp ---- muse-0.6.2-orig/memory.cpp 2003-10-29 10:04:59.000000000 +0000 -+++ muse-0.6.2/memory.cpp 2004-06-29 18:52:16.634314333 +0000 -@@ -45,7 +45,7 @@ - - void Pool::grow(int idx) - { -- int esize = (idx+1) * sizeof(int); -+ int esize = (idx+1) * sizeof(void*); //just guessing here - - Chunk* n = new Chunk; - n->next = chunks[idx]; -diff -Naur muse-0.6.2-orig/memory.h muse-0.6.2/memory.h ---- muse-0.6.2-orig/memory.h 2004-06-29 18:54:53.416816939 +0000 -+++ muse-0.6.2/memory.h 2004-06-29 18:53:55.567225085 +0000 -@@ -24,11 +24,11 @@ - Verweis* next; - }; - struct Chunk { -- enum { size = 4 * 1024 }; -+ enum { size = sizeof(void*) * 1024 }; - Chunk* next; - char mem[size]; - }; -- enum { dimension = 8 }; -+ enum { dimension = 4*sizeof(void*) }; //maybe 2*sizeof(void*) was meant .. nobody knows - Chunk* chunks[dimension]; - Verweis* head[dimension]; - Pool(Pool&); -@@ -48,10 +48,10 @@ - - inline void* Pool::alloc(size_t n) - { -- int idx = ((n + sizeof(int) - 1) / sizeof(int)) - 1; -+ int idx = ((n + sizeof(void*) - 1) / sizeof(void*)) - 1; // what does that formular mean? - if (idx >= dimension) { -- printf("panic: alloc %lu\n", n); -- exit(-1); -+ printf("Using std-allocator %lu characters requested",n); -+ return ::operator new(n); - } - if (head[idx] == 0) - grow(idx); -@@ -66,10 +66,10 @@ - - inline void Pool::free(void* b, size_t n) - { -- int idx = ((n + sizeof(int) - 1) / sizeof(int)) - 1; -+ int idx = ((n + sizeof(void*) - 1) / sizeof(void*)) - 1; - if (idx >= dimension) { -- printf("panic: alloc %lu\n", n); -- exit(-1); -+ printf("Using std-deallocator %lu characters to be freed",n); -+ return ::operator delete(b); - } - Verweis* p = static_cast<Verweis*>(b); - p->next = head[idx]; - diff --git a/media-sound/museseq/files/museseq-0.7.2_pre5-rtctimerfix.patch b/media-sound/museseq/files/museseq-0.7.2_pre5-rtctimerfix.patch deleted file mode 100644 index 2def593c2ff7..000000000000 --- a/media-sound/museseq/files/museseq-0.7.2_pre5-rtctimerfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru muse-0.7.2pre5.orig/muse/driver/rtctimer.cpp muse-0.7.2pre5/muse/driver/rtctimer.cpp ---- muse-0.7.2pre5.orig/muse/driver/rtctimer.cpp 2006-01-13 21:07:29.000000000 +0100 -+++ muse-0.7.2pre5/muse/driver/rtctimer.cpp 2006-01-13 21:09:49.000000000 +0100 -@@ -141,7 +141,7 @@ - { - if(TIMER_DEBUG) - printf("getTimerTicks()\n"); -- unsigned int nn; -+ unsigned long nn; - if (timerFd==-1) { - fprintf(stderr,"RtcTimer::getTimerTicks(): no RTC open to read!\n"); - return 0; diff --git a/media-sound/museseq/museseq-0.6.2-r1.ebuild b/media-sound/museseq/museseq-0.6.2-r1.ebuild deleted file mode 100644 index 1338c6b0d8e4..000000000000 --- a/media-sound/museseq/museseq-0.6.2-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.6.2-r1.ebuild,v 1.15 2008/01/14 17:02:18 chainsaw Exp $ - -IUSE="jack fluidsynth ladcca doc alsa" - -inherit virtualx eutils kde-functions - -MY_P=muse-${PV} -DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)" -HOMEPAGE="http://www.muse-sequencer.org/" -SRC_URI="mirror://sourceforge/lmuse/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 amd64 ~sparc" - -DEPEND="alsa? ( media-libs/alsa-lib ) - >=media-libs/libsndfile-1.0.4 - $(qt_min_version 3.1) - ladcca? ( >=media-libs/ladcca-0.4.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - fluidsynth? ( media-sound/fluidsynth ) - doc? ( app-text/openjade - app-text/docbook-dsssl-stylesheets )" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i "s/HAVE_JACK_JACK_H/HAVE_JACK/" widgets/audioconf.cpp - sed -i "/#include <alsa\\/asoundlib.h>/i\\#define ALSA_PCM_OLD_HW_PARAMS_API 1\\" driver/alsaaudio.cpp - epatch "${FILESDIR}/${P}-fPIC.patch" - epatch "${FILESDIR}/${P}-int2ptr.patch" - epatch "${FILESDIR}/${P}-memory.patch" - epatch "${FILESDIR}/${P}-drumport.patch" - epatch "${FILESDIR}/${P}-gcc34.patch" -} - -src_compile() { - local myconf - myconf="--disable-suid-build" - use ladcca || myconf="${myconf} --disable-ladcca" - use jack || myconf="${myconf} --disable-jack" - use fluidsynth || myconf="${myconf} --disable-fluidsynth" - if use doc ; then - # bug 49381 - local stylesheets="$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*)" - myconf="${myconf} --with-docbook-stylesheets=${stylesheets}" - fi - Xeconf "${myconf}" || die "configure failed" - - ### borrowed from kde.eclass # - # - # fix the sandbox errors "can't writ to .kde or .qt" problems. - # this is a fake homedir that is writeable under the sandbox, - # so that the build process can do anything it wants with it. - REALHOME="$HOME" - mkdir -p "$T/fakehome/.kde" - mkdir -p "$T/fakehome/.qt" - export HOME="$T/fakehome" - #addwrite "${QTDIR}/etc/settings" - # commented this out, proper fix is need-qt 3 from - # kde-functions. - # Danny van Dyk <kugelfang@gentoo.org> 2004/05/26 - - # things that should access the real homedir - [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/" - - # Allow access to /dev/dri/card* - addpredict /dev/dri/card* - - emake || die - use doc && ( cd doc ; make manual ) -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc README README.softsynth SECURITY TODO - - mv "${D}/usr/share/muse/html" "${D}/usr/share/doc/${PF}/html" - dosym "/usr/share/doc/${PF}/html" /usr/share/muse/html - use doc && dohtml doc/* - - # Name conflict with media-sound/muse. See bug #34973 - mv "${D}/usr/bin/muse" "${D}/usr/bin/lmuse" - if [ ! -f /usr/bin/muse -o -L /usr/bin/muse ]; then - dosym /usr/bin/lmuse /usr/bin/muse - fi -} - -pkg_postinst() { - elog - elog "Muse has been installed normally. If," - elog "you would like to use muse with real time" - elog "time capabilities for the sequencer then do" - elog "chmod 4755 /usr/bin/lmuse" - elog - elog "Muse can use /dev/rtc if it is compiled in" - elog "to your kernel, or available as a module." - elog -} diff --git a/media-sound/museseq/museseq-0.7.1.ebuild b/media-sound/museseq/museseq-0.7.1.ebuild deleted file mode 100644 index e1a4089553c1..000000000000 --- a/media-sound/museseq/museseq-0.7.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.7.1.ebuild,v 1.10 2008/01/14 17:02:18 chainsaw Exp $ - -inherit kde-functions virtualx eutils toolchain-funcs - -MY_P=${P/museseq/muse} -MY_P=${MY_P/_/} - -DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)" -SRC_URI="mirror://sourceforge/lmuse/${MY_P}fixed.tar.bz2" -HOMEPAGE="http://www.muse-sequencer.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" -IUSE="alsa doc ladcca debug" - -DEPEND="$(qt_min_version 3.2) - alsa? ( media-libs/alsa-lib ) - media-sound/fluidsynth - doc? ( app-text/openjade - app-doc/doxygen - media-gfx/graphviz ) - dev-lang/perl - >=media-libs/libsndfile-1.0.1 - >=media-libs/libsamplerate-0.1.0 - >=media-sound/jack-audio-connection-kit-0.98.0 - ladcca? ( >=media-libs/ladcca-0.4.0 )" - -src_compile() { - cd "${WORKDIR}/${MY_P}" - local myconf - myconf="--disable-suid-build" # instead, use CONFIG_RTC and realtime-lsm - use ladcca || myconf="${myconf} --disable-ladcca" - use debug && myconf="${myconf} --enable-debug" - - export LD="$(tc-getLD)" - Xeconf "${myconf}" || die "configure failed" - - emake || die -} - -src_install() { - cd "${WORKDIR}/${MY_P}" - make DESTDIR="${D}" install || die "install failed" - dodoc AUTHORS ChangeLog NEWS README SECURITY README.* - mv "${D}/usr/bin/muse" "${D}/usr/bin/museseq" -} - -pkg_postinst() { - elog "You must have the realtime module loaded to use MusE 0.7.x" - elog "Additionally, configure your Linux Kernel for non-generic" - elog "Real Time Clock support enabled or loaded as a module." - elog "User must have read/write access to /dev/misc/rtc device." - elog "Realtime LSM: http://sourceforge.net/projects/realtime-lsm/" -} diff --git a/media-sound/museseq/museseq-0.7.2_pre5.ebuild b/media-sound/museseq/museseq-0.7.2_pre5.ebuild deleted file mode 100644 index 32d5ebc0e70c..000000000000 --- a/media-sound/museseq/museseq-0.7.2_pre5.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.7.2_pre5.ebuild,v 1.6 2008/01/14 17:02:18 chainsaw Exp $ - -inherit kde-functions virtualx eutils - -MY_P=${P/museseq/muse} -MY_P=${MY_P/_/} - -DESCRIPTION="MusE is a MIDI/Audio sequencer with recording and editing capabilities" -SRC_URI="mirror://sourceforge/lmuse/${MY_P}.tar.gz" -HOMEPAGE="http://www.muse-sequencer.org/" - -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="doc ladcca debug" - -DEPEND="$(qt_min_version 3.2) - >=media-libs/alsa-lib-0.9.0 - media-sound/fluidsynth - doc? ( app-text/openjade - app-doc/doxygen - media-gfx/graphviz ) - dev-lang/perl - >=media-libs/libsndfile-1.0.1 - >=media-libs/libsamplerate-0.1.0 - >=media-sound/jack-audio-connection-kit-0.98.0 - ladcca? ( >=media-libs/ladcca-0.4.0 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-rtctimerfix.patch" -} - -src_compile() { - cd "${WORKDIR}/${MY_P}" - local myconf - myconf="--disable-suid-build" # instead, use CONFIG_RTC and realtime-lsm - use ladcca || myconf="${myconf} --disable-ladcca" - use debug && myconf="${myconf} --enable-debug" - Xeconf ${myconf} || die "configure failed" - - emake || die -} - -src_install() { - cd "${WORKDIR}/${MY_P}" - make DESTDIR="${D}" install || die "install failed" - dodoc AUTHORS ChangeLog NEWS README SECURITY README.* - mv "${D}/usr/bin/muse" "${D}/usr/bin/museseq" -} - -pkg_postinst() { - elog "You must have the realtime module loaded to use MusE 0.7.x" - elog "Additionally, configure your Linux Kernel for non-generic" - elog "Real Time Clock support enabled or loaded as a module." - elog "User must have read/write access to /dev/misc/rtc device." - elog "Realtime LSM: http://sourceforge.net/projects/realtime-lsm/" -} |