[pkgsrc/trunk]: pkgsrc/audio/libvisual-plugins Kill explicit static inline wh...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8010b81399c7
branches:  trunk
changeset: 516300:8010b81399c7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 18 19:02:08 2006 +0000

description:
Kill explicit static inline which breaks build with newer GCC versions.
It should be clever enough to inline it anyway.

diffstat:

 audio/libvisual-plugins/distinfo         |    3 +-
 audio/libvisual-plugins/patches/patch-aa |  114 +++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+), 1 deletions(-)

diffs (131 lines):

diff -r 920b2ac4cdf9 -r 8010b81399c7 audio/libvisual-plugins/distinfo
--- a/audio/libvisual-plugins/distinfo  Tue Jul 18 18:41:17 2006 +0000
+++ b/audio/libvisual-plugins/distinfo  Tue Jul 18 19:02:08 2006 +0000
@@ -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 -r 920b2ac4cdf9 -r 8010b81399c7 audio/libvisual-plugins/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libvisual-plugins/patches/patch-aa  Tue Jul 18 19:02:08 2006 +0000
@@ -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;