Sun Jun 16 04:16:59 2013 UTC ()
Change MESA_BIG_ENDIAN condition check for PR pkg/47919.


(obache)
diff -r1.79 -r1.80 pkgsrc/graphics/MesaLib/distinfo
diff -r1.2 -r1.3 pkgsrc/graphics/MesaLib/patches/patch-src_mesa_main_compiler.h
cvs diff -r1.79 -r1.80 pkgsrc/graphics/MesaLib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/distinfo 2013/06/13 21:35:24 1.79
+++ pkgsrc/graphics/MesaLib/distinfo 2013/06/16 04:16:59 1.80
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.79 2013/06/13 21:35:24 wiz Exp $ 1$NetBSD: distinfo,v 1.80 2013/06/16 04:16:59 obache Exp $
2 2
3SHA1 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = 2e6e730204800a0748b301a5f58b86332699788b 3SHA1 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = 2e6e730204800a0748b301a5f58b86332699788b
4RMD160 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = bb2b140375aa13df79fcdb60a7ad0a63622dc531 4RMD160 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = bb2b140375aa13df79fcdb60a7ad0a63622dc531
5Size (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = 201575 bytes 5Size (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = 201575 bytes
6SHA1 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 5981ac2de8438e5f4a1f3561f2044d700c5f0de9 6SHA1 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 5981ac2de8438e5f4a1f3561f2044d700c5f0de9
7RMD160 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 656ded1db6c1f6fdd15a3f2cdee1b895d393bcea 7RMD160 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 656ded1db6c1f6fdd15a3f2cdee1b895d393bcea
8Size (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 6257280 bytes 8Size (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 6257280 bytes
9SHA1 (patch-af) = da0bd412b81d4b826b6d9b4bb8d98ca1fe0006ba 9SHA1 (patch-af) = da0bd412b81d4b826b6d9b4bb8d98ca1fe0006ba
10SHA1 (patch-bin_mklib) = 152b61d40d2e24cf3674d346e94fcab04b850909 10SHA1 (patch-bin_mklib) = 152b61d40d2e24cf3674d346e94fcab04b850909
11SHA1 (patch-configure.ac) = 0e3f9a1f21ba3a50161312683e9a0ad36f9f3e61 11SHA1 (patch-configure.ac) = 0e3f9a1f21ba3a50161312683e9a0ad36f9f3e61
12SHA1 (patch-include_GL_gl.h) = a97ab309556c78d818d0b8bd867b5f2412c141b0 12SHA1 (patch-include_GL_gl.h) = a97ab309556c78d818d0b8bd867b5f2412c141b0
13SHA1 (patch-src_gallium_include_pipe_p__config.h) = 934e2505fe299e1a25da6def2f971fa1302840c0 13SHA1 (patch-src_gallium_include_pipe_p__config.h) = 934e2505fe299e1a25da6def2f971fa1302840c0
14SHA1 (patch-src_glsl_ir__constant__expression.cpp) = 281e281f51afed244b1a29b92942d572fc095124 14SHA1 (patch-src_glsl_ir__constant__expression.cpp) = 281e281f51afed244b1a29b92942d572fc095124
@@ -17,16 +17,16 @@ SHA1 (patch-src_mesa_drivers_dri_common_ @@ -17,16 +17,16 @@ SHA1 (patch-src_mesa_drivers_dri_common_
17SHA1 (patch-src_mesa_drivers_dri_common_mmio.h) = b6da48111fb2792b1c71eb7549d0f03adceec9f1 17SHA1 (patch-src_mesa_drivers_dri_common_mmio.h) = b6da48111fb2792b1c71eb7549d0f03adceec9f1
18SHA1 (patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c) = fec8b1a9f6888e9a4225861ea5bda776ecc5f054 18SHA1 (patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c) = fec8b1a9f6888e9a4225861ea5bda776ecc5f054
19SHA1 (patch-src_mesa_drivers_dri_i915_intel__tris.c) = 74a2ca9f9c865db9b6212087e442f65bb0621227 19SHA1 (patch-src_mesa_drivers_dri_i915_intel__tris.c) = 74a2ca9f9c865db9b6212087e442f65bb0621227
20SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw.c) = ce12dc2d2391300d32776a06f5d0096448019c6b 20SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw.c) = ce12dc2d2391300d32776a06f5d0096448019c6b
21SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw__upload.c) = 44162ca546072669b85093981728e635dda69e55 21SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw__upload.c) = 44162ca546072669b85093981728e635dda69e55
22SHA1 (patch-src_mesa_drivers_dri_i965_brw__misc__state.c) = d37f967dea0fc3bd32566d6a26fd434ca9564081 22SHA1 (patch-src_mesa_drivers_dri_i965_brw__misc__state.c) = d37f967dea0fc3bd32566d6a26fd434ca9564081
23SHA1 (patch-src_mesa_drivers_dri_i965_gen6__vs__state.c) = c918b5a91b339e49850d718c957d7e717c2dc130 23SHA1 (patch-src_mesa_drivers_dri_i965_gen6__vs__state.c) = c918b5a91b339e49850d718c957d7e717c2dc130
24SHA1 (patch-src_mesa_drivers_dri_i965_gen6__wm__state.c) = a8ecf943525888b22ec99fe454b08f43c5d8a911 24SHA1 (patch-src_mesa_drivers_dri_i965_gen6__wm__state.c) = a8ecf943525888b22ec99fe454b08f43c5d8a911
25SHA1 (patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c) = 653c87e1123ce9a27b71221fff4119df34abe15f 25SHA1 (patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c) = 653c87e1123ce9a27b71221fff4119df34abe15f
26SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.c) = 21d3c08a27817a6358b88101f889120869eebcce 26SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.c) = 21d3c08a27817a6358b88101f889120869eebcce
27SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.h) = 6d394e704636134768a6cb5a200ebcc7bc3f52ed 27SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.h) = 6d394e704636134768a6cb5a200ebcc7bc3f52ed
28SHA1 (patch-src_mesa_drivers_dri_mach64_mach64__context.h) = fe95c6610de4c1482c568463aca82f53ed0df900 28SHA1 (patch-src_mesa_drivers_dri_mach64_mach64__context.h) = fe95c6610de4c1482c568463aca82f53ed0df900
29SHA1 (patch-src_mesa_drivers_x11_Makefile) = 17b72d2b74d89fbd8db05491cfcf253bb856b139 29SHA1 (patch-src_mesa_drivers_x11_Makefile) = 17b72d2b74d89fbd8db05491cfcf253bb856b139
30SHA1 (patch-src_mesa_main_compiler.h) = 88acf55488d74675f16e851012e23c129e679722 30SHA1 (patch-src_mesa_main_compiler.h) = b164781b541cb83b64597facbb7a7e21d8bdb686
31SHA1 (patch-src_mesa_main_imports.c) = d0c50004c749e4c5c136ac2ed50a6989ca90065f 31SHA1 (patch-src_mesa_main_imports.c) = d0c50004c749e4c5c136ac2ed50a6989ca90065f
32SHA1 (patch-src_mesa_main_imports.h) = f5a96195b3a14294ca3389c9fe17a6076c46db8a 32SHA1 (patch-src_mesa_main_imports.h) = f5a96195b3a14294ca3389c9fe17a6076c46db8a
cvs diff -r1.2 -r1.3 pkgsrc/graphics/MesaLib/patches/Attic/patch-src_mesa_main_compiler.h (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/patches/Attic/patch-src_mesa_main_compiler.h 2013/05/18 05:55:41 1.2
+++ pkgsrc/graphics/MesaLib/patches/Attic/patch-src_mesa_main_compiler.h 2013/06/16 04:16:59 1.3
@@ -1,33 +1,47 @@ @@ -1,33 +1,47 @@
1$NetBSD: patch-src_mesa_main_compiler.h,v 1.2 2013/05/18 05:55:41 obache Exp $ 1$NetBSD: patch-src_mesa_main_compiler.h,v 1.3 2013/06/16 04:16:59 obache Exp $
2 2
3--- src/mesa/main/compiler.h.orig 2011-11-23 01:09:52.000000000 +0000 3--- src/mesa/main/compiler.h.orig 2011-11-23 01:09:52.000000000 +0000
4+++ src/mesa/main/compiler.h 4+++ src/mesa/main/compiler.h
5@@ -248,7 +248,17 @@ extern "C" { 5@@ -248,7 +248,26 @@ extern "C" {
6 * Try to use a runtime test instead. 6 * Try to use a runtime test instead.
7 * For now, only used by some DRI hardware drivers for color/texel packing. 7 * For now, only used by some DRI hardware drivers for color/texel packing.
8 */ 8 */
9-#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN 9-#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
10+#ifdef __sun 10+#ifdef __sun
11+#include <sys/isa_defs.h> 11+#include <sys/isa_defs.h>
12+#elif defined(__OpenBSD__) || defined(__NetBSD__) 12+#elif defined(__OpenBSD__) || defined(__NetBSD__)
13+#include <machine/endian.h> 13+#include <machine/endian.h>
14+#elif defined(__FreeBSD__) || defined(__DragonFly__) 14+#elif defined(__FreeBSD__) || defined(__DragonFly__)
15+#include <sys/endian.h> 15+#include <sys/endian.h>
16+#endif 16+#endif
17+ 17+
18+#if (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN) ||\ 18+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN)
19+ (defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && _BYTE_ORDER == _BIG_ENDIAN) ||\ 19+# if BYTE_ORDER == BIG_ENDIAN
20+ (defined(__sun) && defined(_BIG_ENDIAN)) 20+#define MESA_BIG_ENDIAN 1
 21+# endif
 22+#elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN)
 23+# if _BYTE_ORDER == _BIG_ENDIAN
 24+#define MESA_BIG_ENDIAN 1
 25+# endif
 26+#elif defined(__sun) && defined(_BIG_ENDIAN)
 27+#define MESA_BIG_ENDIAN 1
 28+#endif
 29+#if MESA_BIG_ENDIAN == 1
21 #if defined(__linux__) 30 #if defined(__linux__)
22 #include <byteswap.h> 31 #include <byteswap.h>
23 #define CPU_TO_LE32( x ) bswap_32( x ) 32 #define CPU_TO_LE32( x ) bswap_32( x )
24@@ -263,6 +273,9 @@ static INLINE GLuint CPU_TO_LE32(GLuint 33@@ -263,11 +282,13 @@ static INLINE GLuint CPU_TO_LE32(GLuint
25 ((x & 0x00ff0000) >> 8) | 34 ((x & 0x00ff0000) >> 8) |
26 ((x & 0xff000000) >> 24)); 35 ((x & 0xff000000) >> 24));
27 } 36 }
28+#elif defined(__sun) 37+#elif defined(__sun)
29+#include <sys/byteorder.h> 38+#include <sys/byteorder.h>
30+#define CPU_TO_LE32( x ) BSWAP_32( x ) 39+#define CPU_TO_LE32( x ) BSWAP_32( x )
31 #else /*__linux__ */ 40 #else /*__linux__ */
32 #include <sys/endian.h> 41 #include <sys/endian.h>
33 #define CPU_TO_LE32( x ) bswap32( x ) 42 #define CPU_TO_LE32( x ) bswap32( x )
 43 #endif /*__linux__*/
 44-#define MESA_BIG_ENDIAN 1
 45 #else
 46 #define CPU_TO_LE32( x ) ( x )
 47 #define MESA_LITTLE_ENDIAN 1