summaryrefslogtreecommitdiff
path: root/audio/spiralloops
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2012-02-15 22:47:31 +0000
committerhans <hans@pkgsrc.org>2012-02-15 22:47:31 +0000
commitd254ab9749e28bcb3951b727fc0107d1bb327d78 (patch)
treee85a3aee4c9d1abb01d17b90fa784d514218f4a3 /audio/spiralloops
parent5246af425d809a113f512b7c0e97cfd97087c5b9 (diff)
downloadpkgsrc-d254ab9749e28bcb3951b727fc0107d1bb327d78.tar.gz
Fix build on SunOS.
Diffstat (limited to 'audio/spiralloops')
-rw-r--r--audio/spiralloops/Makefile3
-rw-r--r--audio/spiralloops/patches/patch-ai22
-rw-r--r--audio/spiralloops/patches/patch-aj22
3 files changed, 42 insertions, 5 deletions
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index ab0bc2a774a..be23ce325f4 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2011/11/23 08:20:38 marino Exp $
+# $NetBSD: Makefile,v 1.33 2012/02/15 22:47:31 hans Exp $
#
DISTNAME= SpiralLoops-2.0.0
@@ -24,6 +24,7 @@ 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
INSTALLATION_DIRS= bin
diff --git a/audio/spiralloops/patches/patch-ai b/audio/spiralloops/patches/patch-ai
index da97fd00e10..be1d266b7c4 100644
--- a/audio/spiralloops/patches/patch-ai
+++ b/audio/spiralloops/patches/patch-ai
@@ -1,8 +1,26 @@
-$NetBSD: patch-ai,v 1.1 2003/12/19 16:37:54 ben Exp $
+$NetBSD: patch-ai,v 1.2 2012/02/15 22:47:31 hans Exp $
--- SpiralSound/Output.C.orig 2001-04-19 13:48:12.000000000 -0700
+++ SpiralSound/Output.C
-@@ -29,7 +29,7 @@ m_Channels(Channels)
+@@ -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();
}
diff --git a/audio/spiralloops/patches/patch-aj b/audio/spiralloops/patches/patch-aj
index 28b6a13231a..126bcd43d9d 100644
--- a/audio/spiralloops/patches/patch-aj
+++ b/audio/spiralloops/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2011/11/23 08:20:38 marino Exp $
+$NetBSD: patch-aj,v 1.3 2012/02/15 22:47:31 hans Exp $
--- SpiralSound/RiffWav.C.orig 2001-04-19 20:48:12.000000000 +0000
+++ SpiralSound/RiffWav.C
@@ -11,7 +11,25 @@ $NetBSD: patch-aj,v 1.2 2011/11/23 08:20:38 marino Exp $
#include <fstream>
#include <stdio.h>
#include <stdlib.h>
-@@ -55,7 +55,7 @@ WavFile::HeaderInfo::HeaderInfo() : Riff
+@@ -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
}