From c52f1b3f8294e99f75f77d37107b9c1127fd1aca Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Sun, 17 Oct 2010 14:35:13 +0000
Subject: [PATCH] Updated to libdrm-2.4.21.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8634 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 general/genlib/libdrm.xml          | 19 +++++++++++--------
 introduction/welcome/changelog.xml |  3 +++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/general.ent b/general.ent
index 44093673ec..dcf6070c6f 100644
--- a/general.ent
+++ b/general.ent
@@ -169,7 +169,7 @@ $Date$
 <!ENTITY xcb-proto-version            "1.5">
 <!ENTITY libxcb-version               "1.4">
 <!ENTITY libatomic_ops-version        "1.2">
-<!ENTITY libdrm-version               "2.4.14">
+<!ENTITY libdrm-version               "2.4.21">
 <!ENTITY dbus-glib-version            "0.82">
 <!ENTITY dbus-python-version          "0.83.0">
 <!ENTITY dbus-qt3-version             "0.62">
diff --git a/general/genlib/libdrm.xml b/general/genlib/libdrm.xml
index f1385c2c4d..0417789813 100644
--- a/general/genlib/libdrm.xml
+++ b/general/genlib/libdrm.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
   <!ENTITY libdrm-download-ftp  "http://karakurty.info/ftp/pub/FreeBSD/ports/distfiles/libdrm-&libdrm-version;.tar.bz2">
-  <!ENTITY libdrm-md5sum        "e785b6a6ebd6b8a49dd8210cd8742842">
-  <!ENTITY libdrm-size          "412 KB">
-  <!ENTITY libdrm-buildsize     "5.5 MB">
+  <!ENTITY libdrm-md5sum        "273ed9dad986e3a931649f3d8762ff74">
+  <!ENTITY libdrm-size          "396 KB">
+  <!ENTITY libdrm-buildsize     "4.4 MB">
   <!ENTITY libdrm-time          "less than 0.1 SBU">
 ]>
 
@@ -58,7 +58,8 @@
     <bridgehead renderas="sect3">libdrm Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libpthread-stubs"/></para>
+    <para role="required"><xref linkend="libpthread-stubs"/> and
+    <xref linkend="libatomic_ops"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libdrm"/></para>
@@ -94,7 +95,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>None</seg>
-        <seg>libdrm.{so,a} and libdrm_intel.{so,a}</seg>
+        <seg>libdrm.so, libdrm_intel.so, and libdrm_radeon.so</seg>
         <seg><envar>$XORG_PREFIX</envar>/include/drm</seg>
       </seglistitem>
     </segmentedlist>
@@ -105,11 +106,13 @@ make</userinput></screen>
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libdrm-lib">
-        <term><filename class='libraryfile'>libdrm.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libdrm{,_intel,_radeon}.so</filename></term>
         <listitem>
-          <para>contains the Direct Rendering Module library functions.</para>
+          <para>contains the Direct Rendering Module library functions, and
+          additional vendor specific functions for intel and radeon
+          devices.</para>
           <indexterm zone="libdrm libdrm-lib">
-            <primary sortas="c-libdrm">libdrm.{so,a}</primary>
+            <primary sortas="c-libdrm">libdrm{,_intel,_radeon}.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 9c938b6baf..2f42e5ece6 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,9 @@
         <listitem>
           <para>[dj] - Added libatomic_ops-1.2.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - Updated to libdrm-2.4.21.</para>
+        </listitem>
       </itemizedlist>
     </listitem>