From 15080e91973f5e5760c111a03e6689823166e305 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Sat, 29 Sep 2007 11:40:46 +0000
Subject: Fixed g++ 4 error message.

---
 audio/spiralsynth/distinfo         |  3 ++-
 audio/spiralsynth/patches/patch-ar | 42 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 audio/spiralsynth/patches/patch-ar

(limited to 'audio')

diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo
index 2bc881b1a39..3079a208556 100644
--- a/audio/spiralsynth/distinfo
+++ b/audio/spiralsynth/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/01/05 15:33:00 joerg Exp $
+$NetBSD: distinfo,v 1.12 2007/09/29 11:40:46 rillig Exp $
 
 SHA1 (SpiralSynth-2.0.0.tar.gz) = ea42c5b7710237139f5281cf0c4ca155c184c4cd
 RMD160 (SpiralSynth-2.0.0.tar.gz) = c05f38a9ae8b8b87f520c11854631e6dfa00c034
@@ -17,3 +17,4 @@ SHA1 (patch-al) = 7436bce933cbddcd4f869ab2cbbe27762d4273e5
 SHA1 (patch-am) = 4899c78015028a6e8047e5527362646e40a10708
 SHA1 (patch-an) = 2bafb1a9a959816af43a858fdb4a9df5586a91e9
 SHA1 (patch-ao) = 138f58bd7fae0226690747efcb8daf472e3a5337
+SHA1 (patch-ar) = 65ca1e3f86bbd76821ff0faecb9320bb356b0ec4
diff --git a/audio/spiralsynth/patches/patch-ar b/audio/spiralsynth/patches/patch-ar
new file mode 100644
index 00000000000..a19d3d52861
--- /dev/null
+++ b/audio/spiralsynth/patches/patch-ar
@@ -0,0 +1,42 @@
+$NetBSD: patch-ar,v 1.1 2007/09/29 11:40:46 rillig Exp $
+
+g++ 4 enforces cleaner code.
+
+--- SpiralSound/Sample.h.orig	2002-06-02 12:28:26.000000000 +0200
++++ SpiralSound/Sample.h	2007-09-29 13:39:21.000000000 +0200
+@@ -66,7 +66,7 @@ public:
+ 	void CropTo(int NewLength);
+ 	bool IsEmpty() const { return m_IsEmpty; }
+ 
+-	inline float &Sample::operator[](int i) const
++	inline float &operator[](int i) const
+ 	{		
+ 		#ifdef DEBUG
+ 			assert(i>=0 && i<m_Length);
+@@ -75,7 +75,7 @@ public:
+ 	}
+ 
+ 	// Linear interpolated
+-	inline float Sample::operator[](float i) const
++	inline float operator[](float i) const
+ 	{		
+ 		int ii=(int)i;
+ 		
+@@ -89,7 +89,7 @@ public:
+ 	}
+ 
+ 
+-	inline void Sample::Set(int i, float v) 
++	inline void Set(int i, float v) 
+ 	{	
+ 		m_IsEmpty=false;
+ 		#ifdef DEBUG
+@@ -98,7 +98,7 @@ public:
+ 		m_Data[i]=v;
+ 	}	
+ 	
+-	inline Sample &Sample::operator=(const Sample &rhs)
++	inline Sample &operator=(const Sample &rhs)
+ 	{
+ 		Allocate(rhs.GetLength());		
+ 		memcpy(m_Data,rhs.GetBuffer(),GetLengthInBytes());
-- 
cgit v1.2.3