rpms/mesa/devel mesa-7.1-e7221.patch, NONE, 1.1 mesa.spec, 1.155, 1.156

[Adam Jackson (ajax)]

Author: ajax

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

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


mesa-7.1-e7221.patch:

--- NEW FILE mesa-7.1-e7221.patch ---
diff -up mesa-20071127/src/mesa/drivers/dri/i915/intel_screen.c.e7221 mesa-20071127/src/mesa/drivers/dri/i915/intel_screen.c
--- mesa-20071127/src/mesa/drivers/dri/i915/intel_screen.c.e7221	2007-11-27 14:33:54.000000000 -0500
+++ mesa-20071127/src/mesa/drivers/dri/i915/intel_screen.c	2008-01-22 13:26:07.000000000 -0500
@@ -735,6 +735,7 @@ intelCreateContext(const __GLcontextMode
       return i830CreateContext(mesaVis, driContextPriv, 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-20071127/src/mesa/drivers/dri/i915/intel_context.h.e7221 mesa-20071127/src/mesa/drivers/dri/i915/intel_context.h
--- mesa-20071127/src/mesa/drivers/dri/i915/intel_context.h.e7221	2007-11-27 14:33:54.000000000 -0500
+++ mesa-20071127/src/mesa/drivers/dri/i915/intel_context.h	2008-01-22 13:26:07.000000000 -0500
@@ -324,6 +324,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-20071127/src/mesa/drivers/dri/i915/intel_context.c.e7221 mesa-20071127/src/mesa/drivers/dri/i915/intel_context.c
--- mesa-20071127/src/mesa/drivers/dri/i915/intel_context.c.e7221	2007-11-27 14:33:54.000000000 -0500
+++ mesa-20071127/src/mesa/drivers/dri/i915/intel_context.c	2008-01-22 13:27:10.000000000 -0500
@@ -125,6 +125,9 @@ intelGetString(GLcontext * ctx, GLenum n
       case PCI_CHIP_I915_GM:
          chipset = "Intel(R) 915GM";
          break;
+      case PCI_CHIP_E7221_G:
+ 	 chipset = "Intel(R) E7221G (i915)";
+	 break;
       case PCI_CHIP_I945_G:
          chipset = "Intel(R) 945G";
          break;


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- mesa.spec	21 Jan 2008 16:49:55 -0000	1.155
+++ mesa.spec	22 Jan 2008 18:27:50 -0000	1.156
@@ -35,7 +35,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.7%{?dist}
+Release: 0.8%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -53,6 +53,7 @@
 Patch18: mesa-7.0-selinux-awareness.patch
 Patch25: mesa-7.0-symlinks-before-depend.patch
 Patch26: mesa-7.1-remove-getid-i915.patch
+Patch27: mesa-7.1-e7221.patch
 
 BuildRequires: pkgconfig
 %if %{with_dri}
@@ -182,6 +183,7 @@
 %patch18 -p1 -b .selinux-awareness
 %patch25 -p1 -b .makej
 %patch26 -p1 -b .fixi915
+%patch27 -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.
@@ -413,6 +415,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Jan 22 2008 Adam Jackson <ajax at redhat.com> 7.1-0.8
+- Enable i915 DRI on E7221. (Carlos Martín, #425790)
+
 * Mon Jan 21 2008 Adam Jackson <ajax at redhat.com>
 - Make the demo seddery prettier.