.cvsignore

@@ -0,0 +1,6 @@
+mesa-20100208.tar.bz2
+gl-manpages-1.0.1.tar.bz2
+xdriinfo-1.0.3.tar.bz2
+mesa-demos-20100529.tar.bz2
+mesa-20100529.tar.bz2
+mesa-20100612.tar.bz2

.gitignore

@@ -1,8 +0,0 @@
-*.jx
-*.src.rpm
-.build*
-/mesa-*.tar.bz2
-/mesa-*.tar.xz
-x86_64/
-results_mesa/
-mesa-*/

0001-Link-with-libclang-cpp.patch

@@ -1,37 +0,0 @@
-From c9987fca1fa611e48f85644493edd8d5a30cf403 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Fri, 13 Dec 2019 17:42:17 +0000
-Subject: [PATCH] Link with libclang-cpp
-
----
- src/gallium/targets/opencl/meson.build | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
-index 907cc74337d..031d35b9716 100644
---- a/src/gallium/targets/opencl/meson.build
-+++ b/src/gallium/targets/opencl/meson.build
-@@ -43,19 +43,7 @@ libopencl = shared_library(
-   dependencies : [
-     idep_mesautil,
-     dep_clock, dep_dl, dep_unwind, dep_elf,
--    cpp.find_library('clangCodeGen', dirs : llvm_libdir),
--    cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
--    cpp.find_library('clangFrontend', dirs : llvm_libdir),
--    cpp.find_library('clangDriver', dirs : llvm_libdir),
--    cpp.find_library('clangSerialization', dirs : llvm_libdir),
--    cpp.find_library('clangParse', dirs : llvm_libdir),
--    cpp.find_library('clangSema', dirs : llvm_libdir),
--    cpp.find_library('clangAnalysis', dirs : llvm_libdir),
--    cpp.find_library('clangAST', dirs : llvm_libdir),
--    cpp.find_library('clangASTMatchers', dirs : llvm_libdir),
--    cpp.find_library('clangEdit', dirs : llvm_libdir),
--    cpp.find_library('clangLex', dirs : llvm_libdir),
--    cpp.find_library('clangBasic', dirs : llvm_libdir),
-+    cpp.find_library('clang-cpp', dirs : llvm_libdir),
-   ],
-   version : '@0@.0.0'.format(opencl_version),
-   install : true,
--- 
-2.20.1
-

0003-evergreen-big-endian.patch

@@ -1,26 +0,0 @@
-From 0ec3bdb2264b491fd3f5dc4e638b4c12611ef219 Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-Date: Sun, 20 Mar 2016 13:27:45 +0100
-Subject: [PATCH 3/4] evergreen big endian
-
-Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
----
- src/gallium/drivers/r600/r600_state_common.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
-index cac240e..4b620a1 100644
---- a/src/gallium/drivers/r600/r600_state_common.c
-+++ b/src/gallium/drivers/r600/r600_state_common.c
-@@ -2716,7 +2716,7 @@ uint32_t r600_translate_colorformat(enum chip_class chip, enum pipe_format forma
- 
- uint32_t r600_colorformat_endian_swap(uint32_t colorformat, bool do_endian_swap)
- {
--	if (R600_BIG_ENDIAN) {
-+	if (0 && R600_BIG_ENDIAN) {
- 		switch(colorformat) {
- 		/* 8-bit buffers. */
- 		case V_0280A0_COLOR_4_4:
--- 
-2.7.4
-

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: mesa
+# $Id: Makefile,v 1.2 2007/10/15 19:08:30 notting Exp $
+NAME := mesa
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

Mesa-MLAA-License-Clarification-Email.txt

@@ -1,117 +0,0 @@
-
-Subject: RE: Question about Mesa MLAA license
-From: Jorge Jimenez <iryoku@gmail.com>
-Date: 01/08/2013 12:50 PM
-To: Tom Callaway <tcallawa@redhat.com>
-CC: "jorge@iryoku.com" <jorge@iryoku.com>
-
-Yes to both questions.
- 
-Thanks,
-Jorge
- 
-From: Tom Callaway <tcallawa@redhat.com>
-Sent: January 8, 2013 6:49 PM
-To: Jorge Jimenez <iryoku@gmail.com>
-CC: jorge@iryoku.com
-Subject: Re: Question about Mesa MLAA license
- 
-On 01/08/2013 12:39 PM, Jorge Jimenez wrote:
-> Hi Tom,
->
-> What we meant with that is that we made an exception for clause 2.
-> Instead of clause 2, in the case of the Mesa project, you have to name
-> the technique Jimenez's MLAA in the config options of Mesa. We did that
-> just to allow them to solve license issues. This exception should be for
-> the Mesa project, and any project using Mesa, like Fedora.
->
-> We want to widespread usage of our MLAA, so we want to avoid any kind of
-> license complications. Hope current one is good for Fedora, if not
-> please tell, and we'll see what we can do!
-
-Okay, a few more questions:
-
-* If Fedora decides to simply reproduce the quoted statement:
-"Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
-Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
-
-Specifically, if this is done as part of documentation included with
-Mesa, is that sufficient to meet clause 2 even if the Mesa config option
-is not set as described in your exception?
-
-* Currently, the Mesa config option for MLAA says: "Morphological
-anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default
-quality". Is this in compliance with your exception?
-
-Thanks again,
-
-~tom
-
-==
-Fedora Project
-
-Subject: RE: Question about Mesa MLAA license
-From: Jorge Jimenez <iryoku@gmail.com>
-Date: 01/08/2013 12:39 PM
-To: "jorge@iryoku.com" <jorge@iryoku.com>, Tom Callaway <tcallawa@redhat.com>
-
-Hi Tom,
- 
-What we meant with that is that we made an exception for clause 2. 
-Instead of clause 2, in the case of the Mesa project, you have to name 
-the technique Jimenez's MLAA in the config options of Mesa. We did that 
-just to allow them to solve license issues. This exception should be for 
-the Mesa project, and any project using Mesa, like Fedora.
- 
-We want to widespread usage of our MLAA, so we want to avoid any kind of 
-license complications. Hope current one is good for Fedora, if not 
-please tell, and we'll see what we can do!
- 
-Cheers,
-Jorge
- 
-From: Tom Callaway <tcallawa@redhat.com>
-Sent: January 8, 2013 6:30 PM
-To: jorge@iryoku.com
-Subject: Question about Mesa MLAA license
- 
-Jorge,
-
-Thanks for all of your fantastic graphics work! I have been auditing
-Fedora (a popular distribution of Linux) for license compliance and I
-came across your MLAA code in Mesa.
-
-The license says:
-
- *    2. Redistributions in binary form must reproduce the following
-statement:
- *
- *       "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
- *        Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
- *
- *       Only for use in the Mesa project, this point 2 is filled by naming the
- *       technique Jimenez's MLAA in the Mesa config options.
-
-That wording is unclear. When you say "Only for use in the Mesa
-project...", it seems like you could either be saying:
-
-- This code may only be used as part of Mesa.
-
-OR
-
-- In Mesa, you can comply with clause 2 by simply selecting "Jimenez's
-MLAA" in the Mesa config options.
-
-*****
-
-If the first item is true, then we may have to remove the MLAA code from
-Fedora's copy of Mesa. However, looking at the license on your SMAA
-code, I do not believe it to be the case. Please let me know either way!
-
-Thanks in advance,
-
-Tom Callaway
-Fedora Legal
-
-==
-Fedora Project

import.log

@@ -0,0 +1,2 @@
+mesa-7_2-0_3_fc10:HEAD:mesa-7.2-0.3.fc10.src.rpm:1222723005
+mesa-7_3-1_fc11:HEAD:mesa-7.3-1.fc11.src.rpm:1234080261

make-demo-snapshot.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Usage: ./make-git-snapshot.sh [COMMIT]
+#
+# to make a snapshot of the given tag/branch.  Defaults to HEAD.
+# Point env var REF to a local mesa repo to reduce clone time.
+
+DIRNAME=mesa-demos-$( date +%Y%m%d )
+
+echo REF ${REF:+--reference $REF}
+echo DIRNAME $DIRNAME
+echo HEAD ${1:-HEAD}
+
+rm -rf $DIRNAME
+
+git clone ${REF:+--reference $REF} \
+	git://git.freedesktop.org/git/mesa/demos $DIRNAME
+
+GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
+	| bzip2 > $DIRNAME.tar.bz2
+
+# rm -rf $DIRNAME

make-git-snapshot.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Usage: ./make-git-snapshot.sh [COMMIT]
+#
+# to make a snapshot of the given tag/branch.  Defaults to HEAD.
+# Point env var REF to a local mesa repo to reduce clone time.
+
+DIRNAME=mesa-$( date +%Y%m%d )
+
+echo REF ${REF:+--reference $REF}
+echo DIRNAME $DIRNAME
+echo HEAD ${1:-HEAD}
+
+rm -rf $DIRNAME
+
+git clone ${REF:+--reference $REF} \
+	git://git.freedesktop.org/git/mesa/mesa $DIRNAME
+
+GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
+	| bzip2 > $DIRNAME.tar.bz2
+
+# rm -rf $DIRNAME

mesa-7.1-link-shared.patch

@@ -0,0 +1,101 @@
+diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.da mesa-20091221/src/mesa/drivers/dri/Makefile
+--- mesa-20091221/src/mesa/drivers/dri/Makefile.da	2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/drivers/dri/Makefile	2009-12-21 08:43:03.000000000 +1000
+@@ -6,12 +6,17 @@ include $(TOP)/configs/current
+ 
+ 
+ 
+-default: $(TOP)/$(LIB_DIR) subdirs dri.pc
++default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
+ 
+ 
+ $(TOP)/$(LIB_DIR):
+ 	-mkdir $(TOP)/$(LIB_DIR)
+ 
++libdricore.so:
++	gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
++
++$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
++	$(INSTALL) libdricore.so $(TOP)/$(LIB_DIR) 
+ 
+ subdirs:
+ 	@for dir in $(DRI_DIRS) ; do \
+@@ -32,12 +37,14 @@ dri.pc: dri.pc.in
+ 	$(pcedit) $< > $@
+ 
+ 
+-install: dri.pc
++install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
+ 	@for dir in $(DRI_DIRS) ; do \
+ 		if [ -d $$dir ] ; then \
+ 			(cd $$dir && $(MAKE) install) || exit 1 ; \
+ 		fi \
+ 	done
++	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
++	$(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+ 	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
+ 	$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
+ 	  $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
+@@ -51,5 +58,6 @@ clean:
+ 			(cd $$dir && $(MAKE) clean) ; \
+ 		fi \
+ 	done
++	-rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
+ 	-rm -f common/*.o
+ 	-rm -f *.pc
+diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.template.da mesa-20091221/src/mesa/drivers/dri/Makefile.template
+--- mesa-20091221/src/mesa/drivers/dri/Makefile.template.da	2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/drivers/dri/Makefile.template	2009-12-21 08:43:40.000000000 +1000
+@@ -1,6 +1,6 @@
+ # -*-makefile-*-
+ 
+-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
++MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
+ 
+ COMMON_GALLIUM_SOURCES = \
+         ../common/utils.c \
+@@ -70,7 +70,8 @@ lib: symlinks subdirs depend
+ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
+ 		$(TOP)/src/mesa/drivers/dri/Makefile.template
+ 	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+-		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
++		$(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
++		-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
+ 		$(DRI_LIB_DEPS)
+ 
+ 
+diff -up mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091221/src/mesa/x86/read_rgba_span_x86.S
+--- mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da	2009-12-21 08:09:11.000000000 +1000
++++ mesa-20091221/src/mesa/x86/read_rgba_span_x86.S	2009-12-21 08:43:03.000000000 +1000
+@@ -77,7 +77,6 @@
+  */
+ 
+ .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
+ 	.type	_generic_read_RGBA_span_BGRA8888_REV_MMX, @function
+ _generic_read_RGBA_span_BGRA8888_REV_MMX:
+ 	pushl	%ebx
+@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
+  */
+ 
+ .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
+ 	.type	_generic_read_RGBA_span_BGRA8888_REV_SSE, @function
+ _generic_read_RGBA_span_BGRA8888_REV_SSE:
+ 	pushl	%esi
+@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
+ 
+ 	.text
+ .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
+-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
+ 	.type	_generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
+ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
+ 	pushl	%esi
+@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
+ 
+ 	.text
+ 	.globl	_generic_read_RGBA_span_RGB565_MMX
+-        .hidden _generic_read_RGBA_span_RGB565_MMX
+ 	.type	_generic_read_RGBA_span_RGB565_MMX, @function
+ 
+ _generic_read_RGBA_span_RGB565_MMX:

mesa-7.1-nukeglthread-debug.patch

@@ -0,0 +1,15 @@
+diff -up mesa-20100529/src/mesa/drivers/dri/intel/intel_fbo.c.dave mesa-20100529/src/mesa/drivers/dri/intel/intel_fbo.c
+--- mesa-20100529/src/mesa/drivers/dri/intel/intel_fbo.c.dave	2010-05-30 18:24:35.000000000 +1000
++++ mesa-20100529/src/mesa/drivers/dri/intel/intel_fbo.c	2010-05-30 18:24:42.000000000 +1000
+@@ -558,11 +558,6 @@ intel_render_texture(GLcontext * ctx,
+        return;
+    }
+ 
+-   DBG("Begin render texture tid %lx tex=%u w=%d h=%d refcount=%d\n",
+-       _glthread_GetID(),
+-       att->Texture->Name, newImage->Width, newImage->Height,
+-       irb->Base.RefCount);
+-
+    /* point the renderbufer's region to the texture image region */
+    if (irb->region != intel_image->mt->region) {
+       if (irb->region)

mesa-7.1-osmesa-version.patch

@@ -0,0 +1,12 @@
+diff -up Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx Mesa-7.1/src/mesa/drivers/osmesa/Makefile
+--- Mesa-7.1/src/mesa/drivers/osmesa/Makefile.jx	2008-08-28 14:05:47.000000000 -0400
++++ Mesa-7.1/src/mesa/drivers/osmesa/Makefile	2008-08-28 14:07:13.000000000 -0400
+@@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
+ 
+ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
+ 	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
++		-major 6 -minor 5 -patch 3 \
+ 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ 		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
+ 		$(OSMESA_LIB_DEPS) $(OBJECTS)

mesa-7.3-965-texture-size.patch

@@ -0,0 +1,16 @@
+diff -up Mesa-7.3/src/mesa/drivers/dri/i965/brw_context.c.jx Mesa-7.3/src/mesa/drivers/dri/i965/brw_context.c
+--- Mesa-7.3/src/mesa/drivers/dri/i965/brw_context.c.jx	2009-01-21 10:55:47.000000000 -0500
++++ Mesa-7.3/src/mesa/drivers/dri/i965/brw_context.c	2009-02-09 17:55:02.000000000 -0500
+@@ -138,10 +138,10 @@ GLboolean brwCreateContext( const __GLco
+    /* Advertise the full hardware capabilities.  The new memory
+     * manager should cope much better with overload situations:
+     */
+-   ctx->Const.MaxTextureLevels = 12;
++   ctx->Const.MaxTextureLevels = 13;
+    ctx->Const.Max3DTextureLevels = 9;
+    ctx->Const.MaxCubeTextureLevels = 12;
+-   ctx->Const.MaxTextureRectSize = (1<<11);
++   ctx->Const.MaxTextureRectSize = (1<<12);
+    
+    /* if conformance mode is set, swrast can handle any size AA point */
+    ctx->Const.MaxPointSizeAA = 255.0;

mesa-7.5-get-driver-name.patch

@@ -0,0 +1,85 @@
+commit a3c3c1f1437de0186d70de9017a6a8e404ecf482
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Apr 14 17:56:29 2009 -0400
+
+    glx: Make glXGetScreenDriver() work for DRI2
+
+diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
+index 3089aa1..87d62ad 100644
+--- a/src/glx/x11/dri_glx.c
++++ b/src/glx/x11/dri_glx.c
+@@ -40,6 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include "glxclient.h"
+ #include "glcontextmodes.h"
+ #include "xf86dri.h"
++#include "dri2.h"
+ #include "sarea.h"
+ #include <dlfcn.h>
+ #include <sys/types.h>
+@@ -75,32 +76,45 @@ struct __GLXDRIcontextPrivateRec {
+  */
+ static Bool driGetDriverName(Display *dpy, int scrNum, char **driverName)
+ {
+-   int directCapable;
+-   Bool b;
+-   int driverMajor, driverMinor, driverPatch;
++    int directCapable;
++    Bool b;
++    int event, error;
++    int driverMajor, driverMinor, driverPatch;
+ 
+-   *driverName = NULL;
++    *driverName = NULL;
+ 
+-   if (!XF86DRIQueryDirectRenderingCapable(dpy, scrNum, &directCapable)) {
+-      ErrorMessageF("XF86DRIQueryDirectRenderingCapable failed\n");
+-      return False;
+-   }
+-   if (!directCapable) {
+-      ErrorMessageF("XF86DRIQueryDirectRenderingCapable returned false\n");
+-      return False;
+-   }
++    if (XF86DRIQueryExtension(dpy, &event, &error)) { /* DRI1 */
++	if (!XF86DRIQueryDirectRenderingCapable(dpy, scrNum, &directCapable)) {
++	    ErrorMessageF("XF86DRIQueryDirectRenderingCapable failed\n");
++	    return False;
++	}
++	if (!directCapable) {
++	    ErrorMessageF("XF86DRIQueryDirectRenderingCapable returned false\n");
++	    return False;
++	}
+ 
+-   b = XF86DRIGetClientDriverName(dpy, scrNum, &driverMajor, &driverMinor,
+-                                  &driverPatch, driverName);
+-   if (!b) {
+-      ErrorMessageF("Cannot determine driver name for screen %d\n", scrNum);
+-      return False;
+-   }
++	b = XF86DRIGetClientDriverName(dpy, scrNum, &driverMajor, &driverMinor,
++		&driverPatch, driverName);
++	if (!b) {
++	    ErrorMessageF("Cannot determine driver name for screen %d\n", scrNum);
++	    return False;
++	}
++
++	InfoMessageF("XF86DRIGetClientDriverName: %d.%d.%d %s (screen %d)\n",
++		driverMajor, driverMinor, driverPatch, *driverName, scrNum);
++
++	return True;
++    } else if (DRI2QueryExtension(dpy, &event, &error)) { /* DRI2 */
++	char *dev;
++	Bool ret = DRI2Connect(dpy, RootWindow(dpy, scrNum), driverName, &dev);
+ 
+-   InfoMessageF("XF86DRIGetClientDriverName: %d.%d.%d %s (screen %d)\n",
+-	     driverMajor, driverMinor, driverPatch, *driverName, scrNum);
++	if (ret)
++	    Xfree(dev);
++
++	return ret;
++    }
+ 
+-   return True;
++    return False;
+ }
+ 
+ /*

mesa-7.6-hush-vblank-warning.patch

@@ -0,0 +1,12 @@
+diff -up mesa-20090813/src/mesa/drivers/dri/common/vblank.c.jx mesa-20090813/src/mesa/drivers/dri/common/vblank.c
+--- mesa-20090813/src/mesa/drivers/dri/common/vblank.c.jx	2009-08-13 09:28:01.000000000 -0400
++++ mesa-20090813/src/mesa/drivers/dri/common/vblank.c	2009-09-08 14:07:51.000000000 -0400
+@@ -256,7 +256,7 @@ static int do_wait( drmVBlank * vbl, GLu
+    if ( ret != 0 ) {
+       static GLboolean first_time = GL_TRUE;
+ 
+-      if ( first_time ) {
++      if (0) {
+ 	 fprintf(stderr, 
+ 		 "%s: drmWaitVBlank returned %d, IRQs don't seem to be"
+ 		 " working correctly.\nTry adjusting the vblank_mode"

mesa-demos-fix-add-needed.patch

@@ -0,0 +1,36 @@
+diff -up mesa-demos-20100529/src/tests/Makefile.am.orig mesa-demos-20100529/src/tests/Makefile.am
+--- mesa-demos-20100529/src/tests/Makefile.am.orig	2010-05-30 09:11:04.000000000 +1000
++++ mesa-demos-20100529/src/tests/Makefile.am	2010-05-30 11:19:49.000000000 +1000
+@@ -169,13 +169,17 @@ endif
+ 
+ afsmultiarb_LDADD = ../util/libutil.la
+ arraytexture_LDADD = ../util/libutil.la
++auxbuffer_LDADD = -lX11
+ bug_3195_LDADD = ../util/libutil.la
+ bumpmap_LDADD = ../util/libutil.la
+ floattex_LDADD = ../util/libutil.la
+ fillrate_LDADD = ../util/libutil.la
+ invert_LDADD = ../util/libutil.la
++jkrahntest_LDADD = -lX11
+ mipmap_limits_LDADD = ../util/libutil.la
+ mipmap_view_LDADD = ../util/libutil.la
++sharedtex_LDADD = -lX11
++texobjshare_LDADD = -lX11
+ texrect_LDADD = ../util/libutil.la
+ 
+ EXTRA_DIST = \
+diff -up mesa-demos-20100529/src/xdemos/Makefile.am.orig mesa-demos-20100529/src/xdemos/Makefile.am
+--- mesa-demos-20100529/src/xdemos/Makefile.am.orig	2010-05-30 14:41:55.000000000 +1000
++++ mesa-demos-20100529/src/xdemos/Makefile.am	2010-05-30 14:43:43.000000000 +1000
+@@ -77,9 +77,11 @@ xrotfontdemo_SOURCES = \
+ 	xuserotfont.c \
+ 	xuserotfont.h
+ 
++glthreads_LDADD = -lpthread
+ glxgears_fbconfig_LDADD = libpbutil.la
+ pbdemo_LDADD = libpbutil.la
+ pbinfo_LDADD = libpbutil.la
++sharedtex_mt_LDADD = -lpthread
+ 
+ EXTRA_DIST = \
+ 	yuvrect_client.c \

mesa-no-mach64.patch

@@ -0,0 +1,46 @@
+diff -up mesa-20100529/configure.ac.mach64 mesa-20100529/configure.ac
+--- mesa-20100529/configure.ac.mach64	2010-05-29 11:31:22.000000000 +1000
++++ mesa-20100529/configure.ac	2010-05-29 18:53:55.000000000 +1000
+@@ -819,7 +819,7 @@ if test "$mesa_driver" = dri; then
+             # the new interface.  i810 are missing because there is no
+             # x86-64 system where they could *ever* be used.
+             if test "x$DRI_DIRS" = "xyes"; then
+-                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \
++                DRI_DIRS="i915 i965 mga r128 r200 r300 r600 radeon \
+                     savage tdfx unichrome swrast"
+             fi
+             ;;
+@@ -827,13 +827,13 @@ if test "$mesa_driver" = dri; then
+             # Build only the drivers for cards that exist on PowerPC.
+             # At some point MGA will be added, but not yet.
+             if test "x$DRI_DIRS" = "xyes"; then
+-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
++                DRI_DIRS="r128 r200 r300 r600 radeon tdfx swrast"
+             fi
+             ;;
+         sparc*)
+             # Build only the drivers for cards that exist on sparc`
+             if test "x$DRI_DIRS" = "xyes"; then
+-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
++                DRI_DIRS="r128 r200 r300 r600 radeon swrast"
+             fi
+             ;;
+         esac
+@@ -850,7 +850,7 @@ if test "$mesa_driver" = dri; then
+         fi
+ 
+         if test "x$DRI_DIRS" = "xyes"; then
+-            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
++            DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon tdfx \
+                 unichrome savage sis swrast"
+         fi
+         ;;
+@@ -869,7 +869,7 @@ if test "$mesa_driver" = dri; then
+ 
+     # default drivers
+     if test "x$DRI_DIRS" = "xyes"; then
+-        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
++        DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon \
+             savage sis tdfx unichrome swrast"
+     fi
+ 

nouveau-legacy-enable.patch

@@ -0,0 +1,36 @@
+diff -up mesa-20100529/configure.ac.nouveau mesa-20100529/configure.ac
+--- mesa-20100529/configure.ac.nouveau	2010-05-29 18:57:30.000000000 +1000
++++ mesa-20100529/configure.ac	2010-05-29 18:58:24.000000000 +1000
+@@ -820,20 +820,20 @@ if test "$mesa_driver" = dri; then
+             # x86-64 system where they could *ever* be used.
+             if test "x$DRI_DIRS" = "xyes"; then
+                 DRI_DIRS="i915 i965 mga r128 r200 r300 r600 radeon \
+-                    savage tdfx unichrome swrast"
++                    savage tdfx unichrome swrast nouveau"
+             fi
+             ;;
+         powerpc*)
+             # Build only the drivers for cards that exist on PowerPC.
+             # At some point MGA will be added, but not yet.
+             if test "x$DRI_DIRS" = "xyes"; then
+-                DRI_DIRS="r128 r200 r300 r600 radeon tdfx swrast"
++                DRI_DIRS="r128 r200 r300 r600 radeon tdfx swrast nouveau"
+             fi
+             ;;
+         sparc*)
+             # Build only the drivers for cards that exist on sparc`
+             if test "x$DRI_DIRS" = "xyes"; then
+-                DRI_DIRS="r128 r200 r300 r600 radeon swrast"
++                DRI_DIRS="r128 r200 r300 r600 radeon swrast nouveau"
+             fi
+             ;;
+         esac
+@@ -870,7 +870,7 @@ if test "$mesa_driver" = dri; then
+     # default drivers
+     if test "x$DRI_DIRS" = "xyes"; then
+         DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon \
+-            savage sis tdfx unichrome swrast"
++            savage sis tdfx unichrome swrast nouveau"
+     fi
+ 
+     DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`

sources

@@ -1 +1,4 @@
-SHA512 (mesa-20.0.2.tar.xz) = d6ffc29bbc5b908cb0f08fa1b5a83e029b76c7b697c488a73e6bb60990a55beeb3ecdba1745868f6885ee2f660975f5debf7d2c9418e0a96e2f7049e83fd89ab
+6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
+cb304d1ce562ac48b68eedeba38c662f  xdriinfo-1.0.3.tar.bz2
+b4d32564ccc411bbfcfe657f42d3632d  mesa-demos-20100529.tar.bz2
+a75931e8d66e7855172bc8324af9e07a  mesa-20100612.tar.bz2