Changeset a3391441

Timestamp:

09/13/2014 03:29:21 PM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

systemd-11177

Parents:

3985f6f

Message:

Merged mesalib changes from trunk.

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

Files:

• packages.ent (modified) (1 diff)
• x/installing/mesalib-systemd.xml (modified) (2 diffs)

packages.ent

@@ -429 +429 @@
 <!ENTITY xcursor-themes-version       "1.0.4">
 <!ENTITY xkeyboard-config-version     "2.12">
-<!ENTITY mesalib-version              "10.2.6">
+<!ENTITY mesalib-version              "10.2.7">
 <!ENTITY xcb-util-version             "0.3.9">
 <!ENTITY xcb-util-image-version       "0.3.9">

x/installing/mesalib-systemd.xml

@@ -73 +73 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <bridgehead renderas="sect3">Additional Patch</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
+          Required patch:
+          <ulink url="&patch-root;/MesaLib-&mesalib-version;-upstream_fixes-1.patch"/>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           Recommended patch:
-          <ulink url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-3.patch"/>
+          <ulink url="&patch-root;/MesaLib-&mesalib-version;-add_xdemos-1.patch"/>
           (Needed if testing the Xorg installation per BLFS instructions).
         </para>
@@ -155 +161 @@
     </para>
 
-<screen><userinput>sed -e '/0x0303/ a#define OwningPtr std::unique_ptr\n#elif HAVE_LLVM >= 0x0303' \
-    -e 's/^#if HAVE_LLVM >= 0x0303/#if HAVE_LLVM >= 0x0305/' \
-    -i src/gallium/auxiliary/gallivm/lp_bld_debug.cpp &amp;&amp;
+<screen><userinput>patch -Np1 -i ../MesaLib-&mesalib-version;-upstream_fixes-1.patch &amp;&amp;
 
 ./autogen.sh CFLAGS="-O2" CXXFLAGS="-O2" \