pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
spiralloops: Test with FLTK 1.4
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Fri Jan 24 16:37:13 2025 +0100
Changeset: d73c3bd811bedfec47b5af83ac3b7d5a41bfd699
Modified Files:
Makefile
Added Files:
spiralloops/COMMIT_MSG
spiralloops/DESCR
spiralloops/Makefile
spiralloops/PLIST
spiralloops/distinfo
spiralloops/patches/patch-GUI_LoopGUI.C
spiralloops/patches/patch-GUI_OutputGUI.C
spiralloops/patches/patch-GUI_Widgets_Fl__LED__Button.cxx
spiralloops/patches/patch-SpiralLoops.C
spiralloops/patches/patch-aa
spiralloops/patches/patch-ab
spiralloops/patches/patch-ac
spiralloops/patches/patch-ad
spiralloops/patches/patch-af
spiralloops/patches/patch-ag
spiralloops/patches/patch-ah
spiralloops/patches/patch-ai
spiralloops/patches/patch-aj
spiralloops/patches/patch-ak
spiralloops/patches/patch-am
spiralloops/patches/patch-an
spiralloops/patches/patch-ap
spiralloops/patches/patch-aq
spiralloops/patches/patch-ar
spiralloops/patches/patch-as
spiralloops/patches/patch-at
Log Message:
spiralloops: Test with FLTK 1.4
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d73c3bd811bedfec47b5af83ac3b7d5a41bfd699
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
spiralloops/COMMIT_MSG | 1 +
spiralloops/DESCR | 10 ++++++
spiralloops/Makefile | 36 +++++++++++++++++++
spiralloops/PLIST | 2 ++
spiralloops/distinfo | 26 ++++++++++++++
spiralloops/patches/patch-GUI_LoopGUI.C | 15 ++++++++
spiralloops/patches/patch-GUI_OutputGUI.C | 24 +++++++++++++
.../patches/patch-GUI_Widgets_Fl__LED__Button.cxx | 33 ++++++++++++++++++
spiralloops/patches/patch-SpiralLoops.C | 23 +++++++++++++
spiralloops/patches/patch-aa | 22 ++++++++++++
spiralloops/patches/patch-ab | 13 +++++++
spiralloops/patches/patch-ac | 13 +++++++
spiralloops/patches/patch-ad | 25 ++++++++++++++
spiralloops/patches/patch-af | 15 ++++++++
spiralloops/patches/patch-ag | 16 +++++++++
spiralloops/patches/patch-ah | 21 ++++++++++++
spiralloops/patches/patch-ai | 31 +++++++++++++++++
spiralloops/patches/patch-aj | 40 ++++++++++++++++++++++
spiralloops/patches/patch-ak | 22 ++++++++++++
spiralloops/patches/patch-am | 22 ++++++++++++
spiralloops/patches/patch-an | 22 ++++++++++++
spiralloops/patches/patch-ap | 22 ++++++++++++
spiralloops/patches/patch-aq | 13 +++++++
spiralloops/patches/patch-ar | 37 ++++++++++++++++++++
spiralloops/patches/patch-as | 13 +++++++
spiralloops/patches/patch-at | 15 ++++++++
27 files changed, 533 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 5167eeb302..9ae119a922 100644
--- a/Makefile
+++ b/Makefile
@@ -5383,6 +5383,7 @@ SUBDIR+= spice-vdagent
SUBDIR+= spid-compliant-certificates
SUBDIR+= spidermonkey24
SUBDIR+= spidermonkey31
+SUBDIR+= spiralloops
SUBDIR+= spiralsynth
SUBDIR+= spirv-tools
SUBDIR+= splix
diff --git a/spiralloops/COMMIT_MSG b/spiralloops/COMMIT_MSG
new file mode 100644
index 0000000000..aa5494d3a9
--- /dev/null
+++ b/spiralloops/COMMIT_MSG
@@ -0,0 +1 @@
+wm/spiralloops: Patch to work with FLTK 1.4.
diff --git a/spiralloops/DESCR b/spiralloops/DESCR
new file mode 100644
index 0000000000..3a6552d63d
--- /dev/null
+++ b/spiralloops/DESCR
@@ -0,0 +1,10 @@
+SpiralLoops is an experimental loop based sampler for Linux or BSD.
+
+The idea of SpiralLoops is to provide a simple, visual tool for looping and
+layering of sounds; which can be sourced from either wav files on disk, or
+from sound generating plugins.
+
+SpiralLoops allows you to create loop based compositions with the minimum
+feedback time between the decisions you make and your ears. The looping
+mechanism is very flexible, you can lock the timing of loops together, or
+offset them for creating complex sequences, such as polyrhythms.
diff --git a/spiralloops/Makefile b/spiralloops/Makefile
new file mode 100644
index 0000000000..5ac648f6e5
--- /dev/null
+++ b/spiralloops/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD$
+
+DISTNAME= SpiralLoops-2.0.0
+PKGNAME= spiralloops-2.0.0
+PKGREVISION= 15
+CATEGORIES= audio
+MASTER_SITES= http://www.pawfal.org/Software/SpiralLoops/dload/
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.pawfal.org/Software/SpiralLoops/
+COMMENT= Loop based sampler
+LICENSE= gnu-gpl-v2
+
+# only runs correctly on little-endian machines
+BROKEN_EXCEPT_ON_PLATFORM= ${LITTLEENDIANPLATFORMS}
+
+USE_LANGUAGES= c c++
+USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
+CXXFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
+CXXFLAGS+= -DFLTK_1_0_COMPAT
+CXXFLAGS.SunOS+= -DSOUND_PCM_WRITE_CHANNELS=SNDCTL_DSP_CHANNELS
+
+# Fails with C++14 default language
+FORCE_CXX_STD= c++03
+
+INSTALLATION_DIRS= bin
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${DESTDIR}${PREFIX}/bin
+
+.include "../../mk/oss.buildlink3.mk"
+.include "../../wip/fltk14-devel/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/spiralloops/PLIST b/spiralloops/PLIST
new file mode 100644
index 0000000000..6856257d04
--- /dev/null
+++ b/spiralloops/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+bin/SpiralLoops
diff --git a/spiralloops/distinfo b/spiralloops/distinfo
new file mode 100644
index 0000000000..b3b9314748
--- /dev/null
+++ b/spiralloops/distinfo
@@ -0,0 +1,26 @@
+$NetBSD$
+
+BLAKE2s (SpiralLoops-2.0.0.tar.gz) = b6a3ff6a9e99b2571dbf49a63663b1023f51d7768d72d544291efc74e0d94ade
+SHA512 (SpiralLoops-2.0.0.tar.gz) = b21ba819476cf46294674ea8ea87e326f1b5f744547131190dfc2a4c956695e5c229093028732832a6cce79f9f1483d0329d2c82990775b263a6db82bbb83c6e
+Size (SpiralLoops-2.0.0.tar.gz) = 85458 bytes
+SHA1 (patch-GUI_LoopGUI.C) = 1abbba4f2567a136adb522d64643fb7f13f65487
+SHA1 (patch-GUI_OutputGUI.C) = 44d31b4b176def4a1cd417470776dbd6c4c0c583
+SHA1 (patch-GUI_Widgets_Fl__LED__Button.cxx) = be1f4d47bf53a565e738b35d5d11e49b2f0687e0
+SHA1 (patch-SpiralLoops.C) = fc61cc9159015e0eafa9836b4246945e949419f4
+SHA1 (patch-aa) = 6dcc532e44e03a7f4d9b2d1f3e2062308b2854be
+SHA1 (patch-ab) = 9b276f356d2da5eda3b0ed49e58f1bde6cc87de6
+SHA1 (patch-ac) = 04946ad637a6e0a371e604ffaadd15c119f796da
+SHA1 (patch-ad) = 09c1734e875335dae92afef7bbbd4fdc6821eb1f
+SHA1 (patch-af) = 0bfe36fc2fe19182ade1f4a0f0cf79436bf21a0d
+SHA1 (patch-ag) = 86736dde352931cd0dc89cb4b5560ef7ef84305f
+SHA1 (patch-ah) = 13266cbc1dc1e6961478052c4de32490cea5833e
+SHA1 (patch-ai) = 6311e5df74a10bf0f722068625290dfd81fc0771
+SHA1 (patch-aj) = 6ae1e01753d648695f10261eeb23de617a617fc7
+SHA1 (patch-ak) = 94e4650bc10a7073718a83b27ab47e217cf15f85
+SHA1 (patch-am) = 25fdb4422dd007d7ebee50a3fb2e2accc72b275b
+SHA1 (patch-an) = 0c45e0959591c066afb3c98c1a076b57d028b8f4
+SHA1 (patch-ap) = ae40c9c49c5cea53d9f72d5258becda13c580c08
+SHA1 (patch-aq) = 3f21e84fcbc911ebaf3bb60009f7f0b4b60c801a
+SHA1 (patch-ar) = 63b1db77bf55825618e5e1c0f65f69c0e36e19f6
+SHA1 (patch-as) = 5198351e7d8ad641fef6eb4ba73ff86803b50a09
+SHA1 (patch-at) = dcd9bbf940a6433b4cfc175a6d4a0d6ee167b3ea
diff --git a/spiralloops/patches/patch-GUI_LoopGUI.C b/spiralloops/patches/patch-GUI_LoopGUI.C
new file mode 100644
index 0000000000..59df02397b
--- /dev/null
+++ b/spiralloops/patches/patch-GUI_LoopGUI.C
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Use new name of header for FLTK 1.4.
+
+--- GUI/LoopGUI.C.orig 2001-04-19 20:48:10.000000000 +0000
++++ GUI/LoopGUI.C
+@@ -21,7 +21,7 @@
+ #include "Widgets/Fl_Loop.h"
+ #include "LoopGUI.h"
+ #include "../Loop.h"
+-#include <FL/fl_file_chooser.h>
++#include <FL/Fl_File_Chooser.H>
+
+ static const int EFFECT_ADDITION = 130;
+
diff --git a/spiralloops/patches/patch-GUI_OutputGUI.C b/spiralloops/patches/patch-GUI_OutputGUI.C
new file mode 100644
index 0000000000..81c7533c7d
--- /dev/null
+++ b/spiralloops/patches/patch-GUI_OutputGUI.C
@@ -0,0 +1,24 @@
+$NetBSD$
+
+2024-01-24: Patch modified for FLTK 1.4
+
+--- GUI/OutputGUI.C.orig 2001-04-19 20:48:10.000000000 +0000
++++ GUI/OutputGUI.C
+@@ -18,7 +18,7 @@
+
+ #include "OutputGUI.h"
+
+-#include <FL/fl_file_chooser.h>
++#include <FL/Fl_File_Chooser.H>
+
+ OutputGUI::OutputGUI(Output *o)
+ {
+@@ -26,7 +26,7 @@ OutputGUI::OutputGUI(Output *o)
+ 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 --git a/spiralloops/patches/patch-GUI_Widgets_Fl__LED__Button.cxx b/spiralloops/patches/patch-GUI_Widgets_Fl__LED__Button.cxx
new file mode 100644
index 0000000000..cbae9619cb
--- /dev/null
+++ b/spiralloops/patches/patch-GUI_Widgets_Fl__LED__Button.cxx
@@ -0,0 +1,33 @@
+$NetBSD$
+
+2024-01-24: Patch modified for FLTK 1.4
+
+--- GUI/Widgets/Fl_LED_Button.cxx.orig 2001-04-19 20:48:11.000000000 +0000
++++ GUI/Widgets/Fl_LED_Button.cxx
+@@ -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 @@ Fl_LED_Button::~Fl_LED_Button() {
+ void Fl_LED_Button::draw() {
+ uchar r,g,b;
+
+- if (box()) draw_box(this==Fl::pushed() ? down(box()) : box(), color());
++ if (box()) draw_box(this==Fl::pushed() ? down_box() : box(), color());
+ Fl_Color col = value() ? selection_color() : color();
+ Fl::get_color((Fl_Color)selection_color(),r,g,b);
+ int d = h()/6;
+@@ -25,7 +25,7 @@ void Fl_LED_Button::draw() {
+ int y1 = y()+d+3;
+ int ww = W-2*d-6;
+ int hh = W-2*d-6;
+- Fl::get_color(parent()->color(),r,g,b);
++ Fl::get_color(color(),r,g,b);
+ modulate(-90,r,g,b);
+ fl_pie(x1-1,y1-1,ww+2,hh+2,0,360);
+ Fl::get_color((Fl_Color)selection_color(),r,g,b);
diff --git a/spiralloops/patches/patch-SpiralLoops.C b/spiralloops/patches/patch-SpiralLoops.C
new file mode 100644
index 0000000000..31b20c3cd7
--- /dev/null
+++ b/spiralloops/patches/patch-SpiralLoops.C
@@ -0,0 +1,23 @@
+$NetBSD$
+
+2024-01-24: Patch modified for FLTK 1.4
+
+--- SpiralLoops.C.orig 2001-04-19 20:48:11.000000000 +0000
++++ SpiralLoops.C
+@@ -20,7 +20,7 @@
+
+ #include <FL/Fl.H>
+ #include <FL/Enumerations.H>
+-#include <FL/fl_file_chooser.h>
++#include <FL/Fl_File_Chooser.H>
+ #include <fstream>
+ #include <strstream>
+ #include <string>
+@@ -48,6 +48,7 @@ m_PluginOpen(false),
+ m_PluginLinked(false),
+ m_PluginPaused(false),
+ m_PluginWindow(NULL),
++m_PluginBuffer(NULL),
+ m_DelayGUI(&m_Delay),
+ m_ReverbGUI(&m_Reverb),
+ m_Out(2),
diff --git a/spiralloops/patches/patch-aa b/spiralloops/patches/patch-aa
new file mode 100644
index 0000000000..38d9975d97
--- /dev/null
+++ b/spiralloops/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- Makefile.in.orig Mon May 7 14:42:59 2001
++++ 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
+-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 =
++LINK = g++ ${LDFLAGS}
+ LFLAGS =
+-LIBS = -L/usr/X11R6/lib -lfltk -lGL -lXext -lX11 -lm -ldl
++LIBS = -lfltk -lGL -lXext -lX11 -lm ${LIBOSSAUDIO}
+ MOC = moc
+ UIC =
+ TAR = tar -cf
diff --git a/spiralloops/patches/patch-ab b/spiralloops/patches/patch-ab
new file mode 100644
index 0000000000..595d823f05
--- /dev/null
+++ b/spiralloops/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- SpiralLoopsInfo.C.orig Thu Apr 19 13:48:19 2001
++++ SpiralLoopsInfo.C
+@@ -24,7 +24,7 @@
+ float SpiralInfo::VALUECONV = 1.0f/MAXSAMPLE;
+ bool SpiralInfo::WANTMIDI = false;
+ int SpiralInfo::FILTERGRAN = 50;
+-string SpiralInfo::OUTPUTFILE = "/dev/dsp";
++string SpiralInfo::OUTPUTFILE = DEVOSSAUDIO;
+ string SpiralInfo::MIDIFILE = "/dev/midi";
+ int SpiralInfo::POLY = 1;
+ bool SpiralInfo::REALTIMEOUT = true;
diff --git a/spiralloops/patches/patch-ac b/spiralloops/patches/patch-ac
new file mode 100644
index 0000000000..2dab568c84
--- /dev/null
+++ b/spiralloops/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- SpiralInfo.C.orig Thu Apr 19 13:48:08 2001
++++ SpiralInfo.C
+@@ -33,7 +33,7 @@
+ float SpiralInfo::VALUECONV = 1.0f/MAXSAMPLE;
+ bool SpiralInfo::WANTMIDI = true;
+ int SpiralInfo::FILTERGRAN = 50;
+-string SpiralInfo::OUTPUTFILE = "/dev/dsp";
++string SpiralInfo::OUTPUTFILE = DEVOSSAUDIO;
+ string SpiralInfo::MIDIFILE = "/dev/midi";
+ int SpiralInfo::POLY = 2;
+ bool SpiralInfo::REALTIMEOUT = true;
diff --git a/spiralloops/patches/patch-ad b/spiralloops/patches/patch-ad
new file mode 100644
index 0000000000..98a3d14057
--- /dev/null
+++ b/spiralloops/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD$
+
+--- SpiralSound/Output.h.orig Thu Apr 19 13:48:12 2001
++++ SpiralSound/Output.h
+@@ -16,6 +16,7 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++#include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <fcntl.h>
+@@ -25,12 +26,10 @@
+ #else
+ #if defined (__NetBSD__) || defined (__OpenBSD__)
+ #include <soundcard.h> /* OSS emulation */
+-#undef ioctl
+ #else /* BSDI, Linux, Solaris */
+ #include <sys/soundcard.h>
+ #endif /* __NetBSD__ or __OpenBSD__ */
+ #endif /* __FreeBSD__ */
+-#include <sys/ioctl.h>
+ #include <limits.h>
+
+ #include "SpiralInfo.h"
diff --git a/spiralloops/patches/patch-af b/spiralloops/patches/patch-af
new file mode 100644
index 0000000000..6156f19ea9
--- /dev/null
+++ b/spiralloops/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- SpiralSound/SpiralInfo.h.orig 2001-04-19 20:48:12.000000000 +0000
++++ SpiralSound/SpiralInfo.h
+@@ -16,7 +16,9 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+-#include <iostream.h>
++using namespace std;
++
++#include <iostream>
+ #include <string>
+ #include <stdlib.h>
+ #include "Sample.h"
diff --git a/spiralloops/patches/patch-ag b/spiralloops/patches/patch-ag
new file mode 100644
index 0000000000..1af69f0031
--- /dev/null
+++ b/spiralloops/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- SpiralSound/Sample.C.orig 2001-04-19 20:48:13.000000000 +0000
++++ SpiralSound/Sample.C
+@@ -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 --git a/spiralloops/patches/patch-ah b/spiralloops/patches/patch-ah
new file mode 100644
index 0000000000..5b9130e7e0
--- /dev/null
+++ b/spiralloops/patches/patch-ah
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- SpiralSound/SpiralInfo.C.orig 2001-04-19 20:48:13.000000000 +0000
++++ SpiralSound/SpiralInfo.C
+@@ -16,13 +16,13 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+-#include <iostream.h>
+-#include <fstream.h>
++#include <iostream>
++#include <fstream>
+ #include <stdlib.h>
+
+ #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 --git a/spiralloops/patches/patch-ai b/spiralloops/patches/patch-ai
new file mode 100644
index 0000000000..f25dc56087
--- /dev/null
+++ b/spiralloops/patches/patch-ai
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- SpiralSound/Output.C.orig 2001-04-19 13:48:12.000000000 -0700
++++ SpiralSound/Output.C
+@@ -19,6 +19,17 @@
+ #include "Output.h"
+ #include "Sample.h"
+
++#ifdef __sun
++#include <sys/byteorder.h>
++#define LITTLE_ENDIAN 1234
++#define BIG_ENDIAN 4321
++#ifdef _BIG_ENDIAN
++#define __BYTE_ORDER BIG_ENDIAN
++#else
++#define __BYTE_ORDER LITTLE_ENDIAN
++#endif
++#endif
++
+ Output::Output(int Channels) :
+ m_Amp(0.5),
+ m_Channels(Channels)
+@@ -29,7 +40,7 @@ m_Channels(Channels)
+ 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 --git a/spiralloops/patches/patch-aj b/spiralloops/patches/patch-aj
new file mode 100644
index 0000000000..8291f7ad5a
--- /dev/null
+++ b/spiralloops/patches/patch-aj
@@ -0,0 +1,40 @@
+$NetBSD$
+
+--- SpiralSound/RiffWav.C.orig 2001-04-19 20:48:12.000000000 +0000
++++ SpiralSound/RiffWav.C
+@@ -16,7 +16,7 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+-#include <iostream.h>
++#include <iostream>
+ #include <fstream>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -26,6 +26,17 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+
++#ifdef __sun
++#include <sys/byteorder.h>
++#define LITTLE_ENDIAN 1234
++#define BIG_ENDIAN 4321
++#ifdef _BIG_ENDIAN
++#define __BYTE_ORDER BIG_ENDIAN
++#else
++#define __BYTE_ORDER LITTLE_ENDIAN
++#endif
++#endif
++
+ const int HEADERLEN = (4+24+8);
+
+ #if __BYTE_ORDER == BIG_ENDIAN
+@@ -55,7 +66,7 @@ WavFile::HeaderInfo::HeaderInfo() : Riff
+ #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 --git a/spiralloops/patches/patch-ak b/spiralloops/patches/patch-ak
new file mode 100644
index 0000000000..6c2089b800
--- /dev/null
+++ b/spiralloops/patches/patch-ak
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- GUI/ScopeGUI.C.orig 2001-04-19 13:48:11.000000000 -0700
++++ GUI/ScopeGUI.C
+@@ -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 @@ void ScopeGUI::Display(const 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);
+ o->type(1);
diff --git a/spiralloops/patches/patch-am b/spiralloops/patches/patch-am
new file mode 100644
index 0000000000..ef0917e437
--- /dev/null
+++ b/spiralloops/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- GUI/Widgets/Fl_Knob.cxx.orig 2001-04-19 13:48:10.000000000 -0700
++++ 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;
+ int dam = damage();
+ if (dam & FL_DAMAGE_ALL)
+ {
+- int col = parent()->color();
++ int col = color();
+ fl_color(col);
+ fl_rectf(ox,oy,side,side);
+ Fl::get_color((Fl_Color)col,rr,gg,bb);
diff --git a/spiralloops/patches/patch-an b/spiralloops/patches/patch-an
new file mode 100644
index 0000000000..2be6a45b05
--- /dev/null
+++ b/spiralloops/patches/patch-an
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- GUI/Widgets/Fl_Loop.C.orig 2001-04-19 20:48:10.000000000 +0000
++++ GUI/Widgets/Fl_Loop.C
+@@ -17,7 +17,7 @@
+ */
+
+ #include "Fl_Loop.h"
+-#include <iostream.h>
++#include <iostream>
+ #include <FL/fl_draw.H>
+ #include <FL/x.H>
+ #include <math.h>
+@@ -30,7 +30,7 @@ static const float RADCONV = 0.017453292
+ 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 --git a/spiralloops/patches/patch-ap b/spiralloops/patches/patch-ap
new file mode 100644
index 0000000000..aaca5b64f4
--- /dev/null
+++ b/spiralloops/patches/patch-ap
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- GUI/Widgets/Fl_Trigger.C.orig 2001-05-07 20:43:34.000000000 +0000
++++ GUI/Widgets/Fl_Trigger.C
+@@ -17,7 +17,7 @@
+ */
+
+ #include "Fl_Trigger.h"
+-#include <iostream.h>
++#include <iostream>
+ #include <FL/fl_draw.H>
+ #include <math.h>
+ #include <stdio.h>
+@@ -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 --git a/spiralloops/patches/patch-aq b/spiralloops/patches/patch-aq
new file mode 100644
index 0000000000..ed80a19950
--- /dev/null
+++ b/spiralloops/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- SpiralLoops.h.orig 2006-01-05 15:31:41.000000000 +0000
++++ SpiralLoops.h
+@@ -89,7 +89,7 @@ private:
+ Sample*(*Run)(void);
+ void (*Destroy)(void);
+ void *handle;
+- char *error;
++ const char *error;
+ Sample *m_PluginBuffer;
+ bool m_PluginOpen;
+ bool m_PluginLinked;
diff --git a/spiralloops/patches/patch-ar b/spiralloops/patches/patch-ar
new file mode 100644
index 0000000000..d8364ba6f1
--- /dev/null
+++ b/spiralloops/patches/patch-ar
@@ -0,0 +1,37 @@
+$NetBSD$
+
+--- SpiralSound/Sample.h.orig 2001-04-19 20:48:13.000000000 +0000
++++ SpiralSound/Sample.h
+@@ -21,6 +21,7 @@
+
+ #include <assert.h>
+ #include <iostream>
++#include <string.h>
+ #include "SpiralInfo.h"
+
+ static const unsigned short UMAX_LEV = 65535;
+@@ -63,13 +64,13 @@ public:
+ void Shrink(int Length);
+ void CropTo(int NewLength);
+
+- inline short &Sample::operator[](int i) const
++ inline short &operator[](int i) const
+ {
+ assert(i>=0 && i<m_Length);
+ return m_Data[i];
+ }
+
+- inline void Sample::Set(int i, long int v)
++ inline void Set(int i, long int v)
+ {
+ assert(i>=0 && i<m_Length);
+ // clip
+@@ -79,7 +80,7 @@ public:
+ m_Data[i]=(short)v;
+ }
+
+- inline Sample &Sample::operator=(const Sample &rhs)
++ inline Sample &operator=(const Sample &rhs)
+ {
+ Allocate(rhs.GetLength());
+ memcpy(m_Data,rhs.GetBuffer(),GetLengthInBytes());
diff --git a/spiralloops/patches/patch-as b/spiralloops/patches/patch-as
new file mode 100644
index 0000000000..27efedea8e
--- /dev/null
+++ b/spiralloops/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- GUI/Widgets/Fl_Loop.h.orig 2001-04-19 20:48:10.000000000 +0000
++++ GUI/Widgets/Fl_Loop.h
+@@ -18,7 +18,7 @@
+
+ #include <FL/Fl.H>
+ #include <FL/Fl_Double_Window.H>
+-#include <iostream.h>
++#include <iostream>
+
+ #ifndef LOOPWIDGET
+ #define LOOPWIDGET
diff --git a/spiralloops/patches/patch-at b/spiralloops/patches/patch-at
new file mode 100644
index 0000000000..502e24a491
--- /dev/null
+++ b/spiralloops/patches/patch-at
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- GUI/Widgets/Fl_Trigger.h.orig 2001-04-19 20:48:10.000000000 +0000
++++ GUI/Widgets/Fl_Trigger.h
+@@ -19,7 +19,9 @@
+
+ #include <FL/Fl.H>
+ #include <FL/Fl_Widget.H>
+-#include <iostream.h>
++#include <iostream>
++using std::istream;
++using std::ostream;
+
+ #ifndef TRIGGERWIDGET
+ #define TRIGGERWIDGET
Home |
Main Index |
Thread Index |
Old Index