Changeset 2c83c17

Timestamp:

07/20/2014 09:13:42 AM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

gnome

Children:

1b152cf

Parents:

27efae5

Message:

manually adding updated mesalib will NOT attempt a merge again

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

File:

• x/installing/mesalib.xml (modified) (6 diffs)

x/installing/mesalib.xml

@@ -10 +10 @@
 <!--  <!ENTITY mesalib-download-ftp
   "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">-->
-  <!ENTITY mesalib-md5sum        "892122b226f218c140ef2db90fe1acb4">
-  <!ENTITY mesalib-size          "6.8 MB">
-  <!ENTITY mesalib-buildsize     "296 MB (additional 1.6 MB for the docs)">
-  <!ENTITY mesalib-time          "4.7 SBU">
+  <!ENTITY mesalib-md5sum        "11d3542da1b703618634be840a87b0b2">
+  <!ENTITY mesalib-size          "6.9 MB">
+  <!ENTITY mesalib-buildsize     "313 MB (additional 1.6 MB for the docs)">
+  <!ENTITY mesalib-time          "4.4 SBU">
 
 ]>
@@ -75 +75 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Patches</bridgehead>
+    <bridgehead renderas="sect3">Additional Patch</bridgehead>
     <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/MesaLib-&mesalib-version;-svga_texture-1.patch"/>
-        </para>
-      </listitem>
       <listitem>
         <para>
@@ -112 +106 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">mesa-demos</ulink>
+      provides more than 300 extra demos to test
+      <application>MesaLib</application>; two of them overwrites the ones
+      included by
+      <filename>MesaLib-&mesalib-version;-add_xdemos-1.patch</filename>;
+      to avoid that, install in a different prefix or add, e.g.
+      <option>--program-prefix=md</option> to configure, and
       <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
     </para>
@@ -166 +167 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../MesaLib-&mesalib-version;-svga_texture-1.patch &amp;&amp;
-./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"   \
+<screen><userinput>./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2"   \
             --prefix=$XORG_PREFIX          \
             --sysconfdir=/etc              \
@@ -329 +329 @@
           libxatracker.so,
           <!--libXvMCnouveau.so and libXvMCr600.so--> and
-          several libs under /usr/lib/{dri,egl,gallium-pipe,gbm<!--,vdpau-->}
+          several libs under /usr/lib/{dri,egl,gallium-pipe,gbm,vdpau}
         </seg>
         <seg>
@@ -342 +342 @@
           $XORG_PREFIX/lib/egl,
           $XORG_PREFIX/lib/gallium-pipe,
-          $XORG_PREFIX/lib/gbm<!--,
-          $XORG_PREFIX/lib/vdpau--> and
+          $XORG_PREFIX/lib/gbm,
+          $XORG_PREFIX/lib/vdpau, and
           /usr/share/doc/MesaLib-&mesalib-version; (optional)
         </seg>