From 4d9224743279706567b0ad77e3fb7d8ae6f81625 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Wed, 22 May 2013 12:40:18 +0000
Subject: [PATCH] Updates.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11185 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 introduction/welcome/changelog.xml |  6 ++++++
 x/installing/mesalib.xml           | 27 +++++++++++++++++----------
 x/installing/x7driver.xml          |  4 ++--
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/general.ent b/general.ent
index b13299e7f8..c094926512 100644
--- a/general.ent
+++ b/general.ent
@@ -151,7 +151,7 @@ export -f as_root</userinput></screen>
 <!ENTITY cyrus-sasl-version           "2.1.26">
 <!ENTITY gnupg-version                "1.4.13">
 <!ENTITY gnupg2-version               "2.0.20">
-<!ENTITY gnutls-version               "3.1.11">
+<!ENTITY gnutls-version               "3.2.0">
 <!ENTITY gpgme-version                "1.4.1">
 <!ENTITY iptables-version             "1.4.18">
 <!ENTITY libcap2-version              "2.22">
@@ -530,7 +530,7 @@ export -f as_root</userinput></screen>
 <!ENTITY xbitmaps-version             "1.1.1">
 <!ENTITY xcursor-themes-version       "1.0.3">
 <!ENTITY xkeyboard-config-version     "2.8">
-<!ENTITY mesalib-version              "9.1.2">
+<!ENTITY mesalib-version              "9.1.3">
 <!ENTITY glu-version                  "9.0.0">
 <!ENTITY xcb-util-version             "0.3.9">
 <!ENTITY xcb-util-image-version       "0.3.9">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 532fd81619..d4a0f94e70 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -50,6 +50,12 @@
           <para>[krejzi] - Updated Kernel Configuration for Xorg Drivers.
           Thanks to Igor &#381;ivkovi&#263; for the patch.</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - MesaLib 9.1.3.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Xorg Intel Driver 2.21.7.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
diff --git a/x/installing/mesalib.xml b/x/installing/mesalib.xml
index 4ecb66dfdb..b334bfd15c 100644
--- a/x/installing/mesalib.xml
+++ b/x/installing/mesalib.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY mesalib-download-http " ">
   <!ENTITY mesalib-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/MesaLib-&mesalib-version;.tar.bz2">
-  <!ENTITY mesalib-md5sum        "df2aab86ff4a510ce5b0d074caa0a59f">
+  <!ENTITY mesalib-md5sum        "952ccd03547ed72333b64e1746cf8ada">
   <!ENTITY mesalib-size          "5.9 MB">
-  <!ENTITY mesalib-buildsize     "330 MB">
+  <!ENTITY mesalib-buildsize     "340 MB">
   <!ENTITY mesalib-time          "5.5 SBU">
 
   <!ENTITY glu-download-http " ">
@@ -113,6 +113,12 @@
 
     <bridgehead renderas="sect3">Additional Patches</bridgehead>
     <itemizedlist spacing="compact">
+      <!-- <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/MesaLib-&mesalib-version;-llvm_fixes-1.patch"/>
+        </para>
+      </listitem> -->
       <listitem>
         <para>
           Recommended patch:
@@ -187,7 +193,8 @@
       commands:
     </para>
 
-<screen><userinput>autoreconf -fi &amp;&amp;
+<screen><userinput><!-- patch -Np1 -i ../MesaLib-&mesalib-version;-llvm_fixes-1.patch &amp;&amp;
+-->autoreconf -fi &amp;&amp;
 ./configure CFLAGS="-O2" CXXFLAGS="-O2"    \
             --prefix=/usr                  \
             --sysconfdir=/etc              \
@@ -273,7 +280,7 @@ make</userinput></screen>
       <application>Autoconf</application> sets CFLAGS and CXXFLAGS to
       "-g -O2". That results in binaries and libraries being built with
       debugging symbols which make them bigger. Override the default
-      flags to omit -g switch so the final libraries are smaller.
+      flags to omit -g compiler flag so the final libraries are smaller.
     </para>
 
     <para>
@@ -324,8 +331,8 @@ make</userinput></screen>
     </para>
 
     <para>
-      <option>--enable-glx-tls</option>: This switch enables TLS support
-      in GLX.
+      <option>--enable-glx-tls</option>: This switch enables TLS (Thread Local
+      Storage) support in GLX.
     </para>
 
     <para>
@@ -373,9 +380,9 @@ make</userinput></screen>
           glxgears and glxinfo
         </seg>
         <seg>
-          libdricore9.1.2.so, libEGL.so, libgbm.so, libglapi.so,
+          libdricore9.1.3.so, libEGL.so, libgbm.so, libglapi.so,
           libGLESv1_CM.so, libGLESv2.so, libGL.so, libGLU.so,
-          libllvmradeon9.1.2.so, libOpenVG.so, libOSMesa.so and
+          libllvmradeon9.1.3.so, libOpenVG.so, libOSMesa.so and
           libxatracker.so
         </seg>
         <seg>
@@ -426,14 +433,14 @@ make</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libdricore">
-        <term><filename class="libraryfile">libdricore9.1.0.so</filename></term>
+        <term><filename class="libraryfile">libdricore9.1.3.so</filename></term>
         <listitem>
           <para>
             contains common DRI routines used by <application>Mesa</application>
             DRI drivers.
           </para>
           <indexterm zone="mesalib libdricore">
-            <primary sortas="c-libdricore">libdricore9.1.0.so</primary>
+            <primary sortas="c-libdricore">libdricore9.1.3.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/x/installing/x7driver.xml b/x/installing/x7driver.xml
index 684e351360..7b7c8e449b 100644
--- a/x/installing/x7driver.xml
+++ b/x/installing/x7driver.xml
@@ -79,11 +79,11 @@
   <!ENTITY xorg-fbdev-driver-buildsize     "2.3 MB">
   <!ENTITY xorg-fbdev-driver-time          "less than 0.1 SBU">
 
-  <!ENTITY xorg-intel-driver-version "2.21.6">
+  <!ENTITY xorg-intel-driver-version "2.21.7">
 
   <!ENTITY xorg-intel-driver-download-http "&xorg-download-http;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
   <!ENTITY xorg-intel-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-intel-&xorg-intel-driver-version;.tar.bz2">
-  <!ENTITY xorg-intel-driver-md5sum        "a4f002f50b370fe550231c9b33e12399">
+  <!ENTITY xorg-intel-driver-md5sum        "c3a8b542fc4787ad17a5f0567a3429fd">
   <!ENTITY xorg-intel-driver-size          "1.7 MB">
   <!ENTITY xorg-intel-driver-buildsize     "70 MB">
   <!ENTITY xorg-intel-driver-time          "0.6 SBU">