rpms/mesa/F-8 mesa-7.0.2-e7221.patch, NONE, 1.1 mesa.spec, 1.146, 1.147

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/mesa/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv626

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.0.2-e7221.patch 
Log Message:
* Tue Jan 22 2008 Adam Jackson <ajax at redhat.com> 7.0.2-3
- mesa-7.0.2-e7221.patch: Enable i915 DRI on E7221. (Carlos Martín, #425790)


mesa-7.0.2-e7221.patch:

--- NEW FILE mesa-7.0.2-e7221.patch ---
diff -up Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_screen.c.e7221 Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_screen.c
--- Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_screen.c.e7221	2007-11-01 11:30:52.000000000 -0400
+++ Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_screen.c	2008-01-22 13:30:47.000000000 -0500
@@ -511,6 +511,7 @@ static GLboolean intelCreateContext( con
 				sharedContextPrivate );
 
    case PCI_CHIP_I915_G:
+   case PCI_CHIP_E7221_G:
    case PCI_CHIP_I915_GM:
    case PCI_CHIP_I945_G:
    case PCI_CHIP_I945_GM:
diff -up Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.h.e7221 Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.h
--- Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.h.e7221	2007-11-01 11:30:52.000000000 -0400
+++ Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.h	2008-01-22 13:30:47.000000000 -0500
@@ -451,6 +451,7 @@ extern int INTEL_DEBUG;
 #define PCI_CHIP_I855_GM		0x3582
 #define PCI_CHIP_I865_G			0x2572
 #define PCI_CHIP_I915_G			0x2582
+#define PCI_CHIP_E7221_G               0x258A
 #define PCI_CHIP_I915_GM		0x2592
 #define PCI_CHIP_I945_G			0x2772
 #define PCI_CHIP_I945_GM		0x27A2
diff -up Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.c.e7221 Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.c
--- Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.c.e7221	2007-11-01 11:30:52.000000000 -0400
+++ Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.c	2008-01-22 13:34:50.000000000 -0500
@@ -117,6 +117,8 @@ const GLubyte *intelGetString( GLcontext
 	 chipset = "Intel(R) 865G"; break;
       case PCI_CHIP_I915_G:
 	 chipset = "Intel(R) 915G"; break;
+      case PCI_CHIP_E7221_G:
+  	 chipset = "Intel(R) E7221G (i915)"; break;
       case PCI_CHIP_I915_GM:
 	 chipset = "Intel(R) 915GM"; break;
       case PCI_CHIP_I945_G:


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-8/mesa.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- mesa.spec	1 Jan 2008 06:56:09 -0000	1.146
+++ mesa.spec	22 Jan 2008 18:35:42 -0000	1.147
@@ -32,7 +32,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -53,6 +53,7 @@
 Patch28: mesa-7.0.1-r300-fix-writemask.patch
 Patch30: mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch
 Patch31: mesa-7.0.2-t_vp_build-use-less-temps.patch
+Patch32: mesa-7.0.2-e7221.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -185,6 +186,7 @@
 %patch28 -p1 -b .r300-writemask
 %patch30 -p1 -b .rx00-fix-vp
 %patch31 -p1 -b .vp-temp-fix
+%patch32 -p1 -b .e7221
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -414,6 +416,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Jan 22 2008 Adam Jackson <ajax at redhat.com> 7.0.2-3
+- mesa-7.0.2-e7221.patch: Enable i915 DRI on E7221. (Carlos Martín, #425790)
+
 * Tue Jan 01 2008 Dave Airlie <airlied at redhat.com> 7.0.2-2
 - mesa-7.0.2-stable-branch.patch: add in mesa 7.0.2 stable patches so far