Attachment #72804 for bug #105744

View | Details | Raw Unified | Return to bug 105744
Collapse All | Expand All

Lines 27-36 Link Here

(-)/home/trasz/spiralloops/Makefile (-4 lines)
27		27
28	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
29		29
30	.if ${OSVERSION} >= 500113
31	BROKEN= Does not compile (bad C++ code)
32	.endif
33
34	post-patch:	30	post-patch:
35	${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.orig	31	${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.orig
36	${SED} -E "s:-ldl::g; \	32	${SED} -E "s:-ldl::g; \

Lines 1-8 Link Here

(-)/home/trasz/spiralloops/files/patch-Fl_LED_Button.cxx (-5 / +12 lines)
1	patch by Stephen Paskaluk to enable compilation with fltk 1.1.2	1	--- GUI/Widgets/Fl_LED_Button.cxx.orig Thu Apr 19 22:48:11 2001
2		2	+++ GUI/Widgets/Fl_LED_Button.cxx Wed Nov 22 13:16:40 2006
3	--- GUI/Widgets/Fl_LED_Button.cxx.orig Thu Apr 19 16:48:11 2001	3	@@ -3,7 +3,7 @@
4	+++ GUI/Widgets/Fl_LED_Button.cxx Sat Mar 1 12:38:27 2003	4	#include "Fl_LED_Button.H"
5	@@ -15,7 +15,7 @@ Fl_LED_Button::~Fl_LED_Button() {	5	#include <FL/fl_draw.H>
		6
		7	-Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l=0):Fl_Light_Button(x,y,w,h,l) {
		8	+Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l):Fl_Light_Button(x,y,w,h,l) {
		9	box(FL_NO_BOX);
		10	down_box(FL_ROUND_DOWN_BOX);
		11	selection_color(FL_RED);
		12	@@ -15,7 +15,7 @@
6	void Fl_LED_Button::draw() {	13	void Fl_LED_Button::draw() {
7	uchar r,g,b;	14	uchar r,g,b;
8		15

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-GUI-OutputGUI.C (+11 lines)
	1	--- GUI/OutputGUI.C.orig Wed Nov 22 13:13:17 2006
	2	+++ GUI/OutputGUI.C Wed Nov 22 13:13:32 2006
	3	@@ -26,7 +26,7 @@
	4	if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;
	5	}
	6
	7	-void OutputGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
	8	+void OutputGUI::CreateGUI(int xoff, int yoff, char *name)
	9	{
	10	Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 85, 110, name);
	11	o->type(1);




--- GUI/ScopeGUI.C.orig	Wed Nov 22 13:08:41 2006
+++ GUI/ScopeGUI.C	Wed Nov 22 13:10:26 2006
@@ -23,7 +23,7 @@
 
 #include <FL/fl_draw.H>
 
-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),
 m_Channels(1)
 {
@@ -69,7 +69,7 @@
 	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);
       o->type(1);

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Knob.cxx (+11 lines)
	1	--- GUI/Widgets/Fl_Knob.cxx.orig Wed Nov 22 13:14:11 2006
	2	+++ GUI/Widgets/Fl_Knob.cxx Wed Nov 22 13:14:20 2006
	3	@@ -4,7 +4,7 @@
	4	#include <FL/fl_draw.H>
	5	#include <math.h>
	6
	7	-Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l=0): Fl_Valuator(xx,yy,ww,hh,l) {
	8	+Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l): Fl_Valuator(xx,yy,ww,hh,l) {
	9	a1 = 35;
	10	a2 = 325;
	11	_type = DOTLIN;

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Loop.C (+11 lines)
	1	--- GUI/Widgets/Fl_Loop.C.orig Wed Nov 22 13:15:09 2006
	2	+++ GUI/Widgets/Fl_Loop.C Wed Nov 22 13:15:18 2006
	3	@@ -30,7 +30,7 @@
	4	static const int INDW = 3; // indicator width
	5	static const int UPDATECYCLES = 4;
	6
	7	-Fl_Loop::Fl_Loop(int x, int y, int w, int h, const char* label=0) :
	8	+Fl_Loop::Fl_Loop(int x, int y, int w, int h, const char* label) :
	9	Fl_Double_Window(x,y,w,h,label),
	10	m_data(NULL),
	11	m_MainWin(NULL),

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Loop.h (+11 lines)
	1	--- GUI/Widgets/Fl_Loop.h.orig Wed Nov 22 13:00:49 2006
	2	+++ GUI/Widgets/Fl_Loop.h Wed Nov 22 13:01:09 2006
	3	@@ -18,7 +18,7 @@
	4
	5	#include <FL/Fl.H>
	6	#include <FL/Fl_Double_Window.H>
	7	-#include <iostream.h>
	8	+#include <iostream>
	9
	10	#ifndef LOOPWIDGET
	11	#define LOOPWIDGET

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Trigger.C (+11 lines)
	1	--- GUI/Widgets/Fl_Trigger.C.orig Wed Nov 22 13:17:29 2006
	2	+++ GUI/Widgets/Fl_Trigger.C Wed Nov 22 13:17:36 2006
	3	@@ -27,7 +27,7 @@
	4
	5	static const float RADCONV = 0.017453292;
	6
	7	-Fl_Trigger::Fl_Trigger(int x, int y, int w, int h, const char* label=0) :
	8	+Fl_Trigger::Fl_Trigger(int x, int y, int w, int h, const char* label) :
	9	Fl_Widget(x,y,w,h,label),
	10	m_CentreX(0),
	11	m_CentreY(0),

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-SpiralSound-Output.C (+11 lines)
	1	--- SpiralSound/Output.C.orig Wed Nov 22 13:07:18 2006
	2	+++ SpiralSound/Output.C Wed Nov 22 13:07:30 2006
	3	@@ -29,7 +29,7 @@
	4	m_Buffer.Zero();
	5	}
	6
	7	-void Output::Send(Sample &data, float LeftVolume=1, float RightVolume=1)
	8	+void Output::Send(Sample &data, float LeftVolume, float RightVolume)
	9	{
	10	long temp;
	11	int on=0;

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-SpiralSound-RiffWav.C (+11 lines)
	1	--- SpiralSound/RiffWav.C.orig Wed Nov 22 13:07:57 2006
	2	+++ SpiralSound/RiffWav.C Wed Nov 22 13:08:07 2006
	3	@@ -55,7 +55,7 @@
	4	#endif
	5	}
	6
	7	-int WavFile::Open(string FileName, Mode mode, Channels channels=MONO)
	8	+int WavFile::Open(string FileName, Mode mode, Channels channels)
	9	{
	10	if (m_Stream!=NULL)
	11	{




--- SpiralSound/Sample.C.orig	Wed Nov 22 13:02:12 2006
+++ SpiralSound/Sample.C	Wed Nov 22 13:03:58 2006
@@ -18,9 +18,9 @@
 
 #include <string.h>
 #include "Sample.h"
-#include "iostream.h"
+#include "iostream"
 
-Sample::Sample(int Len=0) :
+Sample::Sample(int Len) :
 m_Data(NULL),
 m_Length(0)
 {

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-SpiralSound-SpiralInfo.C (+11 lines)
	1	--- SpiralSound/SpiralInfo.C.orig Wed Nov 22 13:05:47 2006
	2	+++ SpiralSound/SpiralInfo.C Wed Nov 22 13:06:04 2006
	3	@@ -22,7 +22,7 @@
	4
	5	#include "SpiralInfo.h"
	6
	7	-float RandFloat(float s=0.0f, float e=1.0f)
	8	+float RandFloat(float s, float e)
	9	{
	10	return s+((rand()%10000/10000.0)*(e-s));
	11	}




--- SpiralSound/SpiralInfo.h.orig	Wed Nov 22 12:59:01 2006
+++ SpiralSound/SpiralInfo.h	Wed Nov 22 13:00:04 2006
@@ -16,13 +16,15 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include <iostream.h>
+#include <iostream>
 #include <string>
 #include <stdlib.h>
 #include "Sample.h"
 
 #ifndef SpiralINFO
 #define SpiralINFO
+
+using namespace std;
 
 // todo: better place for these util funcs
 float RandFloat(float s=0.0f, float e=1.0f);

Return to bug 105744

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-GUI-ScopeGUI.C (+20 lines)
	1	--- GUI/ScopeGUI.C.orig Wed Nov 22 13:08:41 2006
	2	+++ GUI/ScopeGUI.C Wed Nov 22 13:10:26 2006
	3	@@ -23,7 +23,7 @@
	4
	5	#include <FL/fl_draw.H>
	6
	7	-ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l=0) :
	8	+ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l) :
	9	Fl_Widget(x,y,w,h,l),
	10	m_Channels(1)
	11	{
	12	@@ -69,7 +69,7 @@
	13	if (!m_Bypass) m_Scope->redraw();
	14	}
	15
	16	-void ScopeGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
	17	+void ScopeGUI::CreateGUI(int xoff, int yoff, char *name)
	18	{
	19	Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 225, 110, name);
	20	o->type(1);

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-SpiralSound-Sample.C (+14 lines)
	1	--- SpiralSound/Sample.C.orig Wed Nov 22 13:02:12 2006
	2	+++ SpiralSound/Sample.C Wed Nov 22 13:03:58 2006
	3	@@ -18,9 +18,9 @@
	4
	5	#include <string.h>
	6	#include "Sample.h"
	7	-#include "iostream.h"
	8	+#include "iostream"
	9
	10	-Sample::Sample(int Len=0) :
	11	+Sample::Sample(int Len) :
	12	m_Data(NULL),
	13	m_Length(0)
	14	{

Line 0 Link Here

(-)/home/trasz/spiralloops/files/patch-SpiralSound-SpiralInfo.h (+19 lines)
	1	--- SpiralSound/SpiralInfo.h.orig Wed Nov 22 12:59:01 2006
	2	+++ SpiralSound/SpiralInfo.h Wed Nov 22 13:00:04 2006
	3	@@ -16,13 +16,15 @@
	4	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
	5	*/
	6
	7	-#include <iostream.h>
	8	+#include <iostream>
	9	#include <string>
	10	#include <stdlib.h>
	11	#include "Sample.h"
	12
	13	#ifndef SpiralINFO
	14	#define SpiralINFO
	15	+
	16	+using namespace std;
	17
	18	// todo: better place for these util funcs
	19	float RandFloat(float s=0.0f, float e=1.0f);