Changeset c45d5574


Ignore:
Timestamp:
02/14/2007 08:13:38 AM (17 years ago)
Author:
Randy McMurchy <randy@…>
Branches:
6.2, 6.2.0
Children:
735f7ea
Parents:
2e188c6c
Message:

Merged r6613 from trunk into the 6.2 branch

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/6.2/BOOK@6614 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r2e188c6c rc45d5574  
    44-->
    55
    6 <!ENTITY day          "13">                   <!-- Always 2 digits -->
     6<!ENTITY day          "14">                   <!-- Always 2 digits -->
    77<!ENTITY month        "02">                   <!-- Always 2 digits -->
    88<!ENTITY year         "2007">

  • introduction/welcome/changelog.xml

    r2e188c6c rc45d5574  
    4343
    4444    <listitem>
     45      <para>February 14th, 2007</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[randy] - Minor modifications to the MesaLib instructions, both
     49          text explanations and commands.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
    4555      <para>February 13th, 2007</para>
    4656      <itemizedlist>

  • x/lib/mesalib.xml

    r2e188c6c rc45d5574  
    99  <!ENTITY mesalib-md5sum        "61beda590bfc5b4a12e979d5f2d70d7a">
    1010  <!ENTITY mesalib-size          "3.3 MB">
    11   <!ENTITY mesalib-buildsize     "823 MB">
     11  <!ENTITY mesalib-buildsize     "157 MB">
    1212  <!ENTITY mesalib-time          "1.7 SBU">
     13
     14  <!ENTITY mesademos-download-http "http://downloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2">
     15  <!ENTITY mesaglut-download-http  "http://downloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2">
     16
    1317]>
    1418
    … …  
    6569    <xref linkend="libdrm"/></para>
    6670
    67     <note>
     71    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     72    href="../../xincludes/xorg7-only.xml"/>
     73
     74    <!-- <note>
    6875      <para>It is not recommended to build a newer version of
    6976      <application>Mesa</application> with <xref linkend="xfree86"/> or
    7077      <xref linkend="xorg"/>.</para>
    71     </note>
     78    </note> -->
    7279
    7380    <bridgehead renderas="sect3">Recommended Download</bridgehead>
    74     <para><ulink
    75     url="http://downloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2">MesaDemos-&mesalib-version;</ulink>
    76     provides a demo and a diagnostic program to verify that GL is working
    77     properly.</para>
     81    <itemizedlist spacing="compact">
     82      <listitem>
     83        <para>Demonstration and diagnostic utilities used to verify that GL is
     84        working properly: <ulink url="&mesademos-download-http;"/></para>
     85      </listitem>
     86    </itemizedlist>
    7887
    7988    <bridgehead renderas="sect3">Optional Download</bridgehead>
    80     <para><ulink
    81     url="http://downloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2">MesaGLUT-&mesalib-version;</ulink>
    82     provides a working <filename class='libraryfile'>libglut</filename>.</para>
    83 
    84     <note>
    85       <para>You should extract all three tarballs from the same toplevel
    86       directory.  All three files will extract to the
    87       <filename class="directory">Mesa-&mesalib-version;</filename>
    88       directory.</para>
    89     </note>
     89    <itemizedlist spacing="compact">
     90      <listitem>
     91        <para>MesaLib GLUT library: <ulink url="&mesaglut-download-http;"/></para>
     92      </listitem>
     93    </itemizedlist>
    9094
    9195    <para condition="html" role="usernotes">User Notes:
    … …  
    97101    <title>Installation of MesaLib</title>
    98102
    99     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    100     href="../../xincludes/xorg7-only.xml"/>
    101 
    102     <para>You will need to adjust the commands below to reflect the
    103     installation prefix of the X Window System.  First, correct several
    104     hard coded directories in the source files with the following
    105     commands:</para>
    106 
    107 <screen><userinput>find . -type f -exec sed -i "s@/usr/X11R6@$XORG_PREFIX@g" {} \; &amp;&amp;
    108 sed -i 's@lib/modules@lib/X11/modules@' src/glx/x11/dri_glx.c &amp;&amp;
    109 sed -i 's@lib/modules@lib/X11/modules@' \
    110     src/mesa/drivers/dri/Makefile.template</userinput></screen>
     103    <para>Extract all three tarballs from the same top-level directory as they
     104    all will extract to the
     105    <filename class="directory">Mesa-&mesalib-version;</filename>
     106    directory.</para>
     107
     108    <!-- Commenting this out as there is already mention of this
     109    <caution>
     110      <para>You should ensure that the <envar>XORG_PREFIX</envar> variable in
     111      the commands below is the same as the one used in the installation prefix
     112      of <application>Xorg</application>.</para>
     113    </caution>
     114    -->
    111115
    112116    <para>Fix an error with output redirection if <command>/bin/sh</command>
    … …  
    115119<screen><userinput>sed -i 's%&gt;&amp; /dev/null%&gt;/dev/null%' src/mesa/drivers/dri/Makefile.template</userinput></screen>
    116120
    117     <para>Build <application>MesaLib</application>
    118     by running the following command:</para>
    119 
    120 <screen><userinput>make OPT_FLAGS="-O2 -fno-strict-aliasing" linux-dri-x86</userinput></screen>
     121    <para>Install <application>MesaLib</application> by running the following
     122    commands:</para>
     123
     124<screen><userinput>find . -type f -exec sed -i "s@/usr/X11R6@$XORG_PREFIX@g" {} \; &amp;&amp;
     125sed -i 's@lib/modules@lib/X11/modules@' \
     126    src/glx/x11/dri_glx.c \
     127    src/mesa/drivers/dri/Makefile.template &amp;&amp;
     128make OPT_FLAGS="-O2 -fno-strict-aliasing" linux-dri-x86</userinput></screen>
     129
     130    <para>If you downloaded and extracted the Demos package, build the programs
     131    with the following commands:</para>
     132
     133<screen><userinput>sed -i 's@-l$(GLUT_LIB)@@g' configs/default &amp;&amp;
     134make -C progs/xdemos PROGS='glxinfo glxgears'</userinput></screen>
    121135
    122136    <para>This package does not come with a test suite.</para>
    123137
    124     <para>Now, as the <systemitem class="username">root</systemitem> user,
    125     issue the following commands to install
    126     <application>MesaLib</application>:</para>
    127 
    128 <screen role="root"><userinput>bin/installmesa $XORG_PREFIX</userinput></screen>
    129 
    130     <para>While still the root user, install the modules for
    131     Xorg-&xorg7-version; with the following commands.</para>
    132 
    133 <screen role="root"><userinput>mkdir -v -p $XORG_PREFIX/lib/X11/modules/dri &amp;&amp;
     138    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
     139
     140<screen role="root"><userinput>bin/installmesa $XORG_PREFIX &amp;&amp;
     141install -v -m755 -d $XORG_PREFIX/lib/X11/modules/dri &amp;&amp;
    134142install -v -m755 lib/*dri* $XORG_PREFIX/lib/X11/modules/dri</userinput></screen>
    135143
    136     <para>If you've extracted the Demos package as well, then
    137     build the test programs with the following commands:</para>
    138 
    139 <screen><userinput>sed -i 's@-l$(GLUT_LIB)@@g' configs/default &amp;&amp;
    140 cd progs/xdemos &amp;&amp;
    141 make PROGS='glxinfo glxgears'</userinput></screen>
    142 
    143     <para>Install the demos as the
    144     <systemitem class="username">root</systemitem> user:</para>
    145 
    146 <screen role="root"><userinput>install -v -m755 glxinfo glxgears $XORG_PREFIX/bin</userinput></screen>
    147 
    148     <note>
    149       <para>Do not remove the Mesa source tree yet, it will be required to
    150       build the <xref linkend="xorg7-server"/>.</para>
    151     </note>
     144    <para>If you built the demo programs, install them using the following
     145    command as the <systemitem class="username">root</systemitem> user:</para>
     146
     147<screen role="root"><userinput>install -v -m755 progs/xdemos/glx{info,gears} $XORG_PREFIX/bin</userinput></screen>
    152148
    153149    <para>Finally, if installing to any prefix other than
    … …  
    157153    <systemitem class="username">root</systemitem> user:</para>
    158154
     155    <tip>
     156      <para>Do not remove the Mesa source tree yet, it will be required to
     157      build the <xref linkend="xorg7-server"/>.</para>
     158    </tip>
     159
    159160<screen role="root"><userinput>ln -s -v $XORG_PREFIX/include/GL /usr/include</userinput></screen>
    160161
    … …  
    164165    <title>Command Explanations</title>
    165166
    166     <para><command>find...sed -i
    167     "s@/usr/X11R6@$XORG_PREFIX@"...</command>:
     167    <para><command>find ... sed -i "s@/usr/X11R6@$XORG_PREFIX@" ...</command>:
    168168    This command corrects several hard coded references to the X11R6 default
    169169    installation path.</para>
    170170
    171     <para><command>sed -i 's@lib/modules@lib/X11/modules@'
    172     src/glx/x11/dri_glx.c</command>: This command corrects a hard coded
    173     reference to the module directory.</para>
     171    <para><command>sed -i 's@lib/modules@lib/X11/modules@' ...</command>:
     172    This command corrects a hard coded reference to the module directory.</para>
    174173
    175174    <para><command>make OPT_FLAGS=... linux-dri-x86</command>: A bug where
    … …  
    181180    if your architecture is not x86.</para>
    182181
     182    <para><command>sed -i 's@-l$(GLUT_LIB)@@g' configs/default</command>:
     183    Disables linking against the GLUT libraries for the demo programs, omit
     184    this command if you downloaded and extracted the GLUT tarball.</para>
     185
     186    <para><command>make ... PROGS='glxinfo glxgears'</command>: Only builds
     187    the <command>glxinfo</command> and <command>glxgears</command>
     188    programs.</para>
     189
    183190    <para><command>bin/installmesa</command>: Mesa uses a custom installation
    184     script as opposed to the normal <parameter>install</parameter> make
    185     target.</para>
     191    script as opposed to the normal <parameter>install</parameter>
     192    <command>make</command> target.</para>
    186193
    187194    <para><command>install -v -m755 lib/*dri*
    … …  
    189196    installs the DRI modules.</para>
    190197
    191     <para><command>sed -i 's@-l$(GLUT_LIB)@@g' configs/default</command>:
    192     disables linking against GLUT libraries for the demo programs.</para>
    193 
    194     <para><command>make PROGS='glxinfo glxgears'</command>: build only
    195     the glxinfo and glxgears programs.</para>
    196 
    197     <para><command>install -v -m755 glxinfo glxgears
    198     $XORG_PREFIX/bin</command>:
    199     Installs only the glxinfo and glxgears programs.</para>
    200 
    201198  </sect2>
    202199
    … …  
    205202
    206203    <segmentedlist>
    207       <segtitle>Installed Programs</segtitle>
     204      <segtitle>Installed Programs (optional)</segtitle>
    208205      <segtitle>Installed Libraries</segtitle>
    209       <segtitle>Installed Directories</segtitle>
     206      <segtitle>Installed Directory</segtitle>
    210207
    211208      <seglistitem>
    212209        <seg>glxgears and glxinfo</seg>
    213         <seg>libGL.{so,a}, libGLU.{so,a}, libGLw.{so,a}, libglut.{so,a} and
    214         *_dri.so</seg>
     210        <seg>libGL.{so,a}, libGLU.{so,a}, libGLw.{so,a}, *_dri.so and
     211        optionally, libglut.{so,a}</seg>
    215212        <seg>$XORG_PREFIX/lib/modules/dri</seg>
    216213      </seglistitem>
    … …  
    225222        <term><filename>glxgears</filename></term>
    226223        <listitem>
    227           <para>a GL demo useful for troubleshooting graphics problems.</para>
     224          <para>is a GL demo useful for troubleshooting graphics
     225          problems.</para>
    228226          <indexterm zone="mesalib glxgears">
    229227            <primary sortas="b-glxgears">glxgears</primary>
    … …  
    235233        <term><filename>glxinfo</filename></term>
    236234        <listitem>
    237           <para>a diagnostic program that displays information about the
     235          <para>is a diagnostic program that displays information about the
    238236          graphics hardware and installed GL libraries.</para>
    239237          <indexterm zone="mesalib glxinfo">
Note: See TracChangeset for help on using the changeset viewer.