Mesa

3 files changed, 22 insertions, 8 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index b54c4a73a36..bd50e579d96 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2008/04/25 20:11:11 bjs Exp $
+# $NetBSD: Makefile,v 1.59 2008/04/30 07:00:14 bjs Exp $
 
 PKGNAME=	MesaLib-${MESA_PKGVERSION}
-PKGREVISION=	1
 COMMENT=	Graphics library similar to SGI's OpenGL
 
 MESA_HEADERS=	gl.h gl_mangle.h glext.h glx.h glxext.h	\
@@ -10,6 +9,8 @@ MESA_HEADERS=	gl.h gl_mangle.h glext.h glx.h glxext.h	\
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+INORE_CCACHE=		yes
+
 BUILD_DEFS+=		MESA_HZ MESA_EXECMEM_HEAPSIZE
 
 .include "../../mk/bsd.prefs.mk"
@@ -43,8 +44,15 @@ CFLAGS.FreeBSD+=	-DDEFAULT_x86_FPU=0x1272
 .endif
 
 CFLAGS.FreeBSD+=	-DUSE_NATIVE_LIBM_FUNCS
+CFLAGS.FreeBSD+=	-DUSE_SSE_SYSCTL_DETECTION
+
 CFLAGS.Linux+=		-DUSE_NATIVE_LIBM_FUNCS
+
 CFLAGS.NetBSD+=		-DUSE_NATIVE_LIBM_FUNCS
+CFLAGS.NetBSD+=		-DUSE_SSE_SYSCTL_DETECTION
+
+CFLAGS.DragonFly+=	-DUSE_NATIVE_LIBM_FUNCS
+CFLAGS.DragonFly+=	-DUSE_SSE_SYSCTL_DETECTION
 
 PLIST_VARS=		dri nodri
 
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 17e0f7c2c1a..9dfd9770242 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.50 2008/04/25 15:39:54 tnn Exp $
+$NetBSD: distinfo,v 1.51 2008/04/30 07:00:14 bjs Exp $
 
+SHA1 (Mesa-7.0.3/Mesa-7.0.3-001) = 32725fd4632d51495253b06786b3f0e743d11dbd
+RMD160 (Mesa-7.0.3/Mesa-7.0.3-001) = 92b1e1d3eb3932a419c6d1fb9e7b96ef5c32fd1a
+Size (Mesa-7.0.3/Mesa-7.0.3-001) = 12578 bytes
+SHA1 (Mesa-7.0.3/Mesa-7.0.3-002) = 9fcdeb76d4cf44f0aeadff48bf7c48335773a2c0
+RMD160 (Mesa-7.0.3/Mesa-7.0.3-002) = 63b568f9c3f0e09cf53de064aee3350b4f96ee2d
+Size (Mesa-7.0.3/Mesa-7.0.3-002) = 639 bytes
 SHA1 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = c8dfef08f3b3f7abc70d99e16a35b0bbc1af4f8a
 RMD160 (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 22917fbab3987e1d60d46321e1a77d5cbdd3800c
 Size (Mesa-7.0.3/MesaDemos-7.0.3.tar.bz2) = 1342158 bytes
@@ -23,7 +29,7 @@ SHA1 (patch-ak) = 74a1ffa426de7720a771c1d94aecb7bde17fd26c
 SHA1 (patch-al) = b734af278352de120b704025ff2e9ac127e5ec7f
 SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
 SHA1 (patch-an) = a6960dcf6c184fa0692c0f679ebb59e004e0f499
-SHA1 (patch-ao) = d5086862fb820c2f79966a41712ce056fdc25f44
+SHA1 (patch-ao) = 3b1f615bcf0ea14814f8e7763ba6fc9411078667
 SHA1 (patch-ap) = 20237356cd866c2ebe573124bba7be66fb335754
 SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
 SHA1 (patch-at) = 4b3d95a116734ad8951816e042b497f638c4cf6b
diff --git a/graphics/MesaLib/patches/patch-ao b/graphics/MesaLib/patches/patch-ao
index a313f5a15e0..56b5197ff5b 100644
--- a/graphics/MesaLib/patches/patch-ao
+++ b/graphics/MesaLib/patches/patch-ao
@@ -1,13 +1,13 @@
-$NetBSD: patch-ao,v 1.1 2008/04/24 07:40:24 bjs Exp $
+$NetBSD: patch-ao,v 1.2 2008/04/30 07:00:14 bjs Exp $
 
---- src/mesa/x86/common_x86.c.orig	2007-07-12 16:49:55.000000000 -0400
+--- src/mesa/x86/common_x86.c.orig	2008-04-29 15:29:20.000000000 -0400
 +++ src/mesa/x86/common_x86.c
 @@ -38,7 +38,7 @@
  #if defined(USE_SSE_ASM) && defined(__linux__)
  #include <linux/version.h>
  #endif
--#if defined(USE_SSE_ASM) && defined(__FreeBSD__)
-+#if defined(USE_SSE_ASM) && (defined(__FreeBSD__) || defined(__NetBSD__))
+-#if defined(USE_SSE_ASM) && (defined(__FreeBSD__) || defined(__DragonFly__))
++#if defined(USE_SSE_ASM) && defined(USE_SSE_SYSCTL_DETECTION)
  #include <sys/types.h>
  #include <sys/sysctl.h>
  #endif