Attachment 679 Details for Bug 1134 – Patch to change default Xserver on Solaris/SPARC

[patch] Patch to change default Xserver on Solaris/SPARC

xsun-patch (text/plain), 3.29 KB, created by Alan Coopersmith on 2004-08-19 00:17:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Coopersmith

Created: 2004-08-19 00:17:07 UTC

Size: 3.29 KB

patch

obsolete

>--- config/cf/X11.tmpl	2004-08-16 19:54:49.988468000 -0700
>+++ config/cf/X11.tmpl	2004-08-18 14:28:03.329545000 -0700
>@@ -115,6 +115,12 @@
> #ifndef HasXServer
> #define HasXServer		YES
> #endif
>+/* xorg.cf sets XorgServer to YES - to build Xorg you must include xorg.cf 
>+ * from the .cf file for your platform.
>+ */
>+#ifndef XorgServer
>+#define XorgServer		NO  
>+#endif
> #ifndef BuildServer
> #define BuildServer		HasXServer
> #endif
>--- config/cf/sun.cf	2004-08-15 10:22:31.172879000 -0700
>+++ config/cf/sun.cf	2004-08-18 20:02:52.134419000 -0700
>@@ -420,11 +420,14 @@
> #  define Xsun24Server	  NO		/* color, mono, multiple depths */
> # endif
> # ifndef XsunServer
>-#  define XsunServer	  YES		/* color and mono, 8 bit only */
>+#  define XsunServer	  NO		/* color and mono, 8 bit only */
> # endif
> # ifndef XsunMonoServer
> #  define XsunMonoServer	  NO		/* monochrome only */
> # endif
>+# ifndef XorgServer
>+#  define XorgServer	(!(Xsun24Server || XsunServer || XsunMonoServer))
>+# endif 
> # ifndef BuildPexExt
> #  define BuildPexExt	  (XsunServer || Xsun24Server)
> # endif
>--- config/cf/svr4.cf	2004-04-23 11:41:59.000000000 -0700
>+++ config/cf/svr4.cf	2004-08-18 20:03:20.807969000 -0700
>@@ -261,7 +261,7 @@
>     defined(PpcArchitecture) || \
>     (defined(SparcArchitecture) && \
>      defined(SunArchitecture) && \
>-     defined(BuildXFree86OnSparcSunOS))
>+     (!defined(XorgServer) || (XorgServer)))
> #ifndef DoLoadableServer
> #define DoLoadableServer	YES
> #endif
>--- config/cf/xorg.cf	2004-08-18 11:45:22.081709000 -0700
>+++ config/cf/xorg.cf	2004-08-18 21:55:20.978067000 -0700
>@@ -494,10 +494,17 @@
> 
> /* Pure SBUS and PCI drivers should go first */
> # ifndef XF86CardDrivers
>-#  define XF86CardDrivers	sunffb sunleo suncg6 suncg3 suncg14 suntcx \
>+#  ifdef SunArchitecture
>+#   define XF86CardDrivers	/* sunffb */ sunleo suncg6 suncg3 suncg14 \
>+				suntcx sunbw2 glint mga tdfx ati vesa vga \
>+				XF86OSCardDrivers XF86ExtraCardDrivers \
>+				DevelDrivers
>+#  else
>+#   define XF86CardDrivers	sunffb sunleo suncg6 suncg3 suncg14 suntcx \
> 				sunbw2 glint mga tdfx ati vesa vga \
> 				XF86OSCardDrivers XF86ExtraCardDrivers \
> 				DevelDrivers
>+#  endif
> # endif
> # ifndef DriDrivers
> #  define DriDrivers		ffb
>--- programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml	2004-04-23 12:23:59.000000000 -0700
>+++ programs/Xserver/hw/xfree86/doc/sgml/Solaris.sgml	2004-08-18 21:34:42.278844000 -0700
>@@ -6,9 +6,10 @@
> 
> <title>Information for Solaris
> <author>David Holland, modified by Marc Aurele La France
>-<date>2004 April 02
>+<date>2004 August 18
> 
> <ident>
>+$XdotOrg: $
> </ident>
> 
> 
>@@ -99,9 +100,11 @@
> binaries.
> At this time, 64-bit binaries will probably not work.<p>
> <item>
>-Also on SPARCs, you will need to set BuildXFree86OnSparcSunOS to YES in
>-~xc/config/cf/host.def.
>-Otherwise, you can only build the old deprecated Xsun* servers.<p>
>+Also on SPARCs, you may be able to build the old deprecated Xsun* servers for
>+older cg* graphics devices by adding "#define XsunServer YES" or "#define 
>+Xsun24Server YES" or "#define XsunMonoServer YES" to ~xc/config/cf/host.def.
>+These servers are no longer maintained nor supported and may not build in
>+this release.<p>
> <item>
> A Threaded Xlib compiled with GCC has subtle problems.
> It'll work 98&percnt; of the time, however clients will occasionally exhibit

Actions: View | Splinter Review

Attachments on bug 1134: 679

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.