summaryrefslogtreecommitdiff
path: root/audio/spiralsynth
diff options
context:
space:
mode:
authorben <ben@pkgsrc.org>2004-11-25 17:24:27 +0000
committerben <ben@pkgsrc.org>2004-11-25 17:24:27 +0000
commit60531e216ec963da25902b70f3ea9e5e7c6e15eb (patch)
tree41e3400671c88f39e842983e640c4b9826478a24 /audio/spiralsynth
parent4715245f8a1b205bcfe785cd7b84dda63fc39f5c (diff)
downloadpkgsrc-60531e216ec963da25902b70f3ea9e5e7c6e15eb.tar.gz
Update SpiralSynth to version 2.0.0. Notable changes include:
* Totally replaced audio core code with SSM plugin code, modified for static linking. * Uses 32bit floating point format internally. * New midi device handling. * New OSS output code. * New funky sliders. * Updated for fltk 1.1.0
Diffstat (limited to 'audio/spiralsynth')
-rw-r--r--audio/spiralsynth/Makefile8
-rw-r--r--audio/spiralsynth/distinfo23
-rw-r--r--audio/spiralsynth/patches/patch-aa20
-rw-r--r--audio/spiralsynth/patches/patch-ab8
-rw-r--r--audio/spiralsynth/patches/patch-ad6
-rw-r--r--audio/spiralsynth/patches/patch-af12
-rw-r--r--audio/spiralsynth/patches/patch-ag6
-rw-r--r--audio/spiralsynth/patches/patch-ah15
-rw-r--r--audio/spiralsynth/patches/patch-ak9
-rw-r--r--audio/spiralsynth/patches/patch-al12
-rw-r--r--audio/spiralsynth/patches/patch-am14
-rw-r--r--audio/spiralsynth/patches/patch-an16
12 files changed, 93 insertions, 56 deletions
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index dfb92ca03b8..4672049efb3 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:09 tv Exp $
+# $NetBSD: Makefile,v 1.15 2004/11/25 17:24:27 ben Exp $
#
-DISTNAME= SpiralSynth-0.1.7
-PKGNAME= spiralsynth-0.1.7
-PKGREVISION= 2
+DISTNAME= SpiralSynth-2.0.0
+PKGNAME= spiralsynth-2.0.0
CATEGORIES= audio
MASTER_SITES= http://www.pawfal.org/Software/SpiralSynth/dload/
@@ -32,4 +31,5 @@ do-install:
.include "../../x11/fltk/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo
index 652a71b8e90..f1ce8fef71c 100644
--- a/audio/spiralsynth/distinfo
+++ b/audio/spiralsynth/distinfo
@@ -1,14 +1,17 @@
-$NetBSD: distinfo,v 1.6 2004/02/15 06:00:57 ben Exp $
+$NetBSD: distinfo,v 1.7 2004/11/25 17:24:27 ben Exp $
-SHA1 (SpiralSynth-0.1.7.tar.gz) = 8b66749b940c9dcfcd4a71c319ac233139014204
-Size (SpiralSynth-0.1.7.tar.gz) = 62393 bytes
-SHA1 (patch-aa) = f2c61de20ca47da2f64d4c8f78491519a7f0b94d
-SHA1 (patch-ab) = b107fccc27b3ec1e115b93aacc216b472070b792
-SHA1 (patch-ad) = 207bc32f2991f99ba2e907a417d127f0073b3d24
+SHA1 (SpiralSynth-2.0.0.tar.gz) = ea42c5b7710237139f5281cf0c4ca155c184c4cd
+Size (SpiralSynth-2.0.0.tar.gz) = 66263 bytes
+SHA1 (patch-aa) = 4555f5a2d61980d1a19c7fdddaf3671ef86ea9ef
+SHA1 (patch-ab) = 49ea69a000b68c3c6ec07fefa9f1e2a415abb0f0
+SHA1 (patch-ad) = 235afa6618c5ec5aef2ca3448388f11757918832
SHA1 (patch-ae) = b0c36c839504ecef6c781609ebd9fef266249645
-SHA1 (patch-af) = beb35f52d7bf1facfa8fab41889fc099b55a3517
-SHA1 (patch-ag) = 87457e618774f8cf7c0d81022d14533a72203099
-SHA1 (patch-ah) = d9cc36844c1bcec3fee953108aacb01ee198fe13
+SHA1 (patch-af) = 88d1a457ad82184a1d5f34e3f56de2d8fb7daf89
+SHA1 (patch-ag) = fab78772ee8b451f60b69597c9844e7c6aae465c
+SHA1 (patch-ah) = d2ff3c4ddd4da9c96a74c3f898aa3429dcc51bb9
SHA1 (patch-ai) = e21a111e3e52fc3c24433f248fa1bfdf566e72dd
SHA1 (patch-aj) = 7e3e29fbfd38428d68f195db8a7f5007c1417c88
-SHA1 (patch-ak) = b50863f27c2efd5f879cb8d8462b57059e65842f
+SHA1 (patch-ak) = 67643c5abea0498f8ea046c5abd52f2d328a5538
+SHA1 (patch-al) = 7436bce933cbddcd4f869ab2cbbe27762d4273e5
+SHA1 (patch-am) = 4899c78015028a6e8047e5527362646e40a10708
+SHA1 (patch-an) = b99c57cd7aa4d5c95bbeffea6c992e9cd7b7c414
diff --git a/audio/spiralsynth/patches/patch-aa b/audio/spiralsynth/patches/patch-aa
index e7d03d95a75..9e4f155f68d 100644
--- a/audio/spiralsynth/patches/patch-aa
+++ b/audio/spiralsynth/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.4 2003/07/22 20:43:04 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2004/11/25 17:24:27 ben Exp $
---- Makefile.in.orig Sun Nov 26 08:06:47 2000
+--- Makefile.in.orig Thu Jun 13 14:56:01 2002
+++ Makefile.in
@@ -9,12 +9,12 @@
CC = gcc
CXX = g++
--CFLAGS = -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused
--CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused
+-CFLAGS = -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -g
+-CXXFLAGS= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused -g
-INCPATH = -I/usr/X11R6/include
-LINK = g++
-+CFLAGS += -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused
-+CXXFLAGS+= -pipe -Wall -O3 -ffast-math -DNO_DEBUG -Wno-unused
-+INCPATH =
++CFLAGS+= -pipe -Wall -DNO_DEBUG -Wno-unused -g
++CXXFLAGS+= -pipe -Wall -DNO_DEBUG -Wno-unused -g
++INCPATH =
+LINK = g++ ${LDFLAGS}
LFLAGS =
--LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm
-+LIBS = -lfltk -lGL -lXext -lX11 -lm ${LIBOSSAUDIO}
+-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -lpthread
++LIBS = -lfltk -lGL -lXext -lX11 -lm -lpthread ${LIBOSSAUDIO}
MOC = moc
+ UIC =
- TAR = tar -cf
diff --git a/audio/spiralsynth/patches/patch-ab b/audio/spiralsynth/patches/patch-ab
index 38edefe8f6d..2a1faa5055e 100644
--- a/audio/spiralsynth/patches/patch-ab
+++ b/audio/spiralsynth/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2003/12/19 16:48:06 ben Exp $
+$NetBSD: patch-ab,v 1.4 2004/11/25 17:24:27 ben Exp $
---- SpiralInfo.C.orig 2000-11-26 07:52:43.000000000 -0800
+--- SpiralInfo.C.orig Sun Jun 2 08:44:31 2002
+++ SpiralInfo.C
@@ -22,7 +22,7 @@
@@ -11,8 +11,8 @@ $NetBSD: patch-ab,v 1.3 2003/12/19 16:48:06 ben Exp $
{
return s+((rand()%10000/10000.0)*(e-s));
}
-@@ -41,7 +41,7 @@ long SpiralInfo::MAXSAMPLE = 32767;
- float SpiralInfo::VALUECONV = 1.0f/MAXSAMPLE;
+@@ -42,7 +42,7 @@ int SpiralInfo::SAMPLERATE = 44100;
+ float SpiralInfo::MAXSAMPLE = 1.0f;
bool SpiralInfo::WANTMIDI = true;
int SpiralInfo::FILTERGRAN = 50;
-string SpiralInfo::OUTPUTFILE = "/dev/dsp";
diff --git a/audio/spiralsynth/patches/patch-ad b/audio/spiralsynth/patches/patch-ad
index 85098262505..a9774e10a9e 100644
--- a/audio/spiralsynth/patches/patch-ad
+++ b/audio/spiralsynth/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/26 01:14:27 rh Exp $
+$NetBSD: patch-ad,v 1.2 2004/11/25 17:24:27 ben Exp $
---- SpiralSound/Output.h.orig Sun Nov 26 07:52:46 2000
+--- SpiralSound/Output.h.orig Sun Jun 2 03:39:03 2002
+++ SpiralSound/Output.h
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -22,4 +22,4 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/05/26 01:14:27 rh Exp $
-#include <sys/ioctl.h>
#include <limits.h>
- #include "SpiralInfo.h"
+ #include "Sample.h"
diff --git a/audio/spiralsynth/patches/patch-af b/audio/spiralsynth/patches/patch-af
index f36060bf034..9879f910b79 100644
--- a/audio/spiralsynth/patches/patch-af
+++ b/audio/spiralsynth/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2003/12/19 16:48:06 ben Exp $
+$NetBSD: patch-af,v 1.2 2004/11/25 17:24:27 ben Exp $
---- GUI/ScopeGUI.C.orig 2000-11-26 07:52:39.000000000 -0800
+--- GUI/ScopeGUI.C.orig Tue Jun 4 06:27:30 2002
+++ GUI/ScopeGUI.C
@@ -22,7 +22,7 @@
@@ -8,15 +8,15 @@ $NetBSD: patch-af,v 1.1 2003/12/19 16:48:06 ben Exp $
-ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l=0) :
+ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l) :
- Fl_Widget(x,y,w,h,l)
+ Fl_Widget(x,y,w,h,l),
+ m_Data(NULL)
{
- }
-@@ -53,7 +53,7 @@ void ScopeGUI::Display(short *data)
+@@ -54,7 +54,7 @@ void ScopeGUI::Display(short *data)
if (!m_Bypass) m_Scope->redraw();
}
-void ScopeGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
+void ScopeGUI::CreateGUI(int xoff, int yoff, char *name)
{
- Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 225, 110, name);
+ Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 220, 110, name);
o->type(1);
diff --git a/audio/spiralsynth/patches/patch-ag b/audio/spiralsynth/patches/patch-ag
index 7e4a7a29d7e..b2996615ec4 100644
--- a/audio/spiralsynth/patches/patch-ag
+++ b/audio/spiralsynth/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2003/12/19 16:48:06 ben Exp $
+$NetBSD: patch-ag,v 1.2 2004/11/25 17:24:27 ben Exp $
---- GUI/OutputGUI.C.orig 2000-11-26 07:52:39.000000000 -0800
+--- GUI/OutputGUI.C.orig Sun Jun 2 14:36:16 2002
+++ GUI/OutputGUI.C
-@@ -26,7 +26,7 @@ OutputGUI::OutputGUI(Output *o)
+@@ -26,7 +26,7 @@ OutputGUI::OutputGUI(OSSOutput *o)
if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;
}
diff --git a/audio/spiralsynth/patches/patch-ah b/audio/spiralsynth/patches/patch-ah
index e4c74e53f16..6f70e7a4942 100644
--- a/audio/spiralsynth/patches/patch-ah
+++ b/audio/spiralsynth/patches/patch-ah
@@ -1,17 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2004/02/15 06:00:57 ben Exp $
+$NetBSD: patch-ah,v 1.3 2004/11/25 17:24:27 ben Exp $
---- GUI/Widgets/Fl_Knob.cxx.orig 2000-09-11 12:52:03.000000000 -0700
+--- GUI/Widgets/Fl_Knob.cxx.orig Sun Jun 2 03:23:34 2002
+++ GUI/Widgets/Fl_Knob.cxx
-@@ -4,7 +4,7 @@
- #include <FL/fl_draw.H>
- #include <math.h>
-
--Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l=0): Fl_Valuator(xx,yy,ww,hh,l) {
-+Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l): Fl_Valuator(xx,yy,ww,hh,l) {
- a1 = 35;
- a2 = 325;
- _type = DOTLIN;
-@@ -40,7 +40,7 @@ unsigned char rr,gg,bb;
+@@ -41,7 +41,7 @@ unsigned char rr,gg,bb;
int dam = damage();
if (dam & FL_DAMAGE_ALL)
{
diff --git a/audio/spiralsynth/patches/patch-ak b/audio/spiralsynth/patches/patch-ak
index ccf9b2bbf19..021867633f8 100644
--- a/audio/spiralsynth/patches/patch-ak
+++ b/audio/spiralsynth/patches/patch-ak
@@ -1,11 +1,12 @@
-$NetBSD: patch-ak,v 1.1 2004/02/15 06:00:26 ben Exp $
+$NetBSD: patch-ak,v 1.2 2004/11/25 17:24:27 ben Exp $
---- SpiralSound/Oscillator.C.orig 2000-11-26 07:52:41.000000000 -0800
+--- SpiralSound/Oscillator.C.orig Wed Jun 5 15:44:40 2002
+++ SpiralSound/Oscillator.C
-@@ -37,6 +37,8 @@ m_ModAmount(0.01f)
+@@ -39,7 +39,8 @@ m_SHModBuf(NULL)
m_Note=new int[SpiralInfo::POLY];
m_LastFreq=new float[SpiralInfo::POLY];
- m_Volume=new char[SpiralInfo::POLY];
+ m_Volume=new float[SpiralInfo::POLY];
+-
+ m_FreqModBuf = 0; /* initialize to avoid risk of coredump */
+ m_PulseWidthModBuf = 0; /* initialize to avoid risk of coredump */
diff --git a/audio/spiralsynth/patches/patch-al b/audio/spiralsynth/patches/patch-al
new file mode 100644
index 00000000000..e5eddc1018d
--- /dev/null
+++ b/audio/spiralsynth/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2004/11/25 17:24:27 ben Exp $
+
+--- SpiralSound/Midi.h.orig Sun Jun 2 03:28:09 2002
++++ SpiralSound/Midi.h
+@@ -24,6 +24,7 @@
+ #include <limits.h>
+ #include <queue>
+ #include <string>
++#include <pthread.h>
+
+ #ifndef MIDI
+ #define MIDI
diff --git a/audio/spiralsynth/patches/patch-am b/audio/spiralsynth/patches/patch-am
new file mode 100644
index 00000000000..4b6610bbf5c
--- /dev/null
+++ b/audio/spiralsynth/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.1 2004/11/25 17:24:27 ben Exp $
+
+--- SpiralSound/Output.C.orig Sun Jun 2 13:58:06 2002
++++ SpiralSound/Output.C
+@@ -20,6 +20,9 @@
+ #define _ISOC99_SOURCE 1
+ #include <math.h>
+ #include "Output.h"
++#ifndef lrintf
++#define lrintf(x) ((long)rintf(x))
++#endif
+
+ #define CHECK_AND_REPORT_ERROR if (result<0) \
+ { \
diff --git a/audio/spiralsynth/patches/patch-an b/audio/spiralsynth/patches/patch-an
new file mode 100644
index 00000000000..147a1be3180
--- /dev/null
+++ b/audio/spiralsynth/patches/patch-an
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.1 2004/11/25 17:24:27 ben Exp $
+
+--- SpiralSound/Midi.C.orig Tue Jun 11 15:08:56 2002
++++ SpiralSound/Midi.C
+@@ -174,7 +174,10 @@ void MidiDevice::SendEvent(int Device,co
+ void MidiDevice::ReadByte(unsigned char *c)
+ {
+ *c=MIDI_CLOCK;
+- do read(m_MidiFd,c,1);
++ do {
++ read(m_MidiFd,c,1);
++ sched_yield();
++ }
+ while (*c>=STATUS_END);
+ }
+