rpms/mesa/devel mesa-7.1pre-nukeglthread-debug.patch, NONE, 1.1 mesa.spec, 1.169, 1.170

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1908

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.1pre-nukeglthread-debug.patch 
Log Message:
* Mon Mar 03 2008 Dave Airlie <airlied at redhat.com> 7.1-0.18
- fix i915 build due to symbol visibility


mesa-7.1pre-nukeglthread-debug.patch:

--- NEW FILE mesa-7.1pre-nukeglthread-debug.patch ---
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index 94d499f..2ba596e 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -615,11 +615,6 @@ intel_render_texture(GLcontext * ctx,
       }
    }
 
-   DBG("Begin render texture tid %x 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) {
@@ -656,8 +651,6 @@ intel_finish_render_texture(GLcontext * ctx,
 {
    struct intel_renderbuffer *irb = intel_renderbuffer(att->Renderbuffer);
 
-   DBG("End render texture (tid %x) tex %u\n", _glthread_GetID(), att->Texture->Name);
-
    if (irb) {
       /* just release the region */
       intel_region_release(&irb->region);


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- mesa.spec	26 Feb 2008 20:41:53 -0000	1.169
+++ mesa.spec	3 Mar 2008 02:52:48 -0000	1.170
@@ -15,7 +15,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.17%{?dist}
+Release: 0.18%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -29,6 +29,7 @@
 
 Patch0: mesa-7.1pre-osmesa-version.patch
 Patch1: mesa-7.1-dri-drivers.patch
+Patch2: mesa-7.1pre-nukeglthread-debug.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_dri}
@@ -151,6 +152,7 @@
 %setup -q -n mesa-%{gitdate} -b2
 %patch0 -p1 -b .osmesa
 %patch1 -p1 -b .dri-drivers
+%patch2 -p1 -b .intel-glthread
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -393,6 +395,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Mon Mar 03 2008 Dave Airlie <airlied at redhat.com> 7.1-0.18
+- fix i915 build due to symbol visibility
+
 * Tue Feb 26 2008 Adam Jackson <ajax at redhat.com> 7.1-0.17
 - Fix OSMesa symlink bug. (#424545)
 - Build OSMesa with -Os to be slightly less bloaty.