Changeset d549985a


Ignore:
Timestamp:
07/22/2014 12:48:08 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485
Children:
1d054a4
Parents:
4879171
Message:

Modify Cairo and MesaLib for Weston. Install MesaLib into /usr, because even though it depends on Xorg, it's not part of Xorg and other projects beside Xorg rely on it.

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

Location:
x
Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed

  • x/installing/installing.xml

    r4879171 rd549985a  
    6464  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-renderutil.xml"/>
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-wm.xml"/>
    66   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib.xml"/>
     66  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib-systemd.xml"/>
    6767  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xbitmaps.xml"/>
    6868  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7app.xml"/>

  • x/installing/mesalib-systemd.xml

    r4879171 rd549985a  
    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       <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
     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-openvg                \
    176             --enable-osmesa                \
    177             --enable-xa                    \
    178             --enable-gbm                   \
    179             --enable-gallium-egl           \
    180             --enable-gallium-gbm           \
    181             --enable-glx-tls               \
    182             --with-egl-platforms="drm,x11" \
     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" \
    183180            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
    184181make</userinput></screen>
    … …  
    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>
    … …  
    286283      <parameter>--with-egl-platforms="..."</parameter>: This parameter
    287284      controls for which platforms EGL should be built. Available
    288       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>.
    289288    </para>
    290289
    … …  
    319318        </seg>
    320319        <seg>
    321           libGL.so,
    322           libEGL.so,
    323           libGLESv1_CM.so,
     320          libEGL.so,
     321          libgbm.so,
     322          libglapi.so,
     323          libGLESv1_CM.so,
    324324          libGLESv2.so,
    325           libOSMesa.so,
    326           libOpenVG.so,
    327           libgbm.so,
    328           libglapi.so,
    329           libxatracker.so,
    330           <!--libXvMCnouveau.so and libXvMCr600.so--> and
    331           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
    332330        </seg>
    333331        <seg>
    334           $XORG_PREFIX/include/EGL,
    335           $XORG_PREFIX/include/GL,
    336           $XORG_PREFIX/include/GLES,
    337           $XORG_PREFIX/include/GLES2,
    338           $XORG_PREFIX/include/GLES3,
    339           $XORG_PREFIX/include/KHR,
    340           $XORG_PREFIX/include/VG,
    341           $XORG_PREFIX/lib/dri,
    342           $XORG_PREFIX/lib/egl,
    343           $XORG_PREFIX/lib/gallium-pipe,
    344           $XORG_PREFIX/lib/gbm,
    345           $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
    346344          /usr/share/doc/MesaLib-&mesalib-version; (optional)
    347345        </seg>

  • x/lib/cairo-systemd.xml

    r4879171 rd549985a  
    9595    <bridgehead renderas="sect4">Recommended</bridgehead>
    9696    <para role="recommended">
    97       <xref linkend="fontconfig"/> and
     97      <xref linkend="fontconfig"/>,
     98      <xref linkend="mesalib"/> and
    9899      <xref linkend="xorg7-lib"/>
    99100    </para>
    … …  
    106107      <xref linkend="libdrm"/>,
    107108      <xref linkend="lzo"/>,
    108       <xref linkend="mesalib"/>,
    109109      <xref linkend="qt4"/>,
    110110      <ulink url="http://code.google.com/p/skia/">Skia</ulink>, and
    … …  
    127127<screen><userinput>CFLAGS="$CFLAGS -ffat-lto-objects" \
    128128./configure --prefix=/usr    \
    129             --disable-static \
    130             --enable-tee &amp;&amp;
     129            --enable-gl      \
     130            --enable-tee     \
     131            --disable-static &amp;&amp;
    131132make</userinput></screen>
    132133
    … …  
    148149      <command>CFLAGS="$CFLAGS -ffat-lto-objects"</command>: Fixes building
    149150      with GCC 4.9.
     151    </para>
     152
     153    <para>
     154      <parameter>--enable-gl</parameter>: This switch enables experimental
     155      OpenGL surface backend which is required for
     156      <application>Weston</application>. Remove it if you have not installed
     157      <xref linkend="mesalib"/>.
    150158    </para>
    151159
    … …  
    162170      <option>--enable-xlib-xcb</option>: This switch enables experimental
    163171      Xlib/XCB functions used by some window managers.
    164     </para>
    165 
    166     <para>
    167       <option>--enable-gl</option>: This switch enables
    168       <application>Cairo</application>'s experimental
    169       <application>OpenGL</application> surface which
    170       is required for <application>Wayland</application>
    171       compositor and some other packages that are not
    172       part of BLFS.
    173172    </para>
    174173

  • x/lib/lib.xml

    r4879171 rd549985a  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi2-core.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi2-atk.xml"/>
    32   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo-systemd.xml"/>
    3333  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm.xml"/>
    3434  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cogl.xml"/>
Note: See TracChangeset for help on using the changeset viewer.