Sat Mar 27 12:26:19 2010 UTC ()
fix a wrong #include in patch-aa which caused sparc64 build to fail.


(tnn)
diff -r1.69 -r1.70 pkgsrc/graphics/MesaLib/distinfo
diff -r1.11 -r1.12 pkgsrc/graphics/MesaLib/patches/patch-aa
cvs diff -r1.69 -r1.70 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2009/09/02 22:30:34 1.69
+++ pkgsrc/graphics/MesaLib/distinfo 2010/03/27 12:26:19 1.70
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.69 2009/09/02 22:30:34 wiz Exp $ 1$NetBSD: distinfo,v 1.70 2010/03/27 12:26:19 tnn Exp $
2 2
3SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe 3SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
4RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1 4RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
5Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes 5Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes
6SHA1 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 41635a1c5b3bfe4bff4f9a086fb0b17fd441c431 6SHA1 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 41635a1c5b3bfe4bff4f9a086fb0b17fd441c431
7RMD160 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 33a9e1a7b014d284ea4ec785c1912baccc5b2176 7RMD160 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 33a9e1a7b014d284ea4ec785c1912baccc5b2176
8Size (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 328900 bytes 8Size (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 328900 bytes
9SHA1 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 1cdcef24900489bc0a879013b2138c0d9aedffe3 9SHA1 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 1cdcef24900489bc0a879013b2138c0d9aedffe3
10RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084 10RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084
11Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes 11Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes
12SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861 12SHA1 (patch-aa) = e1ccbfd075b644b84af23d0185aa92263fe848c6
13SHA1 (patch-ab) = 2d7cb59c5a157142ffbfbed026d8a51cb18d21ee 13SHA1 (patch-ab) = 2d7cb59c5a157142ffbfbed026d8a51cb18d21ee
14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468 14SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
15SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393 15SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393
16SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab 16SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab
17SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04 17SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04
18SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7 18SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7
19SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f 19SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f
20SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87 20SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87
21SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c 21SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c
22SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4 22SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4
23SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388 23SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388
24SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef 24SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
25SHA1 (patch-an) = ff03138906ab51c88007f11fdcf1765778b8d5f8 25SHA1 (patch-an) = ff03138906ab51c88007f11fdcf1765778b8d5f8
cvs diff -r1.11 -r1.12 pkgsrc/graphics/MesaLib/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-aa 2009/06/05 11:10:35 1.11
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-aa 2010/03/27 12:26:19 1.12
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-aa,v 1.11 2009/06/05 11:10:35 wiz Exp $ 1$NetBSD: patch-aa,v 1.12 2010/03/27 12:26:19 tnn Exp $
2 2
3--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2009-01-22 19:38:33 +0200 3--- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2009-01-22 17:38:33.000000000 +0000
4+++ src/mesa/drivers/dri/mach64/mach64_context.h 2009-05-19 12:13:08 +0300 4+++ src/mesa/drivers/dri/mach64/mach64_context.h
5@@ -294,12 +294,19 @@ extern GLboolean mach64UnbindContext( __ 5@@ -294,12 +294,19 @@ extern GLboolean mach64UnbindContext( __
6 #define LE32_OUT( x, y ) do { *(GLuint *)(x) = (y); } while (0) 6 #define LE32_OUT( x, y ) do { *(GLuint *)(x) = (y); } while (0)
7 #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) = (y); } while (0) 7 #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) = (y); } while (0)
8 #else 8 #else
9+/* XXX mesa should handle many more platforms here [properly] */ 9+/* XXX mesa should handle many more platforms here [properly] */
10+#if defined(__NetBSD__) 10+#if defined(__NetBSD__)
11+#include <sys/types.h> 11+#include <sys/types.h>
12+#include <machine/byteswap.h> 12+#include <machine/bswap.h>
13+#define bswap_32 bswap32 13+#define bswap_32 bswap32
14+#else 14+#else
15 #ifndef __OpenBSD__ 15 #ifndef __OpenBSD__
16 #include <byteswap.h> 16 #include <byteswap.h>
17 #else 17 #else
18 #include <machine/endian.h> 18 #include <machine/endian.h>
19 #define bswap_32 bswap32 19 #define bswap_32 bswap32
20 #endif 20 #endif
21+#endif 21+#endif
22  22
23 #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) 23 #define LE32_IN( x ) bswap_32( *(GLuint *)(x) )
24 #define LE32_IN_FLOAT( x ) \ 24 #define LE32_IN_FLOAT( x ) \