ports/111333: Update port: graphics/dri to support 945GM

[Marcus Alves Grando]

>Number:         111333
>Category:       ports
>Synopsis:       Update port: graphics/dri to support 945GM
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 06 20:30:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Marcus Alves Grando
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
Terra Networks Brasil
>Environment:
System: FreeBSD freefall.freebsd.org 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Dec 10 03:18:20 UTC 2005 kensmith at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


	
>Description:
- Add Intel 945 GM support
- portlint(1)
	
>How-To-Repeat:
	
>Fix:

	

--- dri.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/dri/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	1 Sep 2006 04:17:44 -0000	1.17
+++ Makefile	6 Apr 2007 20:11:53 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	dri
 PORTVERSION=	6.4.1
-PORTEPOCH=	2
+PORTEPOCH=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=mesa3d
@@ -37,7 +37,7 @@
 .include <bsd.port.pre.mk>
 
 .if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	requires libGL from X.Org.
+IGNORE=	requires libGL from X.Org
 .endif
 
 do-install:
Index: files/patch-945gm
===================================================================
RCS file: files/patch-945gm
diff -N files/patch-945gm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-945gm	6 Apr 2007 20:11:53 -0000
@@ -0,0 +1,43 @@
+--- src/mesa/drivers/dri/i915/intel_screen.c.orig	Fri Apr  6 16:49:46 2007
++++ src/mesa/drivers/dri/i915/intel_screen.c	Fri Apr  6 16:50:04 2007
+@@ -340,6 +340,7 @@
+    case PCI_CHIP_I915_G:
+    case PCI_CHIP_I915_GM:
+    case PCI_CHIP_I945_G:
++   case PCI_CHIP_I945_GM:
+       return i915CreateContext( mesaVis, driContextPriv, 
+ 			       sharedContextPrivate );
+  
+--- src/mesa/drivers/dri/i915/intel_context.c.orig	Fri Apr  6 16:45:51 2007
++++ src/mesa/drivers/dri/i915/intel_context.c	Fri Apr  6 16:46:20 2007
+@@ -118,6 +118,8 @@
+ 	 chipset = "Intel(R) 915GM"; break;
+       case PCI_CHIP_I945_G:
+ 	 chipset = "Intel(R) 945G"; break;
++      case PCI_CHIP_I945_GM:
++	 chipset = "Intel(R) 945GM"; break;
+       default:
+ 	 chipset = "Unknown Intel Chipset"; break;
+       }
+--- src/mesa/drivers/dri/i915/i915_texstate.c.orig	Fri Apr  6 16:48:21 2007
++++ src/mesa/drivers/dri/i915/i915_texstate.c	Fri Apr  6 16:48:48 2007
+@@ -496,7 +496,8 @@
+    }
+ 
+ 
+-   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G)
++   if (i915->intel.intelScreen->deviceID == PCI_CHIP_I945_G ||
++       i915->intel.intelScreen->deviceID == PCI_CHIP_I945_GM)
+       i945LayoutTextureImages( i915, tObj );	 
+    else
+       i915LayoutTextureImages( i915, tObj );
+--- src/mesa/drivers/dri/i915/intel_context.h.orig	Fri Apr  6 16:49:05 2007
++++ src/mesa/drivers/dri/i915/intel_context.h	Fri Apr  6 16:49:31 2007
+@@ -413,6 +413,7 @@
+ #define PCI_CHIP_I915_G			0x2582
+ #define PCI_CHIP_I915_GM		0x2592
+ #define PCI_CHIP_I945_G			0x2772
++#define PCI_CHIP_I945_GM			0x27A2
+ 
+ 
+ /* ================================================================
--- dri.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: