Attachment 1629 Details for Bug 2215 – [FIXED_X11R68x] See above.

[patch] [FIXED_X11R68x] See above.

diff.xorg_cf (text/plain), 2.60 KB, created by Egbert Eich on 2005-01-04 09:26:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2005-01-04 09:26:52 UTC

Size: 2.60 KB

patch

obsolete

>Index: config/cf/xorg.cf
>===================================================================
>RCS file: /cvs/xorg/xc/config/cf/xorg.cf,v
>retrieving revision 1.34
>diff -u -r1.34 xorg.cf
>--- config/cf/xorg.cf	14 Dec 2004 01:41:58 -0000	1.34
>+++ config/cf/xorg.cf	4 Jan 2005 17:22:35 -0000
>@@ -418,7 +418,7 @@
> #  define DriDrivers		gamma i386DRIDrivers mga r128 radeon r200 \
> 				sis tdfx
> # endif
>-#endif
>+#endif /* i386Architecture || ia64Architecture */
> 
> #if defined(AMD64Architecture)
> /* vgahw module */
>@@ -454,7 +454,7 @@
> /* The tdfx driver needs Glide, which is not available for AMD64.  SiS is 64-bit
>  * unclean as of this writing.
>  */
>-# define DriDrivers		gamma mga r128 radeon r200
>+# define DriDrivers		i915 gamma mga r128 radeon r200
> 
> #endif /*AMD64Arcitecture*/
> 
>@@ -540,7 +540,7 @@
> 				DevelDrivers \
> 				XF86OSCardDrivers XF86ExtraCardDrivers
> # endif
>-#endif
>+#endif /* OpenBSDArchitecture && Sparc64Architecture */
> 
> /* MIPS drivers */
> 
>@@ -564,7 +564,7 @@
> 				DevelDrivers newport \
> 				XF86OSCardDrivers XF86ExtraCardDrivers
> # endif
>-#endif
>+#endif /* MipsArchitecture */
> 
> /*
>  * DEC Alpha drivers
>@@ -593,7 +593,7 @@
> # ifndef DriDrivers
> #  define DriDrivers		gamma tdfx mga r128 radeon r200
> # endif
>-#endif
>+#endif /* AlphaArchitecture */
> 
> /*
>  * Motorola 68k and PowerPC drivers
>@@ -672,10 +672,6 @@
> # ifndef XorgServer
> #  define XorgServer		YES
> # endif
>-/* Amiga framebuffer module */
>-# ifndef XF86AFB
>-#  define XF86AFB		NO
>-# endif
> /* 1bpp module */
> # ifndef XF1Bpp
> #  define XF1Bpp		NO
>@@ -696,10 +692,6 @@
> # ifndef XFShadowFB
> #  define XFShadowFB		YES
> # endif
>-/* vgahw module */
>-# ifndef XF86VgaHw
>-#  define XF86VgaHw		NO
>-# endif
> /* fbdevhw module */
> # ifndef XF86FBDevHw
> #  define XF86FBDevHw		YES
>@@ -724,11 +716,23 @@
> # ifndef XF86RAC
> #  define XF86RAC		YES
> # endif
>-
> /* int10 module */
> # ifndef XF86Int10
> #  define XF86Int10		YES
> # endif
>+/* vbe module */
>+# ifndef XF86VBE
>+#  define XF86VBE		YES
>+# endif
>+
>+/* vgahw module */
>+# ifndef XF86VgaHw
>+#  define XF86VgaHw		NO
>+# endif
>+/* Amiga framebuffer module */
>+# ifndef XF86AFB
>+#  define XF86AFB		NO
>+# endif
> 
> # ifndef DevelDrivers
> #  if XFree86Devel
>@@ -748,7 +752,7 @@
> # ifndef DriDrivers
> #  define DriDrivers		gamma r128
> # endif
>-#endif
>+#endif /* Ppc64Architecture */
> 
> /*
>  * For Mips/Arc platforms, the default is to build all modules which
>@@ -1531,7 +1535,7 @@
> # endif
> #endif
> 
>-#if  (GccMajorVersion == 3) &&  (GccMinorVersion >= 1)
>+#if  ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)) || (GccMajorVersion > 3)
> # define GccAliasingArgs      -fno-strict-aliasing
> #else
> # define GccAliasingArgs      /* */

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 2215: 1629 | 1658 | 1661

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.