[pkgsrc/trunk]: pkgsrc/graphics/MesaLib another sparc64-only build fix; defin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e13868fd162f
branches:  trunk
changeset: 573741:e13868fd162f
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Mar 27 12:55:00 2010 +0000

description:
another sparc64-only build fix; define memory barrier macro in sis_context.h

diffstat:

 graphics/MesaLib/distinfo         |   4 ++--
 graphics/MesaLib/patches/patch-af |  10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r a69ded051ca5 -r e13868fd162f graphics/MesaLib/distinfo
--- a/graphics/MesaLib/distinfo Sat Mar 27 12:45:34 2010 +0000
+++ b/graphics/MesaLib/distinfo Sat Mar 27 12:55:00 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2010/03/27 12:26:19 tnn Exp $
+$NetBSD: distinfo,v 1.71 2010/03/27 12:55:00 tnn Exp $
 
 SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
 RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
@@ -14,7 +14,7 @@
 SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
 SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393
 SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab
-SHA1 (patch-af) = 670259e92d1cd3b2695113cfd5fb3ad4a46bdc04
+SHA1 (patch-af) = da0bd412b81d4b826b6d9b4bb8d98ca1fe0006ba
 SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7
 SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f
 SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87
diff -r a69ded051ca5 -r e13868fd162f graphics/MesaLib/patches/patch-af
--- a/graphics/MesaLib/patches/patch-af Sat Mar 27 12:45:34 2010 +0000
+++ b/graphics/MesaLib/patches/patch-af Sat Mar 27 12:55:00 2010 +0000
@@ -1,11 +1,13 @@
-$NetBSD: patch-af,v 1.12 2009/06/05 11:10:35 wiz Exp $
+$NetBSD: patch-af,v 1.13 2010/03/27 12:55:00 tnn Exp $
 
---- src/mesa/drivers/dri/sis/sis_context.h.orig        2009-05-19 11:47:27 +0300
-+++ src/mesa/drivers/dri/sis/sis_context.h     2009-05-19 11:48:44 +0300
-@@ -404,7 +404,14 @@ struct sis_context
+--- src/mesa/drivers/dri/sis/sis_context.h.orig        2009-01-22 17:38:34.000000000 +0000
++++ src/mesa/drivers/dri/sis/sis_context.h
+@@ -404,7 +404,16 @@ struct sis_context
  #define MMIO_WMB()    __asm __volatile("" : : : "memory")
  #elif defined(__ia64__)
  #define MMIO_WMB()    __asm __volatile("mf" : : : "memory")
++#elif defined(__sparc64__)
++#define MMIO_WMB()    __asm __volatile("membar #Sync" : : : "memory")
 +#elif defined(HAVE_NETBSD_ATOMIC_H)
 +#include <sys/atomic.h>
 +#define MMIO_WMB()     membar_sync()   /* XXX is this adequate? */