SOURCES: X11-PLD.patch - revert gamma part; dri driver is broken

[arekm]

Author: arekm                        Date: Thu Dec 22 11:17:19 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- revert gamma part; dri driver is broken

---- Files affected:
SOURCES:
   X11-PLD.patch (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SOURCES/X11-PLD.patch
diff -u SOURCES/X11-PLD.patch:1.13 SOURCES/X11-PLD.patch:1.14
--- SOURCES/X11-PLD.patch:1.13	Thu Dec 22 11:59:19 2005
+++ SOURCES/X11-PLD.patch	Thu Dec 22 12:17:14 2005
@@ -269,60 +269,6 @@
  				cyrix siliconmotion via \
  				vesa vga \
  				dummy XF86OSCardDrivers XF86ExtraCardDrivers
-@@ -425,7 +425,7 @@
-    /* SiS is 64-bit unclean as of this writing. */
- #   define i386DRIDrivers /**/
- #  endif
--#  define DriDrivers		i386DRIDrivers mga r128 radeon r200 tdfx
-+#  define DriDrivers		gamma i386DRIDrivers mga r128 radeon r200 tdfx
- # endif
- #endif /* i386Architecture || ia64Architecture */
- 
-@@ -462,7 +462,7 @@
- 
- /* SiS is 64-bit unclean as of this writing. */
- # ifndef DriDrivers
--#  define DriDrivers		i915 mga r128 radeon r200 tdfx
-+#  define DriDrivers		i915 gamma mga r128 radeon r200 tdfx
- # endif
- #endif /*AMD64Arcitecture*/
- 
-@@ -603,7 +603,7 @@
-  *  SiS is 64-bit unclean as of this writing. 
-  */  
- # ifndef DriDrivers
--#  define DriDrivers		tdfx mga r128 radeon r200
-+#  define DriDrivers		gamma tdfx mga r128 radeon r200
- # endif
- #endif /* AlphaArchitecture */
- 
-@@ -637,7 +637,7 @@
- # endif
- /*  The tdfx driver needs Glide, which is not available for PPC. */
- # ifndef DriDrivers
--#  define DriDrivers		mga r128 radeon r200
-+#  define DriDrivers		gamma mga r128 radeon r200
- # endif
- #endif  /* PpcArchitecture || Mc68020Architecture */
- 
-@@ -666,7 +666,7 @@
- 				XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
- # ifndef DriDrivers
--#  define DriDrivers		mga r128 radeon r200
-+#  define DriDrivers		gamma mga r128 radeon r200
- # endif
- #endif
- 
-@@ -767,7 +767,7 @@
- # endif
- # define TdfxDriDriver		/**/
- # ifndef DriDrivers
--#  define DriDrivers		r128
-+#  define DriDrivers		gamma r128
- # endif
- #endif /* Ppc64Architecture */
- 
 diff -ur X11-6.9.0.org/xc/config/cf/xorgsite.def X11-6.9.0/xc/config/cf/xorgsite.def
 --- X11-6.9.0.org/xc/config/cf/xorgsite.def	2005-07-16 09:59:50.000000000 +0200
 +++ X11-6.9.0/xc/config/cf/xorgsite.def	2005-12-22 10:33:48.940963000 +0100
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/X11-PLD.patch?r1=1.13&r2=1.14&f=u