- should fix sparc problem

[packages/X11.git] / X11-gcc4.patch

diff --git a/X11-gcc4.patch b/X11-gcc4.patch
index a3d8676fbb23d4a9919f1df24e73ea2b69ac4fa4..42e83b11f24ee83ef8b1d431431870ccf464432a 100644 (file)
--- a/X11-gcc4.patch
+++ b/X11-gcc4.patch
@@ -1,8 +1,9 @@
 
- config/cf/xorg.cf                                        |    2 +-
- programs/Xserver/fb/fbmmx.c                              |   13 +++++++------
- programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h |    2 +-
- 3 files changed, 9 insertions(+), 8 deletions(-)
+ config/cf/xorg.cf                                      |    2 +-
+ programs/Xserver/fb/fbmmx.c                            |   14 ++++++++------
+ programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c |    2 +-
+ programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h |    3 ---
+ 4 files changed, 10 insertions(+), 11 deletions(-)
 
 --- X11-6.8.2/xc/config/cf/xorg.cf.orig        2005-03-21 19:11:42.000000000 +0100
 +++ X11-6.8.2/xc/config/cf/xorg.cf     2005-03-21 23:03:46.000000000 +0100
@@ -17,14 +18,15 @@
  # if defined(UseInstalled)
 --- X11-6.8.2/xc/programs/Xserver/fb/fbmmx.c.orig      2004-07-22 21:24:50.000000000 +0200
 +++ X11-6.8.2/xc/programs/Xserver/fb/fbmmx.c   2005-02-15 10:32:50.573357352 +0100
-@@ -23,6 +23,7 @@
-  * Based on work by Owen Taylor
-  */
+@@ -27,6 +27,8 @@
+ 
+ #ifdef USE_GCC34_MMX
  
 +#include <mmintrin.h>
- #include "fb.h"
++
+ #ifdef RENDER
  
- #ifdef USE_GCC34_MMX
+ #include "picturestr.h"
 @@ -33,10 +34,10 @@
  #include "mipict.h"
  #include "fbpict.h"
@@ -52,11 +54,26 @@
      else
        return v;
  }
---- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h.orig 2004-08-12 04:23:46.000000000 +0200
-+++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_chipset.h      2005-02-15 11:00:00.350593552 +0100
-@@ -1,4 +1,4 @@
--static SymTabRec RADEONChipsets[] = {
-+SymTabRec RADEONChipsets[] = {
-     { PCI_CHIP_RADEON_QD, "ATI Radeon QD (AGP)" },
-     { PCI_CHIP_RADEON_QE, "ATI Radeon QE (AGP)" },
-     { PCI_CHIP_RADEON_QF, "ATI Radeon QF (AGP)" },
+--- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h.orig   2004-08-03 11:38:03.000000000 +0200
++++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.h        2005-03-31 14:20:45.000000000 +0200
+@@ -146,9 +146,6 @@
+ extern Bool                 RADEONProbe
+                           FunctionPrototype((DriverPtr, int));
+ 
+-extern SymTabRec            RADEONChipsets[];
+-extern PciChipsets          RADEONPciChipsets[];
+-
+ /* radeon_driver.c */
+ extern void                 RADEONLoaderRefSymLists
+                           FunctionPrototype((void));
+--- X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c.orig   2004-08-12 03:03:06.000000000 +0200
++++ X11-6.8.2/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c        2005-03-31 14:20:34.000000000 +0200
+@@ -51,7 +51,7 @@
+ 
+ #include "radeon_chipset.h"
+ 
+-PciChipsets RADEONPciChipsets[] = {
++static PciChipsets RADEONPciChipsets[] = {
+     { PCI_CHIP_RADEON_QD, PCI_CHIP_RADEON_QD, RES_SHARED_VGA },
+     { PCI_CHIP_RADEON_QE, PCI_CHIP_RADEON_QE, RES_SHARED_VGA },
+     { PCI_CHIP_RADEON_QF, PCI_CHIP_RADEON_QF, RES_SHARED_VGA },