- since 4.3.99.903 License is XFree86 1.1, which causes issue with GPL packages

[packages/XFree86.git] / XFree86-mga-busmstr.patch

diff --git a/XFree86-mga-busmstr.patch b/XFree86-mga-busmstr.patch
index 3ca86a798e7aaf320f3e34b66dc71f580dbc057d..dc5ddc0b6d787471b87ad82db4d6848cee31db3b 100644 (file)
--- a/XFree86-mga-busmstr.patch
+++ b/XFree86-mga-busmstr.patch
@@ -1,26 +1,21 @@
-Index: mga_dri.c
-===================================================================
-RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v
-retrieving revision 1.14
-diff -u -r1.14 mga_dri.c
---- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 2000/12/11 22:34:55     1.14
-+++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c 2001/03/02 20:13:06
-@@ -379,6 +379,7 @@
-    int init_offset;
-    int i;
-    unsigned long mode_mask;
+--- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c.orig    Wed May  2 17:06:09 2001
++++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c Sun Jun 17 23:03:55 2001
+@@ -897,6 +897,7 @@
+    DRIInfoPtr pDRIInfo;
+    MGADRIPtr pMGADRI;
+    MGADRIServerPrivatePtr pMGADRIServer;
 +   CARD32 pciCommand;
  
-    switch(pMGA->Chipset) {
+    switch ( pMga->Chipset ) {
     case PCI_CHIP_MGAG400:
-@@ -782,6 +783,11 @@
+@@ -1118,6 +1119,11 @@
        return FALSE;
     }
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "visual configs initialized\n" );
+    xf86DrvMsg( pScrn->scrnIndex, X_INFO, "[dri] visual configs initialized\n" );
 +
 +   /* Enable bus mastering in PCI config space */
-+   pciCommand = pciReadLong(pMGA->PciTag, PCI_CMD_STAT_REG);
-+   pciWriteLong(pMGA->PciTag, PCI_CMD_STAT_REG,
++   pciCommand = pciReadLong(pMga->PciTag, PCI_CMD_STAT_REG);
++   pciWriteLong(pMga->PciTag, PCI_CMD_STAT_REG,
 +              pciCommand | PCI_CMD_MASTER_ENABLE);
  
     return TRUE;