[blfs-book] r11031 - in trunk/BOOK: . general/genlib x/installing

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Fri Mar 1 03:01:49 PST 2013


Author: krejzi
Date: Fri Mar  1 03:01:49 2013
New Revision: 11031

Log:
libdrm 2.4.42, remove libpthread-stubs package.

Deleted:
   trunk/BOOK/x/installing/libpthread-stubs.xml
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/libdrm.xml
   trunk/BOOK/x/installing/installing.xml
   trunk/BOOK/x/installing/libxcb.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Fri Mar  1 02:38:56 2013	(r11030)
+++ trunk/BOOK/general.ent	Fri Mar  1 03:01:49 2013	(r11031)
@@ -264,7 +264,7 @@
 <!ENTITY libcroco-version             "0.6.8">
 <!ENTITY libdaemon-version            "0.14">
 <!ENTITY libdbusmenu-qt-version       "0.9.2">
-<!ENTITY libdrm-version               "2.4.41">
+<!ENTITY libdrm-version               "2.4.42">
 <!ENTITY libesmtp-version             "1.0.6">
 <!ENTITY libffi-version               "3.0.11">
 <!ENTITY libgcrypt-version            "1.5.0">

Modified: trunk/BOOK/general/genlib/libdrm.xml
==============================================================================
--- trunk/BOOK/general/genlib/libdrm.xml	Fri Mar  1 02:38:56 2013	(r11030)
+++ trunk/BOOK/general/genlib/libdrm.xml	Fri Mar  1 03:01:49 2013	(r11031)
@@ -6,8 +6,8 @@
 
   <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "04f40d6a647e5149fe442cf536ae0a37">
-  <!ENTITY libdrm-size          "480 KB">
+  <!ENTITY libdrm-md5sum        "a6e2e26951bcc920b2049b65e86a659f">
+  <!ENTITY libdrm-size          "492 KB">
   <!ENTITY libdrm-buildsize     "11 MB">
   <!ENTITY libdrm-time          "0.1 SBU">
 ]>
@@ -80,6 +80,9 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/> and
+      <xref linkend="libxslt"/> (to build manual pages) and
       <ulink url="http://www.valgrind.org/">Valgrind</ulink>
     </para>
 
@@ -97,7 +100,6 @@
     </para>
 
 <screen><userinput>sed -e "/pthread-stubs/d" -i configure.ac &&
-sed -e "/man\/Makefile/d" -i configure.ac &&
 autoreconf -fi &&
 ./configure --prefix=/usr --enable-udev &&
 make</userinput></screen>
@@ -124,13 +126,6 @@
     </para>
 
     <para>
-      <command>sed -e "/man\/Makefile/d" -i configure.ac</command>:
-      This sed prevents <command>configure</command> from failing
-      since <filename>man/Makefile.in</filename> is missing in the
-      source tarball.
-    </para>
-
-    <para>
       <option>--enable-omap-experimental-api</option>: This option
       enables use of OMAP's experimental kernel API. OMAP is a series
       of system-on-chips (SoCs) developed by Texas Instruments.

Modified: trunk/BOOK/x/installing/installing.xml
==============================================================================
--- trunk/BOOK/x/installing/installing.xml	Fri Mar  1 02:38:56 2013	(r11030)
+++ trunk/BOOK/x/installing/installing.xml	Fri Mar  1 03:01:49 2013	(r11031)
@@ -56,7 +56,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="makedepend.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXau.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXdmcp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpthread-stubs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-proto.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxcb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7lib.xml"/>

Modified: trunk/BOOK/x/installing/libxcb.xml
==============================================================================
--- trunk/BOOK/x/installing/libxcb.xml	Fri Mar  1 02:38:56 2013	(r11030)
+++ trunk/BOOK/x/installing/libxcb.xml	Fri Mar  1 03:01:49 2013	(r11031)
@@ -64,7 +64,6 @@
     <para role="required">
       <xref linkend="libXau"/>,
       <xref linkend="libXdmcp"/>,
-      <xref linkend="libpthread-stubs"/>,
       <xref linkend="libxslt"/>, and
       <xref linkend="xcb-proto"/>
     </para>
@@ -86,7 +85,9 @@
     <para>Install <application>libxcb</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure $XORG_CONFIG --enable-xinput --docdir='${datadir}'/doc/libxcb-&libxcb-version; &&
+<screen><userinput>sed -e "s/pthread-stubs//" -i configure.ac &&
+autoreconf -fi &&
+./configure $XORG_CONFIG --enable-xinput --docdir='${datadir}'/doc/libxcb-&libxcb-version; &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -100,13 +101,13 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><command>sed -e "s/pthread-stubs//" -i configure.ac</command>: This
+    sed removes dependency on libpthread-stubs package which is useless on
+    Linux.</para>
+
     <para><option>--enable-xinput</option>: This switch enables XCB Xinput
     extension.</para>
 
-    <para><parameter>--docdir='${datadir}'/doc/libxcb-&libxcb-version;</parameter>:
-    This parameter ensures the <application>libxcb</application> documentation
-    is installed to a versioned directory.</para>
-
     <para><parameter>--without-doxygen</parameter>: This switch can be used
     to disable the API documentation if <xref linkend="doxygen"/> is
     installed.</para>



More information about the blfs-book mailing list