Update to Mesa-7.0.4 (the head of the 7.0 branch in GIT). Basically,

lots of bug fixes; the intent of my update was mostly to fix
problems with i915 and r300 dri drivers and to provide the best environment
possible for the xorg server update to the 1.4 branch.

Morever, many of our patches from pkgsrc, i.e. those removed in this commit,
are now included upstream.

Additionally, MesaDemos now builds.

NOTES:

 - MesaLib now requires xf86driproto 2.0.4, as earlier versions install
   dri_interface.h, which is not correct.

 - glu now exports its symbols via libtool's -export-symfile.
   The symfile is generated pre-build--see glu/Makefile.

 - glxinfo/glxgears do not seem to need to be linked to libpthread, and this
   seems to cause problems on NetBSD with the new drm code.  If I am wrong
   about this, please let me know.  The only program that seems to need
   libpthread is glthreads in MesaDemos.

1 files changed, 1 insertions, 41 deletions

diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index d739b19127f..b4af8459c18 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,7 +1,6 @@
-# $NetBSD: options.mk,v 1.9 2008/06/03 11:06:17 tron Exp $
+# $NetBSD: options.mk,v 1.10 2008/07/27 00:03:42 bjs Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.MesaLib
-PKG_SUPPORTED_OPTIONS=	mesa-execmem-mmap
 
 # Assembler code build configurations
 .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
@@ -10,35 +9,6 @@ PKG_SUPPORTED_OPTIONS+=		${MACHINE_ARCH}
 PKG_SUGGESTED_OPTIONS+=		${MACHINE_ARCH}
 .endif
 ###
-### XXX Prior to this patch, Mesa only allocated executable memory
-###	with mmap(2) and PROT_EXEC on linux.  On e.g. OpenBSD and NetBSD,
-###	pages which absolutely required PROT_EXEC were allocated using
-###	malloc(3).  You may wonder why it only worked on Linux.  Answer:
-###	the code was excluded with '#ifdef __linux__'!  "Porting" this
-###	[to BSD platforms] involved adding three lines of [preprocessor]
-###	code (see patch-ap if you're curious).
-###
-###	Please do note hack (NetBSD-only for now) I added to wire down
-###	this memory by setting the MESA_EXECMEM_MMAP environment variable;
-###	you probably don't want it paged out.  MAP_WIRED is probably
-###	overkill--I will revisit this at a later date.
-###
-###	You may also define MESA_EXECMEM_HEAP_SIZE in your build
-###	environment to adjust the size of the anonymous executable
-###	memory pool (in bytes).  The default is 10MB (huge?).
-###
-###	Here's the bottom line:  IF YOUR PLATFORM DOES NOT HAVE AN
-###	EXECUTABLE HEAP, YOU RUN THE RISK OF MANY SEGMENTATION FAULTS
-###	UNLESS THIS OPTION IS ENABLED.  If enabling this option results in
-###	build failure, please do file a PR.  Thanks to Owain Ainsworth
-###	<oga@openbsd.org> for discovering this.
-###
-###	--bjs (04/23/08)
-###
-.if (!empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux")
-PKG_SUGGESTED_OPTIONS=	mesa-execmem-mmap
-.endif
-###
 ### XXX  There are [probably] others, but let's not get crazy just yet.
 ### 	 This will take a while to test for the myriad platforms we
 ### 	 support.
@@ -84,13 +54,3 @@ PLIST.nodri=	# empty
 ###
 MAKE_JOBS_SAFE=			no
 .endif
-###
-### XXX This is the default heap size.  Would there be an occasion to
-### change it?  It seems large, so we should investigate further.
-###
-MESA_EXECMEM_HEAPSIZE?=	10485760
-
-.if !empty(PKG_OPTIONS:Mmesa-execmem-mmap)
-CFLAGS+=	-DMESA_EXECMEM_MMAP
-CFLAGS+=	-DEXEC_HEAP_SIZE=${MESA_EXECMEM_HEAPSIZE:M[0-9]*:Q}
-.endif