Add a few minor upstream patches. Bump rev.

modular-xorg-server/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/08/09 07:30:00 bsadewitz Exp $
+$NetBSD: distinfo,v 1.5 2007/08/13 06:18:31 bsadewitz Exp $
 
 SHA1 (MesaLib-7.0.1.tar.bz2) = deb1002cf377ba8bd9407bd3cf573f8c8be31671
 RMD160 (MesaLib-7.0.1.tar.bz2) = b44fd8ebffd17aa72c3b6cca1c2924e66787aa78
@@ -34,7 +34,10 @@ SHA1 (patch-ay) = 7c49384859f85b7a401c4004efc3867d82f971f9
 SHA1 (patch-az) = 7a93a25d8e7ca7f48d1c8deb023137ba49bbccdd
 SHA1 (patch-ba) = 067a95b89054d97e30f6743dc395dd5a2550830e
 SHA1 (patch-bc) = a3840226b18365e51107a6e7150718008295f041
-SHA1 (patch-bd) = 0e82021af4dd7fdfda833cab72322be367284286
+SHA1 (patch-bd) = 9e1d53c9fb07ea6e39480fc1696b812a4f6c604c
+SHA1 (patch-be) = 1e47999c6c7e440dcbac9ac18c3bcb4764af3494
+SHA1 (patch-bf) = d1b9589d570e0b2e0fb311e57936dfc88c95544c
+SHA1 (patch-bg) = 78bb8c715924cfc8096943a844e52fb5df50ea4d
 SHA1 (patch-da) = 7643285a068f7653eb81aee503d98daae7716735
 SHA1 (patch-db) = 0fa51dc5cd4e495e33e0d535963a632b820b5d4e
 SHA1 (patch-dc) = bd5ddcb15c3fa81341004f8aa2b345ab58cee852

modular-xorg-server/patches/patch-bd

@@ -1,40 +1,13 @@
-$NetBSD: patch-bd,v 1.1 2007/08/09 07:30:00 bsadewitz Exp $
+$NetBSD: patch-bd,v 1.2 2007/08/13 06:18:31 bsadewitz Exp $
 
---- ../Mesa-7.0.1/src/mesa/shader/shader_api.c.orig	2007-08-01 17:50:01.000000000 -0400
-+++ ../Mesa-7.0.1/src/mesa/shader/shader_api.c
-@@ -378,7 +378,7 @@ _mesa_attach_shader(GLcontext *ctx, GLui
-    struct gl_shader_program *shProg
-       = _mesa_lookup_shader_program(ctx, program);
-    struct gl_shader *sh = _mesa_lookup_shader(ctx, shader);
--   const GLuint n = shProg->NumShaders;
-+   GLuint n;
-    GLuint i;
- 
-    if (!shProg || !sh) {
-@@ -387,6 +387,8 @@ _mesa_attach_shader(GLcontext *ctx, GLui
-       return;
-    }
- 
-+   n = shProg->NumShaders;
-+
-    for (i = 0; i < n; i++) {
-       if (shProg->Shaders[i] == sh) {
-          /* already attached */
-@@ -548,7 +550,7 @@ _mesa_detach_shader(GLcontext *ctx, GLui
- {
-    struct gl_shader_program *shProg
-       = _mesa_lookup_shader_program(ctx, program);
--   const GLuint n = shProg->NumShaders;
-+   GLuint n;
-    GLuint i, j;
- 
-    if (!shProg) {
-@@ -557,6 +559,8 @@ _mesa_detach_shader(GLcontext *ctx, GLui
-       return;
-    }
- 
-+   n = shProg->NumShaders;
-+
-    for (i = 0; i < n; i++) {
-       if (shProg->Shaders[i]->Name == shader) {
-          /* found it */
+--- ../Mesa-7.0.1/src/mesa/drivers/dri/common/spantmp2.h.orig	2007-06-21 18:10:54.000000000 -0400
++++ ../Mesa-7.0.1/src/mesa/drivers/dri/common/spantmp2.h
+@@ -114,7 +114,7 @@
+     do {                                                                \
+         GLuint p = *(volatile GLuint *) GET_PTR(_x, _y);                \
+        __asm__ __volatile__( "bswap	%0; rorl $8, %0"                \
+-				: "=r" (p) : "r" (p) );                 \
++				: "=r" (p) : "0" (p) );                 \
+        ((GLuint *)rgba)[0] = p;                                         \
+     } while (0)
+ # elif defined( MESA_BIG_ENDIAN )

modular-xorg-server/patches/patch-be

@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2007/08/13 06:18:31 bsadewitz Exp $
+
+--- hw/xfree86/common/xf86Priv.h.orig	2007-07-31 18:37:36.000000000 -0400
++++ hw/xfree86/common/xf86Priv.h
+@@ -119,7 +119,7 @@ extern RootWinPropPtr *xf86RegisteredPro
+ #define DEFAULT_LOG_VERBOSE	3
+ #endif
+ #ifndef DEFAULT_DPI
+-#define DEFAULT_DPI		75
++#define DEFAULT_DPI		100
+ #endif
+ 
+ #define DEFAULT_UNRESOLVED	TRUE

modular-xorg-server/patches/patch-bf

@@ -0,0 +1,66 @@
+$NetBSD: patch-bf,v 1.1 2007/08/13 06:18:31 bsadewitz Exp $
+
+--- hw/xfree86/vgahw/vgaHW.c.orig	2007-06-30 11:16:04.000000000 -0400
++++ hw/xfree86/vgahw/vgaHW.c
+@@ -434,12 +434,16 @@ mmioWriteFCR(vgaHWPtr hwp, CARD8 value)
+ static void
+ mmioWriteAttr(vgaHWPtr hwp, CARD8 index, CARD8 value)
+ {
++    volatile CARD8 tmp;
++
+     if (hwp->paletteEnabled)
+ 	index &= ~0x20;
+     else
+ 	index |= 0x20;
+ 
+-    (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++    /* gcc-4.0 -O2 is broken : needs a volatile assignment */ 
++    tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++
+     moutb(VGA_ATTR_INDEX, index);
+     moutb(VGA_ATTR_DATA_W, value);
+ }
+@@ -447,12 +451,16 @@ mmioWriteAttr(vgaHWPtr hwp, CARD8 index,
+ static CARD8
+ mmioReadAttr(vgaHWPtr hwp, CARD8 index)
+ {
++    volatile CARD8 tmp;
++  
+     if (hwp->paletteEnabled)
+ 	index &= ~0x20;
+     else
+ 	index |= 0x20;
+ 
+-    (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++    /* gcc-4.0 -O2 is broken : needs a volatile assignment */ 
++    tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++
+     moutb(VGA_ATTR_INDEX, index);
+     return minb(VGA_ATTR_DATA_R);
+ }
+@@ -472,7 +480,11 @@ mmioReadMiscOut(vgaHWPtr hwp)
+ static void
+ mmioEnablePalette(vgaHWPtr hwp)
+ {
+-    (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++    volatile CARD8 tmp;
++    
++    /* gcc-4.0 -O2 is broken : needs a volatile assignment */ 
++    tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++    
+     moutb(VGA_ATTR_INDEX, 0x00);
+     hwp->paletteEnabled = TRUE;
+ }
+@@ -480,7 +492,11 @@ mmioEnablePalette(vgaHWPtr hwp)
+ static void
+ mmioDisablePalette(vgaHWPtr hwp)
+ {
+-    (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++    volatile CARD8 tmp;
++    
++    /* gcc-4.0 -O2 is broken : needs a volatile assignment */ 
++    tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
++    
+     moutb(VGA_ATTR_INDEX, 0x20);
+     hwp->paletteEnabled = FALSE;
+ }

modular-xorg-server/patches/patch-bg

@@ -0,0 +1,13 @@
+$NetBSD: patch-bg,v 1.1 2007/08/13 06:18:31 bsadewitz Exp $
+
+--- ../Mesa-7.0.1/src/mesa/main/image.c.orig	2007-08-02 11:07:54.000000000 -0400
++++ ../Mesa-7.0.1/src/mesa/main/image.c
+@@ -3794,7 +3794,7 @@ _mesa_pack_stencil_span( const GLcontext
+          GLint *dst = (GLint *) dest;
+          GLuint i;
+          for (i=0;i<n;i++) {
+-            *dst++ = (GLint) source[i];
++            dst[i] = (GLint) source[i];
+          }
+          if (dstPacking->SwapBytes) {
+             _mesa_swap4( (GLuint *) dst, n );