Changeset 9b3b6a4 for x/lib


Ignore:
Timestamp:
02/14/2007 08:11:15 AM (17 years ago)
Author:
Randy McMurchy <randy@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
5a883bc4
Parents:
b9955a9a
Message:

Minor modifications to the MesaLib instructions (both the text and the commands)

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • x/lib/mesalib.xml

    rb9955a9a r9b3b6a4  
    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"/>.</para>
    70     </note>
     77    </note> -->
    7178
    7279    <bridgehead renderas="sect3">Recommended Download</bridgehead>
    73     <para><ulink
    74     url="http://downloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2">MesaDemos-&mesalib-version;</ulink>
    75     provides a demo and a diagnostic program to verify that GL is working
    76     properly.</para>
     80    <itemizedlist spacing="compact">
     81      <listitem>
     82        <para>Demonstration and diagnostic utilities used to verify that GL is
     83        working properly: <ulink url="&mesademos-download-http;"/></para>
     84      </listitem>
     85    </itemizedlist>
    7786
    7887    <bridgehead renderas="sect3">Optional Download</bridgehead>
    79     <para><ulink
    80     url="http://downloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2">MesaGLUT-&mesalib-version;</ulink>
    81     provides a working <filename class='libraryfile'>libglut</filename>.</para>
    82 
    83     <note>
    84       <para>You should extract all three tarballs from the same toplevel
    85       directory.  All three files will extract to the
    86       <filename class="directory">Mesa-&mesalib-version;</filename>
    87       directory.</para>
    88     </note>
     88    <itemizedlist spacing="compact">
     89      <listitem>
     90        <para>MesaLib GLUT library: <ulink url="&mesaglut-download-http;"/></para>
     91      </listitem>
     92    </itemizedlist>
    8993
    9094    <para condition="html" role="usernotes">User Notes:
    … …  
    96100    <title>Installation of MesaLib</title>
    97101
    98     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    99     href="../../xincludes/xorg7-only.xml"/>
    100 
    101     <para>You will need to adjust the commands below to reflect the
    102     installation prefix of the X Window System.  First, correct several
    103     hard coded directories in the source files with the following
    104     commands:</para>
    105 
    106 <screen><userinput>find . -type f -exec sed -i "s@/usr/X11R6@$XORG_PREFIX@g" {} \; &amp;&amp;
    107 sed -i 's@lib/modules@lib/X11/modules@' src/glx/x11/dri_glx.c &amp;&amp;
    108 sed -i 's@lib/modules@lib/X11/modules@' \
    109     src/mesa/drivers/dri/Makefile.template</userinput></screen>
     102    <para>Extract all three tarballs from the same top-level directory as they
     103    all will extract to the
     104    <filename class="directory">Mesa-&mesalib-version;</filename>
     105    directory.</para>
     106
     107    <!-- Commenting this out as there is already mention of this
     108    <caution>
     109      <para>You should ensure that the <envar>XORG_PREFIX</envar> variable in
     110      the commands below is the same as the one used in the installation prefix
     111      of <application>Xorg</application>.</para>
     112    </caution>
     113    -->
    110114
    111115    <para>Fix an error with output redirection if <command>/bin/sh</command>
    … …  
    114118<screen><userinput>sed -i 's%&gt;&amp; /dev/null%&gt;/dev/null%' src/mesa/drivers/dri/Makefile.template</userinput></screen>
    115119
    116     <para>Build <application>MesaLib</application>
    117     by running the following command:</para>
    118 
    119 <screen><userinput>make OPT_FLAGS="-O2 -fno-strict-aliasing" linux-dri-x86</userinput></screen>
     120    <para>Install <application>MesaLib</application> by running the following
     121    commands:</para>
     122
     123<screen><userinput>find . -type f -exec sed -i "s@/usr/X11R6@$XORG_PREFIX@g" {} \; &amp;&amp;
     124sed -i 's@lib/modules@lib/X11/modules@' \
     125    src/glx/x11/dri_glx.c \
     126    src/mesa/drivers/dri/Makefile.template &amp;&amp;
     127make OPT_FLAGS="-O2 -fno-strict-aliasing" linux-dri-x86</userinput></screen>
     128
     129    <para>If you downloaded and extracted the Demos package, build the programs
     130    with the following commands:</para>
     131
     132<screen><userinput>sed -i 's@-l$(GLUT_LIB)@@g' configs/default &amp;&amp;
     133make -C progs/xdemos PROGS='glxinfo glxgears'</userinput></screen>
    120134
    121135    <para>This package does not come with a test suite.</para>
    122136
    123     <para>Now, as the <systemitem class="username">root</systemitem> user,
    124     issue the following commands to install
    125     <application>MesaLib</application>:</para>
    126 
    127 <screen role="root"><userinput>bin/installmesa $XORG_PREFIX</userinput></screen>
    128 
    129     <para>While still the root user, install the modules for
    130     Xorg-&xorg7-version; with the following commands.</para>
    131 
    132 <screen role="root"><userinput>mkdir -v -p $XORG_PREFIX/lib/X11/modules/dri &amp;&amp;
     137    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
     138
     139<screen role="root"><userinput>bin/installmesa $XORG_PREFIX &amp;&amp;
     140install -v -m755 -d $XORG_PREFIX/lib/X11/modules/dri &amp;&amp;
    133141install -v -m755 lib/*dri* $XORG_PREFIX/lib/X11/modules/dri</userinput></screen>
    134142
    135     <para>If you've extracted the Demos package as well, then
    136     build the test programs with the following commands:</para>
    137 
    138 <screen><userinput>sed -i 's@-l$(GLUT_LIB)@@g' configs/default &amp;&amp;
    139 cd progs/xdemos &amp;&amp;
    140 make PROGS='glxinfo glxgears'</userinput></screen>
    141 
    142     <para>Install the demos as the
    143     <systemitem class="username">root</systemitem> user:</para>
    144 
    145 <screen role="root"><userinput>install -v -m755 glxinfo glxgears $XORG_PREFIX/bin</userinput></screen>
    146 
    147     <note>
    148       <para>Do not remove the Mesa source tree yet, it will be required to
    149       build the <xref linkend="xorg7-server"/>.</para>
    150     </note>
     143    <para>If you built the demo programs, install them using the following
     144    command as the <systemitem class="username">root</systemitem> user:</para>
     145
     146<screen role="root"><userinput>install -v -m755 progs/xdemos/glx{info,gears} $XORG_PREFIX/bin</userinput></screen>
    151147
    152148    <para>Finally, if installing to any prefix other than
    … …  
    156152    <systemitem class="username">root</systemitem> user:</para>
    157153
     154    <tip>
     155      <para>Do not remove the Mesa source tree yet, it will be required to
     156      build the <xref linkend="xorg7-server"/>.</para>
     157    </tip>
     158
    158159<screen role="root"><userinput>ln -s -v $XORG_PREFIX/include/GL /usr/include</userinput></screen>
    159160
    … …  
    163164    <title>Command Explanations</title>
    164165
    165     <para><command>find...sed -i
    166     "s@/usr/X11R6@$XORG_PREFIX@"...</command>:
     166    <para><command>find ... sed -i "s@/usr/X11R6@$XORG_PREFIX@" ...</command>:
    167167    This command corrects several hard coded references to the X11R6 default
    168168    installation path.</para>
    169169
    170     <para><command>sed -i 's@lib/modules@lib/X11/modules@'
    171     src/glx/x11/dri_glx.c</command>: This command corrects a hard coded
    172     reference to the module directory.</para>
     170    <para><command>sed -i 's@lib/modules@lib/X11/modules@' ...</command>:
     171    This command corrects a hard coded reference to the module directory.</para>
    173172
    174173    <para><command>make OPT_FLAGS=... linux-dri-x86</command>: A bug where
    … …  
    180179    if your architecture is not x86.</para>
    181180
     181    <para><command>sed -i 's@-l$(GLUT_LIB)@@g' configs/default</command>:
     182    Disables linking against the GLUT libraries for the demo programs, omit
     183    this command if you downloaded and extracted the GLUT tarball.</para>
     184
     185    <para><command>make ... PROGS='glxinfo glxgears'</command>: Only builds
     186    the <command>glxinfo</command> and <command>glxgears</command>
     187    programs.</para>
     188
    182189    <para><command>bin/installmesa</command>: Mesa uses a custom installation
    183     script as opposed to the normal <parameter>install</parameter> make
    184     target.</para>
     190    script as opposed to the normal <parameter>install</parameter>
     191    <command>make</command> target.</para>
    185192
    186193    <para><command>install -v -m755 lib/*dri*
    … …  
    188195    installs the DRI modules.</para>
    189196
    190     <para><command>sed -i 's@-l$(GLUT_LIB)@@g' configs/default</command>:
    191     disables linking against GLUT libraries for the demo programs.</para>
    192 
    193     <para><command>make PROGS='glxinfo glxgears'</command>: build only
    194     the glxinfo and glxgears programs.</para>
    195 
    196     <para><command>install -v -m755 glxinfo glxgears
    197     $XORG_PREFIX/bin</command>:
    198     Installs only the glxinfo and glxgears programs.</para>
    199 
    200197  </sect2>
    201198
    … …  
    204201
    205202    <segmentedlist>
    206       <segtitle>Installed Programs</segtitle>
     203      <segtitle>Installed Programs (optional)</segtitle>
    207204      <segtitle>Installed Libraries</segtitle>
    208       <segtitle>Installed Directories</segtitle>
     205      <segtitle>Installed Directory</segtitle>
    209206
    210207      <seglistitem>
    211208        <seg>glxgears and glxinfo</seg>
    212         <seg>libGL.{so,a}, libGLU.{so,a}, libGLw.{so,a}, libglut.{so,a} and
    213         *_dri.so</seg>
     209        <seg>libGL.{so,a}, libGLU.{so,a}, libGLw.{so,a}, *_dri.so and
     210        optionally, libglut.{so,a}</seg>
    214211        <seg>$XORG_PREFIX/lib/modules/dri</seg>
    215212      </seglistitem>
    … …  
    224221        <term><filename>glxgears</filename></term>
    225222        <listitem>
    226           <para>a GL demo useful for troubleshooting graphics problems.</para>
     223          <para>is a GL demo useful for troubleshooting graphics
     224          problems.</para>
    227225          <indexterm zone="mesalib glxgears">
    228226            <primary sortas="b-glxgears">glxgears</primary>
    … …  
    234232        <term><filename>glxinfo</filename></term>
    235233        <listitem>
    236           <para>a diagnostic program that displays information about the
     234          <para>is a diagnostic program that displays information about the
    237235          graphics hardware and installed GL libraries.</para>
    238236          <indexterm zone="mesalib glxinfo">
Note: See TracChangeset for help on using the changeset viewer.