Author: dj
Date: 2006-05-11 21:52:52 -0600 (Thu, 11 May 2006)
New Revision: 6051
Modified:
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/lib/mesalib.xml
Log:
fixed mesa deps
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2006-05-11 19:02:48 UTC
(rev 6050)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2006-05-12 03:52:52 UTC
(rev 6051)
@@ -54,8 +54,8 @@
alternate forms of the documentation.</para>
</listitem>
<listitem>
- <para>[dj] - Corrected MesaLib instructions to account for
- X11R6.</para>
+ <para>[dj] - Added note to not build MesaLib with X11R6 and
+ removed Xfree and xorg-6.9 from required deps.</para>
</listitem>
<listitem>
<para>[andy] - Updated to XFree86-4.6.0.</para>
Modified: trunk/BOOK/x/lib/mesalib.xml
===================================================================
--- trunk/BOOK/x/lib/mesalib.xml 2006-05-11 19:02:48 UTC (rev 6050)
+++ trunk/BOOK/x/lib/mesalib.xml 2006-05-12 03:52:52 UTC (rev 6051)
@@ -64,13 +64,17 @@
<bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para>
-<!--<xref linkend="x-window-system"/> -->
- <xref linkend="xorg"/> or
- <xref linkend="xorg7-lib"/> and <xref linkend="xorg7-util"/>,
+ <para><xref linkend="xorg7-lib"/>,
+ <xref linkend="xorg7-util"/>,
<xref linkend="libdrm"/>, and
<xref linkend="pkgconfig"/></para>
+ <note>
+ <para>It is not recomended to build a newer version of
+ <application>Mesa</application> with <xref linkend="xfree86"/> or
+ <xref linkend="xorg"/>.</para>
+ </note>
+
<bridgehead renderas="sect3">Recommended Download</bridgehead>
<para><ulink
url="http://prdownloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2"/>
@@ -100,17 +104,11 @@
<para>You will need to adjust the commands below to reflect the
installation prefix of the X Window System. First, correct several
hard coded directories in the source files with the following
- command (you can skip this first command if the prefix is
- <filename class="directory">/usr/X11R6</filename>):</para>
+ commands:</para>
-<screen><userinput>find . -type f -exec sed -i
's@/usr/X11R6@<replaceable><PREFIX></replaceable>@g' {}
\;</userinput></screen>
+<screen><userinput>find . -type f -exec sed -i
's@/usr/X11R6@<replaceable><PREFIX></replaceable>@g' {} \; &&
+sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/X11/modules@'
src/glx/x11/dri_glx.c</userinput></screen>
- <para>If building for <application>Xorg-&xorg7-version;</application>,
- issue the following command to correct for the default module path in the
- new build system:</para>
-
-<screen><userinput>sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/X11/modules@'
src/glx/x11/dri_glx.c</userinput></screen>
-
<para>Build <application>MesaLib</application>
by running the following command:</para>
@@ -119,10 +117,8 @@
<para>This package does not come with a test suite.</para>
<para>Now, as the <systemitem class="username">root</systemitem> user,
- issue the following commands to install
<application>MesaLib</application>.
- Again you should adjust the commands if you've installed the X Window
- System into any prefix other than
- <filename class="directory">/usr</filename>:</para>
+ issue the following commands to install
+ <application>MesaLib</application>:</para>
<screen role="root"><userinput>bin/installmesa
<replaceable><PREFIX></replaceable></userinput></screen>
@@ -132,12 +128,6 @@
<screen role="root"><userinput>mkdir -v -p
<replaceable><PREFIX></replaceable>/lib/X11/modules/dri &&
install -v -m755 lib/*dri*
<replaceable><PREFIX></replaceable>/lib/X11/modules/dri</userinput></screen>
- <para>For Xorg-&xorg-version; <!-- or XFree86-&xfree86-version; -->, use
- these commands instead:</para>
-
-<screen role="root"><userinput>mkdir -v -p
<replaceable><PREFIX></replaceable>/lib/modules/dri &&
-install -v -m755 lib/*dri*
<replaceable><PREFIX></replaceable>/lib/modules/dri</userinput></screen>
-
<para>If you've extracted the Demos package as well, then
build the test programs with the following commands:</para>
@@ -146,15 +136,13 @@
make PROGS='glxinfo glxgears'</userinput></screen>
<para>Install the demos as the
- <systemitem class="username">root</systemitem> user, again adjusting for
- the prefix of your X Window System:</para>
+ <systemitem class="username">root</systemitem> user:</para>
<screen role="root"><userinput>install -v -m755 glxinfo glxgears
<replaceable><PREFIX></replaceable>/bin</userinput></screen>
<note>
- <para>If building <xref linkend="xorg7"/>, do not
- remove the Mesa source tree yet, it will be required to build the
- X server.</para>
+ <para>Do not remove the Mesa source tree yet, it will be required to
+ build the <xref linkend="xorg7-server"/>.</para>
</note>
<para>Finally, if installing to any prefix other than
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
