Index: head/audio/spiralsynth/Makefile =================================================================== --- head/audio/spiralsynth/Makefile (revision 100493) +++ head/audio/spiralsynth/Makefile (revision 100494) @@ -1,88 +1,93 @@ # New ports collection makefile for: spiralsynth # Date created: 2000-09-05 # Whom: Trevor Johnson # # $FreeBSD$ # PORTNAME= spiralsynth PORTVERSION= 0.1.7 CATEGORIES= audio MASTER_SITES= http://www.pawfal.org/SpiralSynth/dload/ DISTNAME= SpiralSynth-${PORTVERSION} MAINTAINER= trevor@FreeBSD.org COMMENT= MIDI-capable synthesizer for X LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk GNU_CONFIGURE= yes MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PLIST= ${WRKDIR}/pkg-plist USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/${DISTNAME} DOC_FILES= CHANGES COPYING README -.include - -.if ${OSVERSION} > 500112 -BROKEN= "errors in linking" -USE_GCC= 2.95 -.endif - post-patch: -.for ii in Makefile.in PluginLink.sh SpiralSound/Output.h +.for ii in \ + Makefile.in \ + PluginLink.sh \ + SpiralInfo.C \ + SpiralSound/Midi.h \ + SpiralSound/Output.h \ + SpiralSound/SpiralInfo.h \ + SpiralSound/Synth.C \ + SpiralSound/Synth.h \ + SpiralSound/_SynthInfo.C \ + Synth.h ${MV} ${WRKSRC}/${ii} ${WRKSRC}/${ii}.orig ${SED} -e 's|-O3|${PTHREAD_CFLAGS}|g ; \ s|CC =|CC? =|g ; \ s|CFLAGS =|CFLAGS +=|g ; \ s|CXX =|CXX? =|g ; \ s|CXXFLAGS=|CXXFLAGS+=|g ; \ s|LINK = g++|LINK = ${CXX}|g ; \ s|-lm|${PTHREAD_LIBS} -lm|g ; \ s|/usr/X11R6|${X11BASE}|g ; \ + s|iostream.h|iostream|g ;\ + s|||g ;\ s|machine/soundcard|sys/soundcard|g' \ < ${WRKSRC}/${ii}.orig \ > ${WRKSRC}/${ii} .endfor # Use as a plugin to SpiralLoops 2.0.0 results in "Can't open audio driver." .if defined(PLUGIN) ${MV} ${WRKSRC}/Synth.C ${WRKSRC}/Synth.C.orig ${SED} -e 's|^//#define PLUGIN|#define PLUGIN|g' \ < ${WRKSRC}/Synth.C.orig > ${WRKSRC}/Synth.C post-build: cd ${WRKSRC}; ${SH} ./PluginLink.sh .endif # defined(PLUGIN) pre-install: .if defined(PLUGIN) ${ECHO_CMD} lib/SpiralSynth.so > ${PLIST} .else ${ECHO_CMD} bin/SpiralSynth > ${PLIST} .endif .if !defined(NOPORTDOCS) .for ii in ${DOC_FILES} ${ECHO_CMD} share/doc/spiralsynth/${ii} >> ${PLIST} .endfor ${ECHO_CMD} @dirrm share/doc/spiralsynth >> ${PLIST} .endif do-install: .if defined(PLUGIN) ${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth.so ${PREFIX}/lib .else ${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth ${PREFIX}/bin .endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for ii in ${DOC_FILES} ${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR} .endfor .endif -.include +.include Property changes on: head/audio/spiralsynth/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.17 \ No newline at end of property +1.18 \ No newline at end of property Index: head/audio/spiralsynth/files/patch-GUI_MixerGUI.C =================================================================== --- head/audio/spiralsynth/files/patch-GUI_MixerGUI.C (nonexistent) +++ head/audio/spiralsynth/files/patch-GUI_MixerGUI.C (revision 100494) @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- GUI/MixerGUI.C.orig Sun Nov 26 15:52:40 2000 ++++ GUI/MixerGUI.C Mon Feb 9 12:08:25 2004 +@@ -24,8 +24,10 @@ MixerGUI::MixerGUI(Mixer *o) + if (!m_mix) cerr<<"WARNING: Mixer not correctly set up"<type(1); + o->box(FL_UP_BOX); Property changes on: head/audio/spiralsynth/files/patch-GUI_MixerGUI.C ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/audio/spiralsynth/files/patch-GUI_OutputGUI.C =================================================================== --- head/audio/spiralsynth/files/patch-GUI_OutputGUI.C (nonexistent) +++ head/audio/spiralsynth/files/patch-GUI_OutputGUI.C (revision 100494) @@ -0,0 +1,16 @@ +$FreeBSD$ + +--- GUI/OutputGUI.C.orig Sun Nov 26 15:52:39 2000 ++++ GUI/OutputGUI.C Mon Feb 9 12:10:10 2004 +@@ -26,8 +26,10 @@ OutputGUI::OutputGUI(Output *o) + if (!m_out) cerr<<"WARNING: Output not correctly set up"<type(1); + o->box(FL_UP_BOX); Property changes on: head/audio/spiralsynth/files/patch-GUI_OutputGUI.C ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/audio/spiralsynth/files/patch-GUI_ScopeGUI.C =================================================================== --- head/audio/spiralsynth/files/patch-GUI_ScopeGUI.C (nonexistent) +++ head/audio/spiralsynth/files/patch-GUI_ScopeGUI.C (revision 100494) @@ -0,0 +1,27 @@ +$FreeBSD$ + +--- GUI/ScopeGUI.C.orig Sun Nov 26 15:52:39 2000 ++++ GUI/ScopeGUI.C Mon Feb 9 12:14:00 2004 +@@ -22,8 +22,8 @@ + + #include + +-ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l=0) : +-Fl_Widget(x,y,w,h,l) ++ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l) : ++Fl_Widget(x,y,w,h,0) + { + } + +@@ -53,8 +53,10 @@ 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) + { ++ xoff=0; ++ yoff=0; + Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 225, 110, name); + o->type(1); + o->box(FL_UP_BOX); Property changes on: head/audio/spiralsynth/files/patch-GUI_ScopeGUI.C ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx =================================================================== --- head/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx (nonexistent) +++ head/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx (revision 100494) @@ -0,0 +1,23 @@ +$FreeBSD$ + +--- GUI/Widgets/Fl_Knob.cxx.orig Mon Sep 11 19:52:03 2000 ++++ GUI/Widgets/Fl_Knob.cxx Mon Feb 9 13:22:13 2004 +@@ -4,7 +4,7 @@ + #include + #include + +-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,0) { + a1 = 35; + a2 = 325; + _type = DOTLIN; +@@ -40,7 +40,8 @@ unsigned char rr,gg,bb; + int dam = damage(); + if (dam & FL_DAMAGE_ALL) + { +- int col = parent()->color(); ++// int col = parent()->color(); ++ int col = FL_BLACK; + fl_color(col); + fl_rectf(ox,oy,side,side); + Fl::get_color((Fl_Color)col,rr,gg,bb); Property changes on: head/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/audio/spiralsynth/files/patch-SpiralInfo.C =================================================================== --- head/audio/spiralsynth/files/patch-SpiralInfo.C (nonexistent) +++ head/audio/spiralsynth/files/patch-SpiralInfo.C (revision 100494) @@ -0,0 +1,14 @@ +--- SpiralInfo.C.orig Mon Feb 9 13:26:01 2004 ++++ SpiralInfo.C Mon Feb 9 13:26:59 2004 +@@ -22,8 +22,10 @@ + + #include "SpiralSound/SpiralInfo.h" + +-float RandFloat(float s=0.0f, float e=1.0f) ++float RandFloat(float s, float e) + { ++ s=0.0f; ++ e=1.0f; + return s+((rand()%10000/10000.0)*(e-s)); + } + Property changes on: head/audio/spiralsynth/files/patch-SpiralInfo.C ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h =================================================================== --- head/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h (nonexistent) +++ head/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h (revision 100494) @@ -0,0 +1,12 @@ +$FreeBSD$ + +--- SpiralSound/RiffWav.h.orig Sun Nov 26 15:52:45 2000 ++++ SpiralSound/RiffWav.h Mon Feb 9 12:05:58 2004 +@@ -17,6 +17,7 @@ + */ + + #include ++using namespace std; + + #ifndef WAVFILE + #define WAVFILE Property changes on: head/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h =================================================================== --- head/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h (nonexistent) +++ head/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h (revision 100494) @@ -0,0 +1,12 @@ +$FreeBSD$ + +--- SpiralSound/SpiralInfo.h.orig Sun Nov 26 15:52:46 2000 ++++ SpiralSound/SpiralInfo.h Mon Feb 9 13:31:38 2004 +@@ -19,6 +19,7 @@ + #include + #include + #include ++using namespace std; + + #ifndef SpiralINFO + #define SpiralINFO Property changes on: head/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property