Changeset b245940


Ignore:
Timestamp:
07/23/2014 12:57:05 AM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
7d354be8
Parents:
b9893e6
Message:

Revert r13561.

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

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • index.xml

    rb9893e6 rb245940  
    2323  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x/x.xml"/>
    2424  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde/kde.xml"/>
    25   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-systemd/gnome.xml"/>
     25  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome/gnome.xml"/>
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce/xfce.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde/lxde.xml"/>

  • x/installing/mesalib-systemd.xml

    rb9893e6 rb245940  
    77  <!ENTITY mesalib-download-http " ">
    88  <!ENTITY mesalib-download-ftp
    9   "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
    10 <!--  <!ENTITY mesalib-download-ftp
    11   "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">-->
     9           "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
    1210  <!ENTITY mesalib-md5sum        "11d3542da1b703618634be840a87b0b2">
    1311  <!ENTITY mesalib-size          "6.9 MB">
    … …  
    9795    <bridgehead renderas="sect4">Recommended</bridgehead>
    9896    <para role="recommended">
    99       <xref linkend="elfutils"/> (required for radeon 3d drivers),
    100       <xref linkend="libvdpau"/> (to build VDPAU drivers),
    101       <xref linkend="llvm"/> (required for radeon 3d drivers and also for
     97      <xref linkend="elfutils"/> (required for Radeon 3D drivers),
     98      <xref linkend="libvdpau"/> (to build VDPAU drivers for supported hardware),
     99      <xref linkend="llvm"/> (required for Radeon 3D drivers and also for
    102100      llvmpipe which is intended to be the fastest of the three sw rasterizers,
    103       see <ulink url="http://www.mesa3d.org/faq.html#part3"></ulink> )
     101      see <ulink url="http://www.mesa3d.org/faq.html#part3"></ulink>) and
     102      <xref linkend="wayland"/> (required for <filename>libwayland-egl</filename>
     103      library which is used by many packages that use
     104      <application>Wayland</application>)
    104105    </para>
    105106
    106107    <bridgehead renderas="sect4">Optional</bridgehead>
    107108    <para role="optional">
    108       <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">mesa-demos</ulink>
    109       provides more than 300 extra demos to test
    110       <application>MesaLib</application>; two of them overwrites the ones
    111       included by
    112       <filename>MesaLib-&mesalib-version;-add_xdemos-1.patch</filename>;
    113       to avoid that, install in a different prefix or add, e.g.
    114       <option>--program-prefix=md</option> to configure, and
    115       <xref linkend="wayland"/>
     109      <ulink url="http://libclc.llvm.org/">libclc</ulink>
     110      (to build Radeon OpenCL library) and
     111      <ulink url="http://omxil.sourceforge.net/">libomxil-bellagio</ulink>
     112      (to build Radeon OpenMAX driver)
    116113    </para>
    117114
    … …  
    123120        Please note that <application>elfutils</application> and
    124121        <application>LLVM</application> are <emphasis>required</emphasis>
    125         for Radeon 3D drivers.  For an explanation of gallium please see
     122        for Radeon 3D drivers. For an explanation of gallium please see
    126123        <ulink url="https://en.wikipedia.org/wiki/Gallium3D"></ulink>.
    127124      </para>
    … …  
    167164    </para>
    168165
    169 <screen><userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"   \
    170             --prefix=$XORG_PREFIX          \
    171             --sysconfdir=/etc              \
    172             --enable-texture-float         \
    173             --enable-gles1                 \
    174             --enable-gles2                 \
    175             --enable-osmesa                \
    176             --enable-xa                    \
    177             --enable-gbm                   \
    178             --disable-gallium-egl          \
    179             --enable-gallium-gbm           \
    180             --enable-shared-glapi          \
    181             --enable-glx-tls               \
    182             --with-egl-platforms="x11,wayland,drm" \
    183             --with-gallium-drivers="nouveau,r300,r600,radeonsi,swrast" &amp;&amp;
     166<screen><userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2" \
     167            --prefix=/usr                \
     168            --sysconfdir=/etc            \
     169            --enable-texture-float       \
     170            --enable-gles1               \
     171            --enable-gles2               \
     172            --enable-openvg              \
     173            --enable-osmesa              \
     174            --enable-xa                  \
     175            --enable-gbm                 \
     176            --enable-gallium-egl         \
     177            --enable-gallium-gbm         \
     178            --enable-glx-tls             \
     179            --with-egl-platforms="drm,x11,wayland" \
     180            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
    184181make</userinput></screen>
    185182
    … …  
    189186    </para>
    190187
    191 <screen><userinput>make -C xdemos DEMOS_PREFIX=$XORG_PREFIX</userinput></screen>
     188<screen><userinput>make -C xdemos DEMOS_PREFIX=/usr</userinput></screen>
    192189
    193190    <para>
    … …  
    207204    </para>
    208205
    209 <screen role="root"><userinput>make -C xdemos DEMOS_PREFIX=$XORG_PREFIX install</userinput></screen>
     206<screen role="root"><userinput>make -C xdemos DEMOS_PREFIX=/usr install</userinput></screen>
    210207
    211208    <para>
    … …  
    249246
    250247    <para>
    251       <parameter>--disable-gallium-egl</parameter>: This switch disables
    252       the egl_gallium loader so that on Intel 915 and 965 hardware we
    253       avoid harmless error messages at runtime.  The real Gallium drivers
    254       will be built as DRI drivers, which egl_dri2 loader will load just fine.
    255     </para>
    256 
    257     <para>
    258248      <parameter>--enable-openvg</parameter>: This switch enables support for
    259       OpenVG API. In order to use this switch you will need to replace
    260       <parameter>--disable-gallium-egl</parameter> with
    261       <parameter>--enable-gallium-egl</parameter>.
     249      OpenVG API.
    262250    </para>
    263251
    … …  
    293281
    294282    <para>
    295       <parameter>--enable-shared-glapi</parameter>: This switch makes libGL
    296       use the shared libglapi which is required if applications mix
    297       OpenGL and OpenGL ES.
    298     </para>
    299 
    300     <para>
    301283      <parameter>--with-egl-platforms="..."</parameter>: This parameter
    302284      controls for which platforms EGL should be built. Available
    303       platforms are drm, x11 and wayland.
     285      platforms are drm, x11 and wayland. Remove <option>wayland</option>
     286      from the list if you have not installed
     287      <application>Wayland</application>.
    304288    </para>
    305289
    … …  
    334318        </seg>
    335319        <seg>
    336           libGL.so,
    337           libEGL.so,
    338           libGLESv1_CM.so,
     320          libEGL.so,
     321          libgbm.so,
     322          libglapi.so,
     323          libGLESv1_CM.so,
    339324          libGLESv2.so,
    340           libOSMesa.so,
    341           libgbm.so,
    342           libglapi.so,
    343           libxatracker.so,
    344           libwayland-egl.so,
    345           <!--libXvMCnouveau.so and libXvMCr600.so--> and
    346           several libs under /usr/lib/{dri,egl,gallium-pipe,gbm,vdpau}
     325          libGL.so,
     326          libOSMesa.so,
     327          libOpenVG.so,
     328          libwayland-egl.so, and
     329          libxatracker.so
    347330        </seg>
    348331        <seg>
    349           $XORG_PREFIX/include/EGL,
    350           $XORG_PREFIX/include/GL,
    351           $XORG_PREFIX/include/GLES,
    352           $XORG_PREFIX/include/GLES2,
    353           $XORG_PREFIX/include/GLES3,
    354           $XORG_PREFIX/include/KHR,
    355           $XORG_PREFIX/include/VG,
    356           $XORG_PREFIX/lib/dri,
    357           $XORG_PREFIX/lib/egl,
    358           $XORG_PREFIX/lib/gallium-pipe,
    359           $XORG_PREFIX/lib/gbm,
    360           $XORG_PREFIX/lib/vdpau, and
     332          /usr/include/EGL,
     333          /usr/include/GL,
     334          /usr/include/GLES,
     335          /usr/include/GLES2,
     336          /usr/include/GLES3,
     337          /usr/include/KHR,
     338          /usr/include/VG,
     339          /usr/lib/dri,
     340          /usr/lib/egl,
     341          /usr/lib/gallium-pipe,
     342          /usr/lib/gbm,
     343          /usr/lib/vdpau, and
    361344          /usr/share/doc/MesaLib-&mesalib-version; (optional)
    362345        </seg>
    … …  
    457440      </varlistentry>
    458441
    459       <varlistentry id="libwayland-egl">
    460         <term><filename class="libraryfile">libwayland-egl.so</filename></term>
    461         <listitem>
    462           <para>
    463             is the <application>Mesa</application> Wayland framebuffer library.
    464           </para>
    465           <indexterm zone="mesalib libwayland-egl">
    466             <primary sortas="c-libwayland-egl">libwayland-egl.so</primary>
     442      <varlistentry id="libOpenVG">
     443        <term><filename class="libraryfile">libOpenVG.so</filename></term>
     444        <listitem>
     445          <para>
     446            is the <application>Mesa</application> OpenVG 1.0 library.
     447          </para>
     448          <indexterm zone="mesalib libOpenVG">
     449            <primary sortas="c-libOpenVG">libOpenVG.so</primary>
    467450          </indexterm>
    468451        </listitem>
Note: See TracChangeset for help on using the changeset viewer.