From 7c7c5f53225b3cf07f6387ebf24751eef8ed5131 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Sat, 12 Jun 2010 10:36:47 +0000
Subject: [PATCH] - rebase to git snapshot with TFP fixes for r300 + gallium -
 enable r300g

---
 .cvsignore                        |  1 +
 mesa-7.1-nukeglthread-debug.patch | 12 ++++++------
 mesa.spec                         | 16 +++++++++++-----
 sources                           |  2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8832586..946c810 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ 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
diff --git a/mesa-7.1-nukeglthread-debug.patch b/mesa-7.1-nukeglthread-debug.patch
index 3df6e9a..642e505 100644
--- a/mesa-7.1-nukeglthread-debug.patch
+++ b/mesa-7.1-nukeglthread-debug.patch
@@ -1,15 +1,15 @@
-diff -up Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c
---- Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c.intel-glthread	2008-08-25 10:49:40.000000000 -0400
-+++ Mesa-7.1/src/mesa/drivers/dri/intel/intel_fbo.c	2008-08-28 14:26:17.000000000 -0400
-@@ -633,11 +633,6 @@ intel_render_texture(GLcontext * ctx,
+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 %x tex=%u w=%d h=%d refcount=%d\n",
+-   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 */
-    intel_image = intel_texture_image(newImage);
     if (irb->region != intel_image->mt->region) {
+       if (irb->region)
diff --git a/mesa.spec b/mesa.spec
index 05f91c8..c2f1ff1 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -13,16 +13,17 @@
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.3
-%define gitdate 20100529
+%define gitdate 20100612
+%define demosgitdate 20100529
 #% define snapshot 
 
-%global demopkg %{name}-demos-%{gitdate}
+%global demopkg %{name}-demos-%{demosgitdate}
 %define demodir %{_libdir}/mesa
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.9
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -32,7 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2
 #Source1: http://www.mesa3d.org/beta/MesaDemos-%{version}%{?snapshot}.tar.bz2
 Source0: %{name}-%{gitdate}.tar.bz2
-Source1: %{name}-demos-%{gitdate}.tar.bz2
+Source1: %{name}-demos-%{demosgitdate}.tar.bz2
 #Source1: http://downloads.sf.net/mesa3d/MesaDemos-%{version}.tar.bz2
 Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
@@ -186,7 +187,7 @@ Group: User Interface/X Hardware Support
 #setup -q -n mesa-%{version}%{?snapshot} -b0 -b2 -b5
 %setup -q -n mesa-%{gitdate} -b1 -b2 -b5
 %patch1 -p1 -b .osmesa
-#patch2 -p1 -b .intel-glthread
+%patch2 -p1 -b .intel-glthread
 %patch3 -p1 -b .no-mach64
 %patch4 -p1 -b .nouveau
 #%patch7 -p1 -b .dricore
@@ -284,6 +285,8 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
 # just the DRI drivers that are sane
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
 #install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libdricore.so >& /dev/null
+# use gallium r300 driver
+cp %{_lib}/gallium/radeong_dri.so %{_lib}/r300_dri.so
 for f in i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome nouveau_vieux gallium/vmwgfx; do
     so=%{_lib}/${f}_dri.so
     test -e $so && echo $so
@@ -414,6 +417,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Sat Jun 12 2010 Dave Airlie <airlied@redhat.com> 7.9-0.2
+- rebase to git snapshot with TFP fixes for r300 + gallium - enable r300g
+
 * Sun May 30 2010 Dave Airlie <airlied@redhat.com> 7.9-0.1
 - rebase to a git snapshot - disable vmwgfx
 
diff --git a/sources b/sources
index e5c15c6..75be249 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 cb304d1ce562ac48b68eedeba38c662f  xdriinfo-1.0.3.tar.bz2
 b4d32564ccc411bbfcfe657f42d3632d  mesa-demos-20100529.tar.bz2
-3a15d8b0e80616cc9f1f3507f7b66b11  mesa-20100529.tar.bz2
+a75931e8d66e7855172bc8324af9e07a  mesa-20100612.tar.bz2