Kill explicit static inline which breaks build with newer GCC versions.

It should be clever enough to inline it anyway.

2 files changed, 116 insertions, 1 deletions

diff --git a/audio/libvisual-plugins/distinfo b/audio/libvisual-plugins/distinfo
index d75e67e943c..9dfc6edeae3 100644
--- a/audio/libvisual-plugins/distinfo
+++ b/audio/libvisual-plugins/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/07/03 23:36:05 wiz Exp $
+$NetBSD: distinfo,v 1.7 2006/07/18 19:02:08 joerg Exp $
 
 SHA1 (libvisual-plugins-0.4.0.tar.gz) = 20490573c282d900ec0bd05133cb3707640254f5
 RMD160 (libvisual-plugins-0.4.0.tar.gz) = f7a82f4a9e4dec3e877833612ece570ffbf2404d
 Size (libvisual-plugins-0.4.0.tar.gz) = 828631 bytes
+SHA1 (patch-aa) = 9c84c7d8af69d603ea8ce4077247a217952c0cb3
 SHA1 (patch-ab) = 31a380ed59ed9eed1e5516c44fec54c1e7dcf25c
 SHA1 (patch-ac) = dea36f303b2b3f8d5aea970b22c06743490d07cc
diff --git a/audio/libvisual-plugins/patches/patch-aa b/audio/libvisual-plugins/patches/patch-aa
new file mode 100644
index 00000000000..226fdfe3ac7
--- /dev/null
+++ b/audio/libvisual-plugins/patches/patch-aa
@@ -0,0 +1,114 @@
+$NetBSD: patch-aa,v 1.4 2006/07/18 19:02:08 joerg Exp $
+
+--- plugins/morph/alphablend/morph_alphablend.c.orig	2006-07-18 18:55:47.000000000 +0000
++++ plugins/morph/alphablend/morph_alphablend.c
+@@ -33,18 +33,18 @@ typedef struct {
+ 	uint16_t b:5, g:6, r:5;
+ } _color16;
+ 
+-static inline int alpha_blend_buffer (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, int depth, float alpha);
++static int alpha_blend_buffer (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, int depth, float alpha);
+ 
+ /* alpha blenders */
+-static inline int alpha_blend_8_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
+-static inline int alpha_blend_16_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
+-static inline int alpha_blend_24_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
+-static inline int alpha_blend_32_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
+-
+-static inline int alpha_blend_8_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
+-static inline int alpha_blend_16_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
+-static inline int alpha_blend_24_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
+-static inline int alpha_blend_32_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
++static int alpha_blend_8_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
++static int alpha_blend_16_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
++static int alpha_blend_24_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
++static int alpha_blend_32_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
++
++static int alpha_blend_8_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
++static int alpha_blend_16_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
++static int alpha_blend_24_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
++static int alpha_blend_32_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha);
+ 
+ int lv_morph_alpha_init (VisPluginData *plugin);
+ int lv_morph_alpha_cleanup (VisPluginData *plugin);
+@@ -109,7 +109,7 @@ int lv_morph_alpha_apply (VisPluginData 
+ 	return 0;
+ }
+ 
+-static inline int alpha_blend_buffer (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, int depth, float alpha)
++static  int alpha_blend_buffer (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, int depth, float alpha)
+ {
+ 
+ 	if (visual_cpu_get_mmx ()) {
+@@ -149,7 +149,7 @@ static inline int alpha_blend_buffer (ui
+  * 32                   x		x
+  */
+ 
+-static inline int alpha_blend_8_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
++static  int alpha_blend_8_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
+ {
+ 	uint8_t ialpha = (alpha * 255);
+ 	int i;
+@@ -161,7 +161,7 @@ static inline int alpha_blend_8_c (uint8
+ 	return 0;
+ }
+ 
+-static inline int alpha_blend_16_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
++static  int alpha_blend_16_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
+ {
+ 	uint8_t ialpha = (alpha * 255);
+ 	_color16 *destr = (_color16 *) dest;
+@@ -178,7 +178,7 @@ static inline int alpha_blend_16_c (uint
+ 	return 0;
+ }
+ 
+-static inline int alpha_blend_24_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
++static  int alpha_blend_24_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
+ {
+ 	uint8_t ialpha = (alpha * 255);
+ 	int i;
+@@ -190,7 +190,7 @@ static inline int alpha_blend_24_c (uint
+ 	return 0;
+ }
+ 
+-static inline int alpha_blend_32_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
++static  int alpha_blend_32_c (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
+ {
+ 	uint8_t ialpha = (alpha * 255);
+ 	int i;
+@@ -202,7 +202,7 @@ static inline int alpha_blend_32_c (uint
+ 	return 0;
+ }
+ 
+-static inline int alpha_blend_8_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
++static  int alpha_blend_8_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
+ {
+ 	uint32_t aalpha = (alpha * 255);
+ 	uint32_t ialpha = aalpha;
+@@ -247,7 +247,7 @@ static inline int alpha_blend_8_mmx (uin
+ 	return 0;
+ }
+ 
+-static inline int alpha_blend_16_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
++static  int alpha_blend_16_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
+ {
+ 	uint8_t ialpha = (alpha * 255);
+ 	_color16 *destr = (_color16 *) dest;
+@@ -264,7 +264,7 @@ static inline int alpha_blend_16_mmx (ui
+ 	return 0;
+ }
+ 
+-static inline int alpha_blend_24_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
++static  int alpha_blend_24_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
+ {
+ 	uint8_t ialpha = (alpha * 255);
+ 	int i;
+@@ -276,7 +276,7 @@ static inline int alpha_blend_24_mmx (ui
+ 	return 0;
+ }
+ 
+-static inline int alpha_blend_32_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
++static  int alpha_blend_32_mmx (uint8_t *dest, uint8_t *src1, uint8_t *src2, int size, float alpha)
+ {
+ 	uint32_t ialpha = (alpha * 255);
+ 	int i;