linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 06:27:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor fixes to X.org

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@2058 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2004-04-25 06:16:58 +00:00
parent 1ac8111284
commit 8412f1ca98
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
index.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"/usr/share/docbook/docbookx.dtd" [
<!ENTITY version "CVS-20040424">
<!ENTITY releasedate "April 24th, 2004">
<!ENTITY pubdate "2004-04-24">
<!ENTITY version "CVS-20040425">
<!ENTITY releasedate "April 25th, 2004">
<!ENTITY pubdate "2004-04-25">
<!ENTITY blfs-version "cvs">
<!ENTITY % book SYSTEM "book/book.ent">

2
introduction/welcome/changelog.xml
View File

@ -11,6 +11,8 @@ who wrote what.</para>
<itemizedlist>
<listitem><para>April 25th, 2004 [bdubbs]: Fixes to X.org</para></listitem>
<listitem><para>April 24th, 2003 [igor]: Updated to FreeType-2.1.8,
ATK-1.6.1, ORBit2-2.10.1, GConf-2.6.1, GNOME Virtual File
System-2.6.1.1, libgnome-2.6.1.1, libgnomecanvas-2.6.1.1, GNOME

23
x/xorg/xorg.xml
View File

@ -52,7 +52,7 @@ application interface (<acronym>API</acronym>).</para>
<para><xref linkend="libpng"/>, <xref linkend="expat"/>, <xref linkend="freetype2"/>
and <xref linkend="fontconfig"/>.</para>
</sect4>
</sect3>
@ -69,7 +69,7 @@ and <xref linkend="fontconfig"/>.</para>
<listitem><para><filename>X11R6.7.0-src7.tar.gz</filename></para></listitem>
</itemizedlist>
<para>The first package contains the <application>Xorg</application> libraries amd
<para>The first package contains the <application>Xorg</application> libraries and
support programs, the second contains standard X programs, the third contains the
X server, the fourth and fifth are fonts, the sixth is normal documentation, and the seventh
is hardcopy documentation.</para>
@ -121,12 +121,11 @@ do not enable <acronym>DRI</acronym>.</para>
<para>If you made any changes to the kernel configuration, recompile the kernel.</para>
<para>Copy <filename>/usr/src/linux/arch/i386/boot/bzImage</filename> and
<filename>/usr/src/linux/System.map</filename> to
<filename>/boot</filename>, edit <filename>/etc/lilo.conf</filename>
appropriately and run <filename>lilo</filename>. If you use
<filename>grub</filename>, edit <filename>/boot/grub/grub.conf</filename>
and add the new kernel to the boot menu.
<para>Copy the <filename>arch/i386/boot/bzImage</filename> and <filename>System.map</filename>
from the kernel build directory to <filename class='directory'>/boot</filename>.
Edit <filename>/boot/grub/grub.conf</filename> and add the new kernel to the
boot menu.
(If you use lilo, edit <filename>/etc/lilo.conf</filename> and run <filename>lilo</filename>.)
</para>
<note><para>If you build <application>Xorg</application> in a chroot environment,
@ -243,7 +242,7 @@ have enabled <acronym>DRI</acronym> kernel modules as explained
above, you now need to update the kernel modules to ensure they are compatible with the
current version of <application>Xorg</application>. To do this, perform the following:</para>
<screen><userinput><command>cd programs/Xserver/hw/xorg/os-support/linux/drm/kernel &amp;&amp;
<screen><userinput><command>cd programs/Xserver/hw/xfree86/os-support/linux/drm/kernel &amp;&amp;
make CC=/opt/gcc-2.95.3/bin/gcc -f Makefile.linux &amp;&amp;
mkdir -p /lib/modules/`uname -r`/kernel/drivers/char/drm/ &amp;&amp;
cp gamma.o radeon.o sis.o r128.o i810.o i830.o mga.o tdfx.o \
@ -337,10 +336,10 @@ a serial mouse on the first serial port would be linked to ttyS1.</para>
<screen><userinput><command>cd ~
Xorg -configure</command></userinput></screen>
The screen will go black and you may hear some clicking of the monitor. This
command will create a file, <filename>xorg.new</filename> in your home
command will create a file, <filename>xorg.conf.new</filename> in your home
directory.</para>
<para>Edit <filename>xorg.new</filename> to suit your system. The
<para>Edit <filename>xorg.conf.new</filename> to suit your system. The
details of the file are located in the man
page <command>man xorg.conf</command>. Some things you may want to
do are:</para>
@ -381,7 +380,7 @@ at <filename>/var/log/Xorg.0.log</filename> to see what went
wrong.</para>
<para>Move the configuration file to its final location</para>
<screen><userinput><command>mv ~/xorg.new /etc/X11/xorg.conf</command></userinput></screen>
<screen><userinput><command>mv ~/xorg.conf.new /etc/X11/xorg.conf</command></userinput></screen>
<para>Create <filename>.xinitrc</filename>
<screen><userinput><command>cat &gt; ~/.xinitrc &lt;&lt; "EOF"</command>