Sat Mar 2 18:13:15 2013 UTC ()
Fix inline use. Avoid variable length types.


(joerg)
diff -r1.5 -r1.6 pkgsrc/emulators/gcube/distinfo
diff -r1.1 -r1.2 pkgsrc/emulators/gcube/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/emulators/gcube/patches/patch-ag
diff -r0 -r1.1 pkgsrc/emulators/gcube/patches/patch-general.c
diff -r0 -r1.1 pkgsrc/emulators/gcube/patches/patch-general.h
diff -r0 -r1.1 pkgsrc/emulators/gcube/patches/patch-gx__transform.h
cvs diff -r1.5 -r1.6 pkgsrc/emulators/gcube/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/gcube/Attic/distinfo 2011/11/29 06:17:57 1.5
+++ pkgsrc/emulators/gcube/Attic/distinfo 2013/03/02 18:13:14 1.6
@@ -1,12 +1,15 @@ @@ -1,12 +1,15 @@
1$NetBSD: distinfo,v 1.5 2011/11/29 06:17:57 sbd Exp $ 1$NetBSD: distinfo,v 1.6 2013/03/02 18:13:14 joerg Exp $
2 2
3SHA1 (gcube-0.4-src.tar.bz2) = dae967f8aedfc2115c3720dfe2c523128fddc8b6 3SHA1 (gcube-0.4-src.tar.bz2) = dae967f8aedfc2115c3720dfe2c523128fddc8b6
4RMD160 (gcube-0.4-src.tar.bz2) = 9a7c13ed611da22705f960686eea225e30b61dc6 4RMD160 (gcube-0.4-src.tar.bz2) = 9a7c13ed611da22705f960686eea225e30b61dc6
5Size (gcube-0.4-src.tar.bz2) = 803503 bytes 5Size (gcube-0.4-src.tar.bz2) = 803503 bytes
6SHA1 (patch-aa) = 6568ce5f29e26c80f8537f20a5babaa212a9a3f8 6SHA1 (patch-aa) = 6568ce5f29e26c80f8537f20a5babaa212a9a3f8
7SHA1 (patch-ab) = 8907f650214bec5cdbf032464a1be39cccea5d81 7SHA1 (patch-ab) = 8907f650214bec5cdbf032464a1be39cccea5d81
8SHA1 (patch-ac) = 24e52c1b863d858863317de1c34fe9a917f83599 8SHA1 (patch-ac) = 24e52c1b863d858863317de1c34fe9a917f83599
9SHA1 (patch-ad) = 2d21a509b768d6aa269cb30e1adf01279d98bc41 9SHA1 (patch-ad) = 2d21a509b768d6aa269cb30e1adf01279d98bc41
10SHA1 (patch-ae) = ca03b45a7e2e05371b3a495c55af8268d17f80c3 10SHA1 (patch-ae) = 2f0d6ff8e3e7937c48990822b692cc2532789c34
11SHA1 (patch-af) = 295f3c06b5942d19b8e9ad41c220fac42c3fb7f5 11SHA1 (patch-af) = 295f3c06b5942d19b8e9ad41c220fac42c3fb7f5
12SHA1 (patch-ag) = c84e395b61a849ca3cb6318a2c15aa8b5346a0bc 12SHA1 (patch-ag) = 886676b737029566b4e314465750fcd0db4c176c
 13SHA1 (patch-general.c) = 05bf7b82fa224f68fc63ba63116746442218e9d7
 14SHA1 (patch-general.h) = 0d6a737c5967179faeb94105592285dc7bf9638a
 15SHA1 (patch-gx__transform.h) = 8b0e3b4f202f0a998cdd712eecad4c664d1b0dda
cvs diff -r1.1 -r1.2 pkgsrc/emulators/gcube/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/emulators/gcube/patches/Attic/patch-ae 2006/06/26 10:56:57 1.1
+++ pkgsrc/emulators/gcube/patches/Attic/patch-ae 2013/03/02 18:13:14 1.2
@@ -1,26 +1,71 @@ @@ -1,26 +1,71 @@
1$NetBSD: patch-ae,v 1.1 2006/06/26 10:56:57 rillig Exp $ 1$NetBSD: patch-ae,v 1.2 2013/03/02 18:13:14 joerg Exp $
2 2
3Thou shalt not use reserved identifiers. 3Thou shalt not use reserved identifiers.
4 4
5--- gx_transform.c.orig 2005-01-12 02:23:37.000000000 +0100 5--- gx_transform.c.orig 2005-01-12 01:23:37.000000000 +0000
6+++ gx_transform.c 2006-06-26 12:46:19.000000000 +0200 6+++ gx_transform.c
 7@@ -34,7 +34,7 @@ float vdq, ndq, tdq[8];
 8
 9
 10
 11-inline __u32 color_unpack_rgb565 (__u32 X)
 12+__u32 color_unpack_rgb565 (__u32 X)
 13 {
 14 #ifdef LIL_ENDIAN
 15 return (((X & 0xf800) >> 8) | ((X & 0xe000) >> 13) |
7@@ -52,15 +52,15 @@ inline __u32 color_unpack_rgb565 (__u32  16@@ -52,15 +52,15 @@ inline __u32 color_unpack_rgb565 (__u32
8  17
9 inline __u32 color_unpack_rgba4 (__u32 X) 18 inline __u32 color_unpack_rgba4 (__u32 X)
10 { 19 {
11- __u32 _X = X; 20- __u32 _X = X;
12+ __u32 m_X = X; 21+ __u32 m_X = X;
13  22
14  23
15 #ifdef LIL_ENDIAN 24 #ifdef LIL_ENDIAN
16- _X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12); 25- _X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
17+ m_X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12); 26+ m_X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
18 #else 27 #else
19- _X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12); 28- _X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12);
20+ m_X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12); 29+ m_X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12);
21 #endif 30 #endif
22- return (_X | (_X << 4)); 31- return (_X | (_X << 4));
23+ return (m_X | (m_X << 4)); 32+ return (m_X | (m_X << 4));
24 } 33 }
25  34
26  35
 36@@ -111,7 +111,7 @@ inline __u32 color_unpack_rgb4a3 (__u32
 37 }
 38
 39
 40-inline __u32 color_unpack_rgb5a3 (__u32 X)
 41+__u32 color_unpack_rgb5a3 (__u32 X)
 42 {
 43 if (X & 0x8000)
 44 return (color_unpack_rgb555 (X) | MASK_ALPHA);
 45@@ -128,7 +128,7 @@ inline __u32 color_unpack_i4 (__u32 X)
 46 }
 47
 48
 49-inline __u32 color_unpack_i8 (__u32 X)
 50+__u32 color_unpack_i8 (__u32 X)
 51 {
 52 X |= X << 8;
 53 return (X | (X << 16));
 54@@ -151,7 +151,7 @@ inline __u32 color_unpack_ia4 (__u32 X)
 55 }
 56
 57
 58-inline __u32 color_unpack_ia8 (__u32 X)
 59+__u32 color_unpack_ia8 (__u32 X)
 60 {
 61 __u32 a = X & 0xff00;
 62
 63@@ -5663,7 +5663,7 @@ inline GXLight *xf_get_light (int i)
 64 }
 65
 66
 67-inline void calc_color (float outcolor[4], float incolor[4], int chn, float pos[3], float normal[3])
 68+static inline void calc_color (float outcolor[4], float incolor[4], int chn, float pos[3], float normal[3])
 69 {
 70 float lightsum[4], lcolor[4], tcolor[4];
 71 __u32 lmask;
cvs diff -r1.1 -r1.2 pkgsrc/emulators/gcube/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/emulators/gcube/patches/Attic/patch-ag 2006/06/26 10:56:57 1.1
+++ pkgsrc/emulators/gcube/patches/Attic/patch-ag 2013/03/02 18:13:14 1.2
@@ -1,44 +1,161 @@ @@ -1,44 +1,161 @@
1$NetBSD: patch-ag,v 1.1 2006/06/26 10:56:57 rillig Exp $ 1$NetBSD: patch-ag,v 1.2 2013/03/02 18:13:14 joerg Exp $
2 2
3Thou shalt not use reserved identifiers. 3Thou shalt not use reserved identifiers.
4 4
5--- tplx.c.orig 2004-12-27 16:57:42.000000000 +0100 5--- tplx.c.orig 2004-12-27 15:57:42.000000000 +0000
6+++ tplx.c 2006-06-26 12:50:49.000000000 +0200 6+++ tplx.c
7@@ -37,13 +37,13 @@ 7@@ -37,13 +37,13 @@
8  8
9 # define BSWAP_16(B)\ 9 # define BSWAP_16(B)\
10 ({\ 10 ({\
11- __u16 _B = (B);\ 11- __u16 _B = (B);\
12- (((__u16) ((_B) << 8) | ((_B) >> 8)));\ 12- (((__u16) ((_B) << 8) | ((_B) >> 8)));\
13+ __u16 m_B = (B);\ 13+ __u16 m_B = (B);\
14+ (((__u16) ((m_B) << 8) | ((m_B) >> 8)));\ 14+ (((__u16) ((m_B) << 8) | ((m_B) >> 8)));\
15 }) 15 })
16 # define BSWAP_32(B)\ 16 # define BSWAP_32(B)\
17 ({\ 17 ({\
18- __u32 _B = (B);\ 18- __u32 _B = (B);\
19- (((__u32) (_B << 24) | ((_B << 8) & 0xff0000) | ((_B >> 8) & 0xff00) | (_B >> 24)));\ 19- (((__u32) (_B << 24) | ((_B << 8) & 0xff0000) | ((_B >> 8) & 0xff00) | (_B >> 24)));\
20+ __u32 m_B = (B);\ 20+ __u32 m_B = (B);\
21+ (((__u32) (m_B << 24) | ((m_B << 8) & 0xff0000) | ((m_B >> 8) & 0xff00) | (m_B >> 24)));\ 21+ (((__u32) (m_B << 24) | ((m_B << 8) & 0xff0000) | ((m_B >> 8) & 0xff00) | (m_B >> 24)));\
22 }) 22 })
23  23
24 #ifdef LIL_ENDIAN 24 #ifdef LIL_ENDIAN
25@@ -135,15 +135,15 @@ inline __u32 color_unpack_rgb565 (__u32  25@@ -103,21 +103,17 @@ typedef struct
 26 __u32 offset;
 27 } TPLPaletteHeader;
 28
 29-
 30-#define TPLHeader(n) \
 31- struct\
 32- {\
 33- __u32 magic;\
 34- __u32 ntextures;\
 35- __u32 texture_size;\
 36- TPLTexture textures[n];\
 37- }\
 38-
 39+struct tplheader {
 40+ __u32 magic;
 41+ __u32 ntextures;
 42+ __u32 texture_size;
 43+ TPLTexture textures[];
 44+};
26  45
27 inline __u32 color_unpack_rgba4 (__u32 X) 46 __u8 texbuff[1024*1024*4];
 47
 48
 49-inline __u32 color_unpack_rgb565 (__u32 X)
 50+__u32 color_unpack_rgb565 (__u32 X)
 51 {
 52 #ifdef LIL_ENDIAN
 53 return (((X & 0xf800) >> 8) | ((X & 0xe000) >> 13) |
 54@@ -133,21 +129,21 @@ inline __u32 color_unpack_rgb565 (__u32
 55 }
 56
 57
 58-inline __u32 color_unpack_rgba4 (__u32 X)
 59+__u32 color_unpack_rgba4 (__u32 X)
28 { 60 {
29- __u32 _X = X; 61- __u32 _X = X;
30+ __u32 m_X = X; 62+ __u32 m_X = X;
31  63
32  64
33 #ifdef LIL_ENDIAN 65 #ifdef LIL_ENDIAN
34- _X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12); 66- _X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
35+ m_X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12); 67+ m_X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
36 #else 68 #else
37- _X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12); 69- _X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12);
38+ m_X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12); 70+ m_X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12);
39 #endif 71 #endif
40- return (_X | (_X << 4)); 72- return (_X | (_X << 4));
41+ return (m_X | (m_X << 4)); 73+ return (m_X | (m_X << 4));
42 } 74 }
43  75
44  76
 77-inline __u32 color_unpack_rgba6 (__u32 X)
 78+__u32 color_unpack_rgba6 (__u32 X)
 79 {
 80 #ifdef LIL_ENDIAN
 81 return ((X & 0xfc0000) >> 16) | ((X & 0xc00000) >> 22) |
 82@@ -163,7 +159,7 @@ inline __u32 color_unpack_rgba6 (__u32 X
 83 }
 84
 85 // RGB5 1rrr rrgg gggb bbbb
 86-inline __u32 color_unpack_rgb555 (__u32 X)
 87+__u32 color_unpack_rgb555 (__u32 X)
 88 {
 89 #ifdef LIL_ENDIAN
 90 return ((X & 0x7c00) >> 7) | ((X & 0x7000) >> 12) |
 91@@ -178,7 +174,7 @@ inline __u32 color_unpack_rgb555 (__u32
 92
 93
 94 // RGB4A3 0aaa rrrr gggg bbbb
 95-inline __u32 color_unpack_rgb4a3 (__u32 X)
 96+__u32 color_unpack_rgb4a3 (__u32 X)
 97 {
 98 #ifdef LIL_ENDIAN
 99 return ((X & 0x0f00) >> 4) | ((X & 0x0f00) >> 8) |
 100@@ -194,7 +190,7 @@ inline __u32 color_unpack_rgb4a3 (__u32
 101 }
 102
 103
 104-inline __u32 color_unpack_rgb5a3 (__u32 X)
 105+__u32 color_unpack_rgb5a3 (__u32 X)
 106 {
 107 if (X & 0x8000)
 108 return (color_unpack_rgb555 (X) | MASK_ALPHA);
 109@@ -203,7 +199,7 @@ inline __u32 color_unpack_rgb5a3 (__u32
 110 }
 111
 112
 113-inline __u32 color_unpack_i4 (__u32 X)
 114+__u32 color_unpack_i4 (__u32 X)
 115 {
 116 X |= X << 4;
 117 X |= X << 8;
 118@@ -211,14 +207,14 @@ inline __u32 color_unpack_i4 (__u32 X)
 119 }
 120
 121
 122-inline __u32 color_unpack_i8 (__u32 X)
 123+__u32 color_unpack_i8 (__u32 X)
 124 {
 125 X |= X << 8;
 126 return (X | (X << 16));
 127 }
 128
 129
 130-inline __u32 color_unpack_ia4 (__u32 X)
 131+__u32 color_unpack_ia4 (__u32 X)
 132 {
 133 __u32 a = X & 0xf0;
 134
 135@@ -234,7 +230,7 @@ inline __u32 color_unpack_ia4 (__u32 X)
 136 }
 137
 138
 139-inline __u32 color_unpack_ia8 (__u32 X)
 140+__u32 color_unpack_ia8 (__u32 X)
 141 {
 142 __u32 a = X & 0xff00;
 143
 144@@ -826,7 +822,7 @@ int extract_textures (char *buff)
 145 {
 146 char temp[256];
 147 int i;
 148- TPLHeader (1) *hdr = (void *)buff;
 149+ struct tplheader *hdr = (void *)buff;
 150
 151
 152 if (BSWAP32 (hdr->magic) != TPL_MAGIC)
 153@@ -839,7 +835,7 @@ int extract_textures (char *buff)
 154 {
 155 int n = BSWAP32 (((__u32 *)buff)[1]);
 156 // using variable length array
 157- TPLHeader (n) *hdr = (void *) buff;
 158+ struct tplheader *hdr = (void *)buff;
 159 TPLTextureHeader *texhdr = (void *) &buff[BSWAP32 (hdr->textures[0].texture_header_offset)];
 160 TPLPaletteHeader *palhdr;
 161
File Added: pkgsrc/emulators/gcube/patches/Attic/patch-general.c
$NetBSD: patch-general.c,v 1.1 2013/03/02 18:13:14 joerg Exp $

--- general.c.orig	2013-03-01 16:14:43.000000000 +0000
+++ general.c
@@ -187,7 +187,7 @@ __u32 round_up (__u32 a, __u32 b)
 }
 
 
-inline int is_power_of_two (__u32 a)
+int is_power_of_two (__u32 a)
 {
 	int i = 0;
File Added: pkgsrc/emulators/gcube/patches/Attic/patch-general.h
$NetBSD: patch-general.h,v 1.1 2013/03/02 18:13:14 joerg Exp $

--- general.h.orig	2013-03-01 16:14:47.000000000 +0000
+++ general.h
@@ -81,7 +81,7 @@ char *kill_extension (char *filename);
 char *get_home_dir (void);
 
 __u32 round_up (__u32 a, __u32 b);
-inline int is_power_of_two (__u32 a);
+int is_power_of_two (__u32 a);
 
 __u32 crc_setup (unsigned int bits);
 __u32 crc_iterate (__u32 crc, __u8 d);
File Added: pkgsrc/emulators/gcube/patches/Attic/patch-gx__transform.h
$NetBSD: patch-gx__transform.h,v 1.1 2013/03/02 18:13:14 joerg Exp $

--- gx_transform.h.orig	2013-03-01 16:11:32.000000000 +0000
+++ gx_transform.h
@@ -2,17 +2,16 @@
 #define __GX_TRANSFORM_H 1
 
 
-
-inline __u32 color_unpack_rgb565 (__u32 X);
-inline __u32 color_unpack_rgba4 (__u32 X);
-inline __u32 color_unpack_rgba6 (__u32 X);
-inline __u32 color_unpack_rgb555 (__u32 X);
-inline __u32 color_unpack_rgb4a3 (__u32 X);
-inline __u32 color_unpack_rgb5a3 (__u32 X);
-inline __u32 color_unpack_i4 (__u32 X);
-inline __u32 color_unpack_i8 (__u32 X);
-inline __u32 color_unpack_ia4 (__u32 X);
-inline __u32 color_unpack_ia8 (__u32 X);
+__u32 color_unpack_rgb565 (__u32 X);
+__u32 color_unpack_rgba4 (__u32 X);
+__u32 color_unpack_rgba6 (__u32 X);
+__u32 color_unpack_rgb555 (__u32 X);
+__u32 color_unpack_rgb4a3 (__u32 X);
+__u32 color_unpack_rgb5a3 (__u32 X);
+__u32 color_unpack_i4 (__u32 X);
+__u32 color_unpack_i8 (__u32 X);
+__u32 color_unpack_ia4 (__u32 X);
+__u32 color_unpack_ia8 (__u32 X);
 
 unsigned int gx_draw (__u32 mem, int prim, int n, int vat);