- don't pass gcc specific arguments

- don't use static variables in inline functions

fixes build with sunpro.

4 files changed, 62 insertions, 12 deletions

diff --git a/audio/toolame/distinfo b/audio/toolame/distinfo
index 3242892754a..cecbd698e94 100644
--- a/audio/toolame/distinfo
+++ b/audio/toolame/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:52 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/07/30 11:30:03 grant Exp $
 
 SHA1 (toolame-02l.tgz) = 9f58345ec5d552f49a9ad598e6eb2dc126cb10b4
 RMD160 (toolame-02l.tgz) = 65ff0757f48080093df9e1932b5952199d03f5c6
 Size (toolame-02l.tgz) = 127493 bytes
-SHA1 (patch-aa) = 317743c6cb8d610be2dd3861388015b5d9cf7bf6
-SHA1 (patch-ab) = e2b8bb920d778c3d9fc1b72ff286c96d62a03051
-SHA1 (patch-ac) = 200f24e7d06448456ebd51efb9e80a529324bb80
+SHA1 (patch-aa) = 44633513f0ad2768ad1531ab41e059659d661630
+SHA1 (patch-ab) = 3dae25436a931eea5fe33aa0dcca16c46e529ed7
+SHA1 (patch-ac) = 6a4df822e31858a52203a62ce8d5d1f20931dbbb
+SHA1 (patch-ad) = 9b3f8fc15012714da8b1c701103b5aa2ed77ac87
diff --git a/audio/toolame/patches/patch-aa b/audio/toolame/patches/patch-aa
index a0eb97ab7dd..e5099f35ad9 100644
--- a/audio/toolame/patches/patch-aa
+++ b/audio/toolame/patches/patch-aa
@@ -1,9 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/23 07:07:26 mrg Exp $
+$NetBSD: patch-aa,v 1.2 2005/07/30 11:30:03 grant Exp $
 
 these patches correct invalid C code that declares variables after statements.
 
 --- psycho_3.c.orig	2003-03-01 20:35:14.000000000 +1100
-+++ psycho_3.c	2003-06-20 17:07:31.000000000 +1000
++++ psycho_3.c
+@@ -22,7 +22,7 @@
+ 
+ /* Keep a table to fudge the adding of dB */
+ #define DBTAB 1000
+-static double dbtable[DBTAB];
++double dbtable[DBTAB];
+ 
+ #define CRITBANDMAX 32 /* this is much higher than it needs to be. really only about 24 */
+ int cbands=0; /* How many critical bands there really are */
 @@ -133,8 +133,8 @@ void psycho_3_fft(FLOAT sample[BLKSIZE],
    static FLOAT *window;
  
diff --git a/audio/toolame/patches/patch-ab b/audio/toolame/patches/patch-ab
index 6028323a730..3dbe44b8288 100644
--- a/audio/toolame/patches/patch-ab
+++ b/audio/toolame/patches/patch-ab
@@ -1,9 +1,20 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/06/23 07:07:26 mrg Exp $
+$NetBSD: patch-ab,v 1.2 2005/07/30 11:30:03 grant Exp $
 
 these patches correct invalid C code that declares variables after statements.
 
 --- psycho_4.c.orig	2003-03-02 11:50:48.000000000 +1100
-+++ psycho_4.c	2003-06-20 17:06:47.000000000 +1000
++++ psycho_4.c
+@@ -83,8 +83,8 @@ static F2HBLK *r, *phi_sav;
+ 
+ #define TRIGTABLESIZE 3142
+ #define TRIGTABLESCALE 1000.0
+-static FLOAT cos_table[TRIGTABLESIZE];
+-static FLOAT sin_table[TRIGTABLESIZE];
++FLOAT cos_table[TRIGTABLESIZE];
++FLOAT sin_table[TRIGTABLESIZE];
+ void psycho_4_trigtable_init(void) {
+ 
+   int i;
 @@ -361,6 +361,7 @@ void psycho_4_init (double sfreq, option
    }  
   
diff --git a/audio/toolame/patches/patch-ac b/audio/toolame/patches/patch-ac
index 07d2df9374c..0303ef52528 100644
--- a/audio/toolame/patches/patch-ac
+++ b/audio/toolame/patches/patch-ac
@@ -1,11 +1,40 @@
-$NetBSD: patch-ac,v 1.1 2003/09/23 21:32:16 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2005/07/30 11:30:03 grant Exp $
 
---- Makefile.orig	Sun Mar  2 07:07:02 2003
-+++ Makefile	Tue Sep 23 21:28:07 2003
-@@ -38,5 +38,5 @@
+--- Makefile.orig	2003-03-02 18:07:02.000000000 +1100
++++ Makefile
+@@ -1,5 +1,5 @@
+ 
+-CC = gcc
++#CC = gcc
+ 
+ c_sources = \
+ 	common.c \
+@@ -28,7 +28,7 @@ OBJ = $(c_sources:.c=.o)
+ 
+ #Uncomment this if you want to do some profiling/debugging
+ #PG = -g -pg
+-PG = -fomit-frame-pointer
++#PG = -fomit-frame-pointer
+ 
+ # Optimize flag. 3 is about as high as you can sanely go with GCC3.2.
+ OPTIM = -O3
+@@ -37,7 +37,7 @@ OPTIM = -O3
+ REQUIRED = -DNDEBUG -DINLINE=inline
  
  #pick your architecture
 -ARCH = -march=pentium
 +#ARCH = -march=pentium
  #Possible x86 architectures
  #gcc3.2 => i386, i486, i586, i686, pentium, pentium-mmx
+ #          pentiumpro, pentium2, pentium3, pentium4, k6, k6-2, k6-3,
+@@ -51,8 +51,8 @@ ARCH = -march=pentium
+ #	-fschedule-insns2 -fno-strength-reduce
+ 
+ #Set a stack of warnings to overcome my atrocious coding style . MFC.
+-WARNINGS = -Wall
+-WARNINGS2 = -Wstrict-prototypes -Wmissing-prototypes -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wredundant-decls
++#WARNINGS = -Wall
++#WARNINGS2 = -Wstrict-prototypes -Wmissing-prototypes -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wredundant-decls
+ 
+ NEW_02L_FIXES = -DNEWENCODE -DNEWATAN
+