Changeset ba2ac60 for x


Ignore:
Timestamp:
05/25/2007 10:09:36 PM (17 years ago)
Author:
Dan Nichilson <dnicholson@…>
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:
2d006066
Parents:
f3adb6c
Message:

Updated to Mesa-6.5.2

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • x/lib/mesalib.xml

    rf3adb6c rba2ac60  
    88  <!ENTITY mesalib-download-ftp  " ">
    99  <!ENTITY mesalib-md5sum        "61beda590bfc5b4a12e979d5f2d70d7a">
    10   <!ENTITY mesalib-size          "3.3 MB">
    11   <!ENTITY mesalib-buildsize     "157 MB">
    12   <!ENTITY mesalib-time          "1.7 SBU">
     10  <!ENTITY mesalib-size          "3.1 MB">
     11  <!ENTITY mesalib-buildsize     "172 MB">
     12  <!ENTITY mesalib-time          "1.6 SBU">
    1313
    1414  <!ENTITY mesademos-download-http "http://downloads.sourceforge.net/mesa3d/MesaDemos-&mesalib-version;.tar.bz2">
     15  <!ENTITY mesademos-md5sum        "e870efe98d3a50be01ab211b9b2e25d9">
     16  <!ENTITY mesademos-size          "1.3 MB">
     17
    1518  <!ENTITY mesaglut-download-http  "http://downloads.sourceforge.net/mesa3d/MesaGLUT-&mesalib-version;.tar.bz2">
     19  <!ENTITY mesaglut-md5sum         "e84edbb11c69c8e408dfadd2ed08e95b">
     20  <!ENTITY mesaglut-size           "306 KB">
    1621
    1722]>
    … …  
    6267    </itemizedlist>
    6368
     69    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     70
     71    <itemizedlist spacing="compact">
     72      <title>Recommended demonstration and diagnostic utilities for
     73      verifying OpenGL operation</title>
     74      <listitem>
     75        <para>Download (HTTP): <ulink url="&mesademos-download-http;"/></para>
     76      </listitem>
     77      <listitem>
     78        <para>Download MD5 sum: &mesademos-md5sum;</para>
     79      </listitem>
     80      <listitem>
     81        <para>Download size: &mesademos-size;</para>
     82      </listitem>
     83    </itemizedlist>
     84
     85    <itemizedlist spacing="compact">
     86      <title>Optional GLUT library (see also <xref linkend="freeglut"/>)</title>
     87      <listitem>
     88        <para>Download (HTTP): <ulink url="&mesaglut-download-http;"/></para>
     89      </listitem>
     90      <listitem>
     91        <para>Download MD5 sum: &mesaglut-md5sum;</para>
     92      </listitem>
     93      <listitem>
     94        <para>Download size: &mesaglut-size;</para>
     95      </listitem>
     96    </itemizedlist>
     97
    6498    <bridgehead renderas="sect3">MesaLib Dependencies</bridgehead>
    6599
    … …  
    76110      <application>Mesa</application> with <xref linkend="xfree86"/>.</para>
    77111    </note> -->
    78 
    79     <bridgehead renderas="sect3">Recommended Download</bridgehead>
    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>
    86 
    87     <bridgehead renderas="sect3">Optional Download</bridgehead>
    88     <itemizedlist spacing="compact">
    89       <listitem>
    90         <para>MesaLib GLUT library: <ulink url="&mesaglut-download-http;"/></para>
    91       </listitem>
    92     </itemizedlist>
    93112
    94113    <para condition="html" role="usernotes">User Notes:
    … …  
    113132    -->
    114133
    115     <para>Fix an error with output redirection if <command>/bin/sh</command>
    116     is not the <application>Bash</application> shell on your system:</para>
    117 
    118 <screen><userinput>sed -i 's%&gt;&amp; /dev/null%&gt;/dev/null%' src/mesa/drivers/dri/Makefile.template</userinput></screen>
    119 
    120134    <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;
    124 sed -i 's@lib/modules@lib/X11/modules@' \
    125     src/glx/x11/dri_glx.c \
    126     src/mesa/drivers/dri/Makefile.template &amp;&amp;
    127 make OPT_FLAGS="-O2 -fno-strict-aliasing" linux-dri-x86</userinput></screen>
     135    command:</para>
     136
     137<screen><userinput>make linux-dri-x86 OPT_FLAGS="-O2 -fno-strict-aliasing" \
     138    DRI_DRIVER_INSTALL_DIR=${XORG_PREFIX}/lib/modules/dri \
     139    X11_INCLUDES=-I${XORG_PREFIX}/include \
     140    EXTRA_LIB_PATH=-L${XORG_PREFIX}/lib</userinput></screen>
    128141
    129142    <para>If you downloaded and extracted the Demos package, build the programs
    … …  
    137150    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    138151
    139 <screen role="root"><userinput>bin/installmesa $XORG_PREFIX &amp;&amp;
    140 install -v -m755 -d $XORG_PREFIX/lib/X11/modules/dri &amp;&amp;
    141 install -v -m755 lib/*dri* $XORG_PREFIX/lib/X11/modules/dri</userinput></screen>
     152<screen role="root"><userinput>make install INSTALL_DIR=${XORG_PREFIX} \
     153    DRI_DRIVER_INSTALL_DIR=${XORG_PREFIX}/lib/modules/dri &amp;&amp;
     154install -dv ${XORG_PREFIX}/share/doc/MesaLib-&mesalib-version; &amp;&amp;
     155install -v -m644 docs/* ${XORG_PREFIX}/share/doc/MesaLib-&mesalib-version;</userinput></screen>
    142156
    143157    <para>If you built the demo programs, install them using the following
    144158    command as the <systemitem class="username">root</systemitem> user:</para>
    145159
    146 <screen role="root"><userinput>install -v -m755 progs/xdemos/glx{info,gears} $XORG_PREFIX/bin</userinput></screen>
     160<screen role="root"><userinput>install -v -m755 progs/xdemos/glx{info,gears} ${XORG_PREFIX}/bin</userinput></screen>
    147161
    148162    <para>Finally, if installing to any prefix other than
    … …  
    152166    <systemitem class="username">root</systemitem> user:</para>
    153167
    154 <screen role="root"><userinput>ln -s -v $XORG_PREFIX/include/GL /usr/include</userinput></screen>
     168<screen role="root"><userinput>ln -s -v ${XORG_PREFIX}/include/GL /usr/include</userinput></screen>
    155169
    156170    <tip>
    … …  
    164178    <title>Command Explanations</title>
    165179
    166     <para><command>find ... sed -i "s@/usr/X11R6@$XORG_PREFIX@" ...</command>:
    167     This command corrects several hard coded references to the X11R6 default
    168     installation path.</para>
    169 
    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>
    172 
    173     <para><command>make OPT_FLAGS=... linux-dri-x86</command>: A bug where
    174     OpenGL applications are shifted to the left by 50% can be worked around
    175     by adding <option>-fno-strict-aliasing</option> to the compiler flags.
    176     Also, the <option>linux-dri-x86</option> target is specified to use a
     180    <para><command>make ... linux-dri-x86</command>: The
     181    <option>linux-dri-x86</option> target is specified to use a
    177182    few other helpful flags in addition to the defaults. See the other
    178183    targets in the <filename class="directory">configs</filename> directory
    179184    if your architecture is not x86.</para>
    180185
     186    <para><envar>OPT_FLAGS="-O2 -fno-strict-aliasing"</envar>: A bug where
     187    OpenGL applications are shifted to the left by 50% can be worked around
     188    by adding <option>-fno-strict-aliasing</option> to the compiler flags.</para>
     189
     190    <para><envar>DRI_DRIVER_INSTALL_DIR=${XORG_PREFIX}/lib/modules/dri</envar>:
     191    This setting specifies the location that the DRI modules will be installed
     192    to. This path is also built into <filename
     193    class="libraryfile">libGL.so</filename>.</para>
     194
    181195    <para><command>sed -i 's@-l$(GLUT_LIB)@@g' configs/default</command>:
    182196    Disables linking against the GLUT libraries for the demo programs, omit
    … …  
    187201    programs.</para>
    188202
    189     <para><command>bin/installmesa</command>: Mesa uses a custom installation
    190     script as opposed to the normal <parameter>install</parameter>
    191     <command>make</command> target.</para>
    192 
    193     <para><command>install -v -m755 lib/*dri*
    194     $XORG_PREFIX/lib/X11/modules/dri</command>:
    195     installs the DRI modules.</para>
    196 
    197203  </sect2>
    198204
    … …  
    203209      <segtitle>Installed Programs (optional)</segtitle>
    204210      <segtitle>Installed Libraries</segtitle>
    205       <segtitle>Installed Directory</segtitle>
     211      <segtitle>Installed Directories</segtitle>
    206212
    207213      <seglistitem>
    208214        <seg>glxgears and glxinfo</seg>
    209         <seg>libGL.{so,a}, libGLU.{so,a}, libGLw.{so,a}, *_dri.so and
    210         optionally, libglut.{so,a}</seg>
    211         <seg>$XORG_PREFIX/lib/modules/dri</seg>
     215        <seg>libGL.so, libGLU.so, libGLw.so, *_dri.so and
     216        optionally, libglut.so</seg>
     217        <seg><envar>$XORG_PREFIX</envar>/lib/modules/dri and
     218        <envar>$XORG_PREFIX</envar>/share/doc/MesaLib-&mesalib-version;</seg>
    212219      </seglistitem>
    213220    </segmentedlist>
    … …  
    240247      </varlistentry>
    241248
     249      <varlistentry id="libGL">
     250        <term><filename class='libraryfile'>libGL.so</filename></term>
     251        <listitem>
     252          <para>is the main OpenGL library.</para>
     253          <indexterm zone="mesalib libGL">
     254            <primary sortas="c-libGL">libGL.so</primary>
     255          </indexterm>
     256        </listitem>
     257      </varlistentry>
     258
     259      <varlistentry id="libGLU">
     260        <term><filename class='libraryfile'>libGLU.so</filename></term>
     261        <listitem>
     262          <para>is the OpenGL Utility library.</para>
     263          <indexterm zone="mesalib libGLU">
     264            <primary sortas="c-libGLU">libGLU.so</primary>
     265          </indexterm>
     266        </listitem>
     267      </varlistentry>
     268
     269      <varlistentry id="libGLw">
     270        <term><filename class='libraryfile'>libGLw.so</filename></term>
     271        <listitem>
     272          <para>is the Xt/Motif OpenGL drawing area widget library.</para>
     273          <indexterm zone="mesalib libGLw">
     274            <primary sortas="c-libGLw">libGLw.so</primary>
     275          </indexterm>
     276        </listitem>
     277      </varlistentry>
     278
     279      <varlistentry id="libglut-mesa">
     280        <term><filename class='libraryfile'>libglut.so</filename></term>
     281        <listitem>
     282          <para>is the OpenGL Utility Toolkit (GLUT) library.</para>
     283          <indexterm zone="mesalib libglut-mesa">
     284            <primary sortas="c-libglut">libglut.so</primary>
     285          </indexterm>
     286        </listitem>
     287      </varlistentry>
     288
    242289    </variablelist>
    243290
Note: See TracChangeset for help on using the changeset viewer.