diff options
author | marino <marino> | 2011-11-23 08:20:38 +0000 |
---|---|---|
committer | marino <marino> | 2011-11-23 08:20:38 +0000 |
commit | bd9870484c9863108391cb9f89e453f75473a955 (patch) | |
tree | c06a1227498639dcecd6e06d6258c082ba3fe0b5 | |
parent | 95a92e3f8abb4236c20db0a9bb14ec2035f6ee45 (diff) | |
download | pkgsrc-bd9870484c9863108391cb9f89e453f75473a955.tar.gz |
audio/spiralloops: Fix iostream / Fix DragonFly / amd64
Replace <iostream.h> and <fstream.h> with their c++ counterparts.
Addition of <string.h> was originally under a DragonFly macro, but
this was removed when it was shown NetBSD 5.99 x86_64 needed it too.
Allow package to build on all x86_64 architectures.
-rw-r--r-- | audio/spiralloops/Makefile | 6 | ||||
-rw-r--r-- | audio/spiralloops/distinfo | 18 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-af | 10 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-ag | 11 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-ah | 14 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-aj | 13 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-an | 13 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-ap | 13 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-ar | 20 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-as | 13 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-at | 15 |
11 files changed, 111 insertions, 35 deletions
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index 8d8e4bff72f..ab0bc2a774a 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2011/01/13 13:37:08 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2011/11/23 08:20:38 marino Exp $ # DISTNAME= SpiralLoops-2.0.0 PKGNAME= spiralloops-2.0.0 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= audio MASTER_SITES= http://www.pawfal.org/Software/SpiralLoops/dload/ @@ -14,7 +14,7 @@ COMMENT= Loop based sampler # only runs correctly on little-endian machines ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ *-*-hpcmips *-*-hpcsh *-*-i386 *-*-pc532 *-*-pmax \ - *-*-vax + *-*-vax *-*-x86_64 PKG_DESTDIR_SUPPORT= user-destdir diff --git a/audio/spiralloops/distinfo b/audio/spiralloops/distinfo index 31dad72f200..14a5a459a89 100644 --- a/audio/spiralloops/distinfo +++ b/audio/spiralloops/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2007/09/29 11:38:22 rillig Exp $ +$NetBSD: distinfo,v 1.11 2011/11/23 08:20:38 marino Exp $ SHA1 (SpiralLoops-2.0.0.tar.gz) = 47d9caa17f20827abef7708bff212bb3fad58a72 RMD160 (SpiralLoops-2.0.0.tar.gz) = b164bacf6d18128111959dbca079883b7fde8d85 @@ -8,16 +8,18 @@ SHA1 (patch-ab) = 9b276f356d2da5eda3b0ed49e58f1bde6cc87de6 SHA1 (patch-ac) = 04946ad637a6e0a371e604ffaadd15c119f796da SHA1 (patch-ad) = 09c1734e875335dae92afef7bbbd4fdc6821eb1f SHA1 (patch-ae) = 757ca5ca1c4f50a7848c947962efbc0148f1ccdc -SHA1 (patch-af) = 188cbce0dfad25fe617811000487821950f78d54 -SHA1 (patch-ag) = 1ad208ec5e7eeeee91ab1e5acb359f24858c4d39 -SHA1 (patch-ah) = f57d79b3467df16b4e6e0776f3457f97e5570210 +SHA1 (patch-af) = 0bfe36fc2fe19182ade1f4a0f0cf79436bf21a0d +SHA1 (patch-ag) = 86736dde352931cd0dc89cb4b5560ef7ef84305f +SHA1 (patch-ah) = 13266cbc1dc1e6961478052c4de32490cea5833e SHA1 (patch-ai) = 6329de61c54ee353540a48b5b5d7e6bdc5b6e44b -SHA1 (patch-aj) = 19c1d640a0c9ec3f6f873cd203c9c61e89eb824a +SHA1 (patch-aj) = afdff301be5b84d5f2a2332ab315a13f3f09211c SHA1 (patch-ak) = 94e4650bc10a7073718a83b27ab47e217cf15f85 SHA1 (patch-al) = 2189bef16fa9099497667fdfd7b5e54c4fc4bb48 SHA1 (patch-am) = 25fdb4422dd007d7ebee50a3fb2e2accc72b275b -SHA1 (patch-an) = f86cb89933e7c1a57d696283e398a40a579c04f1 +SHA1 (patch-an) = 0c45e0959591c066afb3c98c1a076b57d028b8f4 SHA1 (patch-ao) = fb30e505afb754536a07f0537109ceaeb343a5e4 -SHA1 (patch-ap) = adde17445fa15afa122dc1addf0c06f6504bef0c +SHA1 (patch-ap) = ae40c9c49c5cea53d9f72d5258becda13c580c08 SHA1 (patch-aq) = 3f21e84fcbc911ebaf3bb60009f7f0b4b60c801a -SHA1 (patch-ar) = 39e110d78bac2d704ef6f2e6d27f3f36058d46bf +SHA1 (patch-ar) = 63b1db77bf55825618e5e1c0f65f69c0e36e19f6 +SHA1 (patch-as) = 5198351e7d8ad641fef6eb4ba73ff86803b50a09 +SHA1 (patch-at) = dcd9bbf940a6433b4cfc175a6d4a0d6ee167b3ea diff --git a/audio/spiralloops/patches/patch-af b/audio/spiralloops/patches/patch-af index a73dd4fc0d2..f401ac9264f 100644 --- a/audio/spiralloops/patches/patch-af +++ b/audio/spiralloops/patches/patch-af @@ -1,13 +1,15 @@ -$NetBSD: patch-af,v 1.1 2003/12/19 16:37:54 ben Exp $ +$NetBSD: patch-af,v 1.2 2011/11/23 08:20:38 marino Exp $ ---- SpiralSound/SpiralInfo.h.orig 2001-04-19 13:48:12.000000000 -0700 +--- SpiralSound/SpiralInfo.h.orig 2001-04-19 20:48:12.000000000 +0000 +++ SpiralSound/SpiralInfo.h -@@ -16,6 +16,8 @@ +@@ -16,7 +16,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +-#include <iostream.h> +using namespace std; + - #include <iostream.h> ++#include <iostream> #include <string> #include <stdlib.h> + #include "Sample.h" diff --git a/audio/spiralloops/patches/patch-ag b/audio/spiralloops/patches/patch-ag index afa0e55429f..88a99c80a2e 100644 --- a/audio/spiralloops/patches/patch-ag +++ b/audio/spiralloops/patches/patch-ag @@ -1,10 +1,13 @@ -$NetBSD: patch-ag,v 1.1 2003/12/19 16:37:54 ben Exp $ +$NetBSD: patch-ag,v 1.2 2011/11/23 08:20:38 marino Exp $ ---- SpiralSound/Sample.C.orig 2001-04-19 13:48:13.000000000 -0700 +--- SpiralSound/Sample.C.orig 2001-04-19 20:48:13.000000000 +0000 +++ SpiralSound/Sample.C -@@ -20,7 +20,7 @@ +@@ -18,9 +18,9 @@ + + #include <string.h> #include "Sample.h" - #include "iostream.h" +-#include "iostream.h" ++#include <iostream> -Sample::Sample(int Len=0) : +Sample::Sample(int Len) : diff --git a/audio/spiralloops/patches/patch-ah b/audio/spiralloops/patches/patch-ah index 2b97fdbdc07..7e426210fbb 100644 --- a/audio/spiralloops/patches/patch-ah +++ b/audio/spiralloops/patches/patch-ah @@ -1,8 +1,16 @@ -$NetBSD: patch-ah,v 1.1 2003/12/19 16:37:54 ben Exp $ +$NetBSD: patch-ah,v 1.2 2011/11/23 08:20:38 marino Exp $ ---- SpiralSound/SpiralInfo.C.orig 2001-04-19 13:48:13.000000000 -0700 +--- SpiralSound/SpiralInfo.C.orig 2001-04-19 20:48:13.000000000 +0000 +++ SpiralSound/SpiralInfo.C -@@ -22,7 +22,7 @@ +@@ -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" diff --git a/audio/spiralloops/patches/patch-aj b/audio/spiralloops/patches/patch-aj index 3f132588210..28b6a13231a 100644 --- a/audio/spiralloops/patches/patch-aj +++ b/audio/spiralloops/patches/patch-aj @@ -1,7 +1,16 @@ -$NetBSD: patch-aj,v 1.1 2003/12/19 16:37:54 ben Exp $ +$NetBSD: patch-aj,v 1.2 2011/11/23 08:20:38 marino Exp $ ---- SpiralSound/RiffWav.C.orig 2001-04-19 13:48:12.000000000 -0700 +--- 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> @@ -55,7 +55,7 @@ WavFile::HeaderInfo::HeaderInfo() : Riff #endif } diff --git a/audio/spiralloops/patches/patch-an b/audio/spiralloops/patches/patch-an index ff074dbbc12..e2e8e57181b 100644 --- a/audio/spiralloops/patches/patch-an +++ b/audio/spiralloops/patches/patch-an @@ -1,7 +1,16 @@ -$NetBSD: patch-an,v 1.1 2003/12/19 16:37:54 ben Exp $ +$NetBSD: patch-an,v 1.2 2011/11/23 08:20:38 marino Exp $ ---- GUI/Widgets/Fl_Loop.C.orig 2001-04-19 13:48:10.000000000 -0700 +--- 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; diff --git a/audio/spiralloops/patches/patch-ap b/audio/spiralloops/patches/patch-ap index 28101b979be..5663ab17c95 100644 --- a/audio/spiralloops/patches/patch-ap +++ b/audio/spiralloops/patches/patch-ap @@ -1,7 +1,16 @@ -$NetBSD: patch-ap,v 1.1 2003/12/19 16:37:54 ben Exp $ +$NetBSD: patch-ap,v 1.2 2011/11/23 08:20:38 marino Exp $ ---- GUI/Widgets/Fl_Trigger.C.orig 2001-05-07 13:43:34.000000000 -0700 +--- 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; diff --git a/audio/spiralloops/patches/patch-ar b/audio/spiralloops/patches/patch-ar index c11ce150727..985260d133b 100644 --- a/audio/spiralloops/patches/patch-ar +++ b/audio/spiralloops/patches/patch-ar @@ -1,10 +1,16 @@ -$NetBSD: patch-ar,v 1.1 2007/09/29 11:38:22 rillig Exp $ +$NetBSD: patch-ar,v 1.2 2011/11/23 08:20:38 marino Exp $ -g++ 4 enforces cleaner code. - ---- SpiralSound/Sample.h.orig 2001-04-19 22:48:13.000000000 +0200 -+++ SpiralSound/Sample.h 2007-09-29 13:36:09.000000000 +0200 -@@ -63,13 +63,13 @@ public: +--- 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); @@ -20,7 +26,7 @@ g++ 4 enforces cleaner code. { assert(i>=0 && i<m_Length); // clip -@@ -79,7 +79,7 @@ public: +@@ -79,7 +80,7 @@ public: m_Data[i]=(short)v; } diff --git a/audio/spiralloops/patches/patch-as b/audio/spiralloops/patches/patch-as new file mode 100644 index 00000000000..e8fb65f7e04 --- /dev/null +++ b/audio/spiralloops/patches/patch-as @@ -0,0 +1,13 @@ +$NetBSD: patch-as,v 1.1 2011/11/23 08:20:38 marino Exp $ + +--- 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/audio/spiralloops/patches/patch-at b/audio/spiralloops/patches/patch-at new file mode 100644 index 00000000000..744cf50d2b5 --- /dev/null +++ b/audio/spiralloops/patches/patch-at @@ -0,0 +1,15 @@ +$NetBSD: patch-at,v 1.1 2011/11/23 08:20:38 marino Exp $ + +--- 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 |