Date: Wed, 22 Nov 2006 13:25:36 +0100 (CET) From: trasz <trasz@pin.if.uz.zgora.pl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/105744: [PATCH] audio/spiralloops: unbreak Message-ID: <20061122122536.C0B0339DB8@pin.if.uz.zgora.pl> Resent-Message-ID: <200611221230.kAMCUEmQ053099@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105744
>Category: ports
>Synopsis: [PATCH] audio/spiralloops: unbreak
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 22 12:30:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: trasz
>Release: FreeBSD 6.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006
>Description:
Unbreak.
Added file(s):
- files/patch-GUI-OutputGUI.C
- files/patch-GUI-ScopeGUI.C
- files/patch-GUI-Widgets-Fl_Knob.cxx
- files/patch-GUI-Widgets-Fl_Loop.C
- files/patch-GUI-Widgets-Fl_Loop.h
- files/patch-GUI-Widgets-Fl_Trigger.C
- files/patch-SpiralSound-Output.C
- files/patch-SpiralSound-RiffWav.C
- files/patch-SpiralSound-Sample.C
- files/patch-SpiralSound-SpiralInfo.C
- files/patch-SpiralSound-SpiralInfo.h
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- spiralloops-2.0.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/Makefile /home/trasz/spiralloops/Makefile
--- /usr/ports/audio/spiralloops/Makefile Wed Jun 21 17:21:26 2006
+++ /home/trasz/spiralloops/Makefile Wed Nov 22 13:25:02 2006
@@ -27,10 +27,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 500113
-BROKEN= Does not compile (bad C++ code)
-.endif
-
post-patch:
${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.orig
${SED} -E "s:-ldl::g; \
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-Fl_LED_Button.cxx /home/trasz/spiralloops/files/patch-Fl_LED_Button.cxx
--- /usr/ports/audio/spiralloops/files/patch-Fl_LED_Button.cxx Sat Mar 1 19:02:05 2003
+++ /home/trasz/spiralloops/files/patch-Fl_LED_Button.cxx Wed Nov 22 13:24:51 2006
@@ -1,8 +1,15 @@
-patch by Stephen Paskaluk to enable compilation with fltk 1.1.2
-
---- GUI/Widgets/Fl_LED_Button.cxx.orig Thu Apr 19 16:48:11 2001
-+++ GUI/Widgets/Fl_LED_Button.cxx Sat Mar 1 12:38:27 2003
-@@ -15,7 +15,7 @@ Fl_LED_Button::~Fl_LED_Button() {
+--- GUI/Widgets/Fl_LED_Button.cxx.orig Thu Apr 19 22:48:11 2001
++++ GUI/Widgets/Fl_LED_Button.cxx Wed Nov 22 13:16:40 2006
+@@ -3,7 +3,7 @@
+ #include "Fl_LED_Button.H"
+ #include <FL/fl_draw.H>
+
+-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) {
++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) {
+ box(FL_NO_BOX);
+ down_box(FL_ROUND_DOWN_BOX);
+ selection_color(FL_RED);
+@@ -15,7 +15,7 @@
void Fl_LED_Button::draw() {
uchar r,g,b;
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-GUI-OutputGUI.C /home/trasz/spiralloops/files/patch-GUI-OutputGUI.C
--- /usr/ports/audio/spiralloops/files/patch-GUI-OutputGUI.C Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-GUI-OutputGUI.C Wed Nov 22 13:25:01 2006
@@ -0,0 +1,11 @@
+--- GUI/OutputGUI.C.orig Wed Nov 22 13:13:17 2006
++++ GUI/OutputGUI.C Wed Nov 22 13:13:32 2006
+@@ -26,7 +26,7 @@
+ if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;
+ }
+
+-void OutputGUI::CreateGUI(int xoff=0, int yoff=0, char *name)
++void OutputGUI::CreateGUI(int xoff, int yoff, char *name)
+ {
+ Fl_Group* o = GUIMixGroup = new Fl_Group(xoff, yoff, 85, 110, name);
+ o->type(1);
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-GUI-ScopeGUI.C /home/trasz/spiralloops/files/patch-GUI-ScopeGUI.C
--- /usr/ports/audio/spiralloops/files/patch-GUI-ScopeGUI.C Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-GUI-ScopeGUI.C Wed Nov 22 13:25:00 2006
@@ -0,0 +1,20 @@
+--- 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);
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-GUI-Widgets-Fl_Knob.cxx /home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Knob.cxx
--- /usr/ports/audio/spiralloops/files/patch-GUI-Widgets-Fl_Knob.cxx Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Knob.cxx Wed Nov 22 13:25:01 2006
@@ -0,0 +1,11 @@
+--- GUI/Widgets/Fl_Knob.cxx.orig Wed Nov 22 13:14:11 2006
++++ GUI/Widgets/Fl_Knob.cxx Wed Nov 22 13:14:20 2006
+@@ -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;
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-GUI-Widgets-Fl_Loop.C /home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Loop.C
--- /usr/ports/audio/spiralloops/files/patch-GUI-Widgets-Fl_Loop.C Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Loop.C Wed Nov 22 13:25:01 2006
@@ -0,0 +1,11 @@
+--- GUI/Widgets/Fl_Loop.C.orig Wed Nov 22 13:15:09 2006
++++ GUI/Widgets/Fl_Loop.C Wed Nov 22 13:15:18 2006
+@@ -30,7 +30,7 @@
+ static const int INDW = 3; // indicator width
+ static const int UPDATECYCLES = 4;
+
+-Fl_Loop::Fl_Loop(int x, int y, int w, int h, const char* label=0) :
++Fl_Loop::Fl_Loop(int x, int y, int w, int h, const char* label) :
+ Fl_Double_Window(x,y,w,h,label),
+ m_data(NULL),
+ m_MainWin(NULL),
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-GUI-Widgets-Fl_Loop.h /home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Loop.h
--- /usr/ports/audio/spiralloops/files/patch-GUI-Widgets-Fl_Loop.h Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Loop.h Wed Nov 22 13:24:55 2006
@@ -0,0 +1,11 @@
+--- GUI/Widgets/Fl_Loop.h.orig Wed Nov 22 13:00:49 2006
++++ GUI/Widgets/Fl_Loop.h Wed Nov 22 13:01:09 2006
+@@ -18,7 +18,7 @@
+
+ #include <FL/Fl.H>
+ #include <FL/Fl_Double_Window.H>
+-#include <iostream.h>
++#include <iostream>
+
+ #ifndef LOOPWIDGET
+ #define LOOPWIDGET
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-GUI-Widgets-Fl_Trigger.C /home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Trigger.C
--- /usr/ports/audio/spiralloops/files/patch-GUI-Widgets-Fl_Trigger.C Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-GUI-Widgets-Fl_Trigger.C Wed Nov 22 13:25:01 2006
@@ -0,0 +1,11 @@
+--- GUI/Widgets/Fl_Trigger.C.orig Wed Nov 22 13:17:29 2006
++++ GUI/Widgets/Fl_Trigger.C Wed Nov 22 13:17:36 2006
+@@ -27,7 +27,7 @@
+
+ static const float RADCONV = 0.017453292;
+
+-Fl_Trigger::Fl_Trigger(int x, int y, int w, int h, const char* label=0) :
++Fl_Trigger::Fl_Trigger(int x, int y, int w, int h, const char* label) :
+ Fl_Widget(x,y,w,h,label),
+ m_CentreX(0),
+ m_CentreY(0),
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-SpiralSound-Output.C /home/trasz/spiralloops/files/patch-SpiralSound-Output.C
--- /usr/ports/audio/spiralloops/files/patch-SpiralSound-Output.C Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-SpiralSound-Output.C Wed Nov 22 13:24:59 2006
@@ -0,0 +1,11 @@
+--- SpiralSound/Output.C.orig Wed Nov 22 13:07:18 2006
++++ SpiralSound/Output.C Wed Nov 22 13:07:30 2006
+@@ -29,7 +29,7 @@
+ m_Buffer.Zero();
+ }
+
+-void Output::Send(Sample &data, float LeftVolume=1, float RightVolume=1)
++void Output::Send(Sample &data, float LeftVolume, float RightVolume)
+ {
+ long temp;
+ int on=0;
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-SpiralSound-RiffWav.C /home/trasz/spiralloops/files/patch-SpiralSound-RiffWav.C
--- /usr/ports/audio/spiralloops/files/patch-SpiralSound-RiffWav.C Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-SpiralSound-RiffWav.C Wed Nov 22 13:25:00 2006
@@ -0,0 +1,11 @@
+--- SpiralSound/RiffWav.C.orig Wed Nov 22 13:07:57 2006
++++ SpiralSound/RiffWav.C Wed Nov 22 13:08:07 2006
+@@ -55,7 +55,7 @@
+ #endif
+ }
+
+-int WavFile::Open(string FileName, Mode mode, Channels channels=MONO)
++int WavFile::Open(string FileName, Mode mode, Channels channels)
+ {
+ if (m_Stream!=NULL)
+ {
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-SpiralSound-Sample.C /home/trasz/spiralloops/files/patch-SpiralSound-Sample.C
--- /usr/ports/audio/spiralloops/files/patch-SpiralSound-Sample.C Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-SpiralSound-Sample.C Wed Nov 22 13:24:57 2006
@@ -0,0 +1,14 @@
+--- 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)
+ {
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-SpiralSound-SpiralInfo.C /home/trasz/spiralloops/files/patch-SpiralSound-SpiralInfo.C
--- /usr/ports/audio/spiralloops/files/patch-SpiralSound-SpiralInfo.C Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-SpiralSound-SpiralInfo.C Wed Nov 22 13:24:58 2006
@@ -0,0 +1,11 @@
+--- SpiralSound/SpiralInfo.C.orig Wed Nov 22 13:05:47 2006
++++ SpiralSound/SpiralInfo.C Wed Nov 22 13:06:04 2006
+@@ -22,7 +22,7 @@
+
+ #include "SpiralInfo.h"
+
+-float RandFloat(float s=0.0f, float e=1.0f)
++float RandFloat(float s, float e)
+ {
+ return s+((rand()%10000/10000.0)*(e-s));
+ }
diff -ruN --exclude=CVS /usr/ports/audio/spiralloops/files/patch-SpiralSound-SpiralInfo.h /home/trasz/spiralloops/files/patch-SpiralSound-SpiralInfo.h
--- /usr/ports/audio/spiralloops/files/patch-SpiralSound-SpiralInfo.h Thu Jan 1 01:00:00 1970
+++ /home/trasz/spiralloops/files/patch-SpiralSound-SpiralInfo.h Wed Nov 22 13:24:53 2006
@@ -0,0 +1,19 @@
+--- 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);
--- spiralloops-2.0.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061122122536.C0B0339DB8>