[PC-BSD Commits] r6184 - in pcbsd/trunk/XGUISource/resources: cardDetect conf templates/header

svn at pcbsd.org svn at pcbsd.org
Fri Feb 5 07:49:10 PST 2010


Author: kris
Date: 2010-02-05 07:49:10 -0800 (Fri, 05 Feb 2010)
New Revision: 6184

Modified:
   pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.compat
   pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.default
   pcbsd/trunk/XGUISource/resources/conf/xorg.conf.basic
   pcbsd/trunk/XGUISource/resources/templates/header/ati-3d-enable.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/ati.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/intel-3d-enable.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/intel.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/mga-3d-enable.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/nvidia.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/radeon-3d-enable.xorg.conf
   pcbsd/trunk/XGUISource/resources/templates/header/xorg.conf.generic
Log:

Also remove freetype xorg module from conf, doesn't exist and needlessly throwing errors in Xorg.0.log



Modified: pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.compat
===================================================================
--- pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.compat	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.compat	2010-02-05 15:49:10 UTC (rev 6184)
@@ -50,8 +50,6 @@
 #	Load  "dbe"
 #	Load  "extmod"
 #	Load  "glx"
-#	Load  "xtrap"
-#	Load  "freetype"
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.default
===================================================================
--- pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.default	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/cardDetect/XF86Config.default	2010-02-05 15:49:10 UTC (rev 6184)
@@ -50,8 +50,6 @@
 #	Load  "dbe"
 #	Load  "extmod"
 #	Load  "glx"
-#	Load  "xtrap"
-#	Load  "freetype"
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/XGUISource/resources/conf/xorg.conf.basic
===================================================================
--- pcbsd/trunk/XGUISource/resources/conf/xorg.conf.basic	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/conf/xorg.conf.basic	2010-02-05 15:49:10 UTC (rev 6184)
@@ -31,14 +31,12 @@
 EndSection
 
 Section "Module"
-
 #	Load  "record"
     Load           "ddc"
     Load           "dbe"
     Load           "extmod"
     Load           "glx"
-    Load           "xtrap"
-    Load           "freetype"
+    Load           "glx2"
 EndSection
 
 Section "InputDevice"
@@ -94,21 +92,11 @@
     BoardName      "NV34 [GeForce FX 5500]"
 EndSection
 
-Section "Extensions"
-    Option         "Composite" "Enable"
-EndSection
-
-
 Section "Screen"
-
-     #DefaultDepth 24
     Identifier     "Screen0"
     Device         "Card0"
     Monitor        "Monitor0"
     DefaultDepth   24
-    Option         "AllowGLXWithComposite" "True"
-    Option         "RenderAccel" "True"
-    Option         "AddARGBGLXVisuals" "True"
     SubSection     "Display"
         Depth       1
         Modes      "640x480"

Modified: pcbsd/trunk/XGUISource/resources/templates/header/ati-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/XGUISource/resources/templates/header/ati-3d-enable.xorg.conf	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/templates/header/ati-3d-enable.xorg.conf	2010-02-05 15:49:10 UTC (rev 6184)
@@ -37,8 +37,6 @@
     Load	   "dri2"
     Load           "extmod"
     Load	   "glx"
-    Load           "xtrap"
-    Load           "freetype"
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/XGUISource/resources/templates/header/ati.xorg.conf
===================================================================
--- pcbsd/trunk/XGUISource/resources/templates/header/ati.xorg.conf	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/templates/header/ati.xorg.conf	2010-02-05 15:49:10 UTC (rev 6184)
@@ -34,8 +34,6 @@
 #    Load	   "dri"
     Load           "extmod"
 #    Load	   "glx"
-    Load           "xtrap"
-    Load           "freetype"
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/XGUISource/resources/templates/header/intel-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/XGUISource/resources/templates/header/intel-3d-enable.xorg.conf	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/templates/header/intel-3d-enable.xorg.conf	2010-02-05 15:49:10 UTC (rev 6184)
@@ -37,8 +37,6 @@
     Load	   "dri2"
     Load           "extmod"
     Load	   "glx"
-    Load           "xtrap"
-    Load           "freetype"
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/XGUISource/resources/templates/header/intel.xorg.conf
===================================================================
--- pcbsd/trunk/XGUISource/resources/templates/header/intel.xorg.conf	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/templates/header/intel.xorg.conf	2010-02-05 15:49:10 UTC (rev 6184)
@@ -33,8 +33,6 @@
     Load           "ddc"
     Load           "dbe"
     Load           "extmod"
-    Load           "xtrap"
-    Load           "freetype"
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/XGUISource/resources/templates/header/mga-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/XGUISource/resources/templates/header/mga-3d-enable.xorg.conf	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/templates/header/mga-3d-enable.xorg.conf	2010-02-05 15:49:10 UTC (rev 6184)
@@ -37,8 +37,6 @@
     Load           "extmod"
     Load	   "glx"
     Load	   "GLcore"
-    Load           "xtrap"
-    Load           "freetype"
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/XGUISource/resources/templates/header/nvidia.xorg.conf
===================================================================
--- pcbsd/trunk/XGUISource/resources/templates/header/nvidia.xorg.conf	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/templates/header/nvidia.xorg.conf	2010-02-05 15:49:10 UTC (rev 6184)
@@ -33,8 +33,6 @@
     Load           "dbe"
     Load           "extmod"
     Load	   "glx"
-    Load           "xtrap"
-    Load           "freetype"
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/XGUISource/resources/templates/header/radeon-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/XGUISource/resources/templates/header/radeon-3d-enable.xorg.conf	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/templates/header/radeon-3d-enable.xorg.conf	2010-02-05 15:49:10 UTC (rev 6184)
@@ -36,8 +36,6 @@
     Load	   "dri2"
     Load           "extmod"
     Load	   "glx"
-    Load           "xtrap"
-    Load           "freetype"
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/XGUISource/resources/templates/header/xorg.conf.generic
===================================================================
--- pcbsd/trunk/XGUISource/resources/templates/header/xorg.conf.generic	2010-02-05 15:45:15 UTC (rev 6183)
+++ pcbsd/trunk/XGUISource/resources/templates/header/xorg.conf.generic	2010-02-05 15:49:10 UTC (rev 6184)
@@ -33,8 +33,6 @@
     Load           "ddc"
     Load           "dbe"
     Load           "extmod"
-    Load           "xtrap"
-    Load           "freetype"
 EndSection
 
 Section "InputDevice"



More information about the Commits mailing list