o sync with x11/XFree86-4

 - re-enable DRI support.
 - fix radeon DRI module.

o add support for Matrox MGA GXX drivers and G550 identifier.

4 files changed, 72 insertions, 4 deletions

diff --git a/x11/XFree86-4-libraries/files/patch-g550 b/x11/XFree86-4-libraries/files/patch-g550
new file mode 100644
index 000000000000..ac6622733ce7
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-g550
@@ -0,0 +1,18 @@
+--- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.orig	Fri May 11 16:56:10 2001
++++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h	Sat Oct 20 11:28:09 2001
+@@ -358,6 +358,7 @@
+ #define PCI_CHIP_MGAG200_PCI	0x0520
+ #define PCI_CHIP_MGAG200	0x0521
+ #define PCI_CHIP_MGAG400	0x0525
++#define PCI_CHIP_MGAG550	0x2527
+ #define PCI_CHIP_IMPRESSION	0x0D10
+ #define PCI_CHIP_MGAG100_PCI	0x1000
+ #define PCI_CHIP_MGAG100	0x1001
+@@ -964,6 +965,7 @@
+ 				{PCI_CHIP_MGAG200_PCI,	"MGA G200 PCI",0},
+ 				{PCI_CHIP_MGAG200,	"MGA G200 AGP",0},
+ 				{PCI_CHIP_MGAG400,	"MGA G400 AGP",0},
++				{PCI_CHIP_MGAG550,	"MGA G550 AGP",0},
+ 				{PCI_CHIP_MGAG100_PCI,	"MGA G100 PCI",0},
+ 				{PCI_CHIP_MGAG100,	"MGA G100 AGP",0},
+ 				{0x0000,		NULL,0}}},
diff --git a/x11/XFree86-4-libraries/files/patch-r128dri b/x11/XFree86-4-libraries/files/patch-r128dri
new file mode 100644
index 000000000000..c09b58c6ad40
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-r128dri
@@ -0,0 +1,18 @@
+--- programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c.orig	Sat Oct  6 05:29:25 2001
++++ programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c	Fri Oct  5 17:28:40 2001
+@@ -985,12 +985,12 @@
+     /* Check the r128 DRM version */
+     version = drmGetVersion(info->drmFD);
+     if (version) {
+-	if (version->version_major != 2 ||
+-	    version->version_minor < 1) {
++	if (version->version_major != 3 ||
++	    version->version_minor < 0) {
+ 	    /* incompatible drm version */
+ 	    xf86DrvMsg(pScreen->myNum, X_ERROR,
+ 		"[dri] R128DRIScreenInit failed because of a version mismatch.\n"
+-		"[dri] r128.o kernel module version is %d.%d.%d but version 2.1.x is needed.\n"
++		"[dri] r128.o kernel module version is %d.%d.%d but version 3.0 or greater is needed.\n"
+ 		"[dri] Disabling the DRI.\n",
+ 		version->version_major,
+ 		version->version_minor,
diff --git a/x11/XFree86-4-libraries/files/patch-r128xmesa b/x11/XFree86-4-libraries/files/patch-r128xmesa
new file mode 100644
index 000000000000..fc33b516da12
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-r128xmesa
@@ -0,0 +1,13 @@
+--- lib/GL/mesa/src/drv/r128/r128_xmesa.c.orig	Fri Oct  5 17:21:31 2001
++++ lib/GL/mesa/src/drv/r128/r128_xmesa.c	Fri Oct  5 17:22:59 2001
+@@ -80,8 +80,8 @@
+    }
+ 
+    /* Check that the DRM driver version is compatible */
+-   if ( sPriv->drmMajor != 2 ||
+-	sPriv->drmMinor < 1 ) {
++   if ( sPriv->drmMajor != 3 /*||
++	sPriv->drmMinor < 1*/ ) {
+       char msg[1000];
+       sprintf( msg, "R128 DRI driver expected DRM driver version 2.1.x but got version %d.%d.%d", sPriv->drmMajor, sPriv->drmMinor, sPriv->drmPatch );
+       __driMesaMessage( msg );
diff --git a/x11/XFree86-4-libraries/files/patch-z44 b/x11/XFree86-4-libraries/files/patch-z44
index 72f7badb2a5f..9b6f755f2e6c 100644
--- a/x11/XFree86-4-libraries/files/patch-z44
+++ b/x11/XFree86-4-libraries/files/patch-z44
@@ -1,16 +1,35 @@
 --- lib/GL/GL/Imakefile.orig	Tue Apr  3 11:29:31 2001
-+++ lib/GL/GL/Imakefile	Thu Jun  7 03:19:35 2001
-@@ -214,7 +214,7 @@
++++ lib/GL/GL/Imakefile	Sat Oct 20 10:14:30 2001
+@@ -214,14 +214,17 @@
  #undef _LinkBuildLibrary
  #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
  
 -
-+#if !defined(LibInstall) || LibInstall
  #if NormalLibGlx
  NormalLibraryTarget($(LIBNAME),$(UOBJS))
++#if !defined(LibInstall) || LibInstall
  InstallLibrary($(LIBNAME),$(USRLIBDIR))
-@@ -239,5 +239,5 @@
+ #endif
++#endif
+ #if SharedLibGlx
+ SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(OBJS),$(OBJS) $(THREADOBJS),.,.)
++#if !defined(LibInstall) || LibInstall
+ InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
++#endif
+ #if LinkGLToUsrLib && AlternateUsrLibDir
+ install::
+ 	MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR))
+@@ -233,11 +236,14 @@
+ #endif
+ #if DebugLibGlx
+ DebuggedLibraryTarget($(LIBNAME),$(DOBJS))
++#if !defined(LibInstall) || LibInstall
+ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
+ #endif
++#endif
+ #if ProfileLibGlx
  ProfiledLibraryTarget($(LIBNAME),$(POBJS))
++#if !defined(LibInstall) || LibInstall
  InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
  #endif
 -