r5755 - in trunk/BOOK: . introduction/welcome x/lib

randy at linuxfromscratch.org randy at linuxfromscratch.org
Mon Mar 27 08:42:25 PST 2006


Author: randy
Date: 2006-03-27 09:42:24 -0700 (Mon, 27 Mar 2006)
New Revision: 5755

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/cairo.xml
Log:
Updated to cairo-1.0.4

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-03-27 13:07:21 UTC (rev 5754)
+++ trunk/BOOK/general.ent	2006-03-27 16:42:24 UTC (rev 5755)
@@ -1,4 +1,4 @@
-<!ENTITY day          "26">                   <!-- Always 2 digits -->
+<!ENTITY day          "27">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -345,7 +345,7 @@
 <!ENTITY mesalib-version              "6.4.2">
 <!ENTITY qt-version                   "3.3.5">
 <!ENTITY GTK-version                  "1.2.10">
-<!ENTITY cairo-version                "1.0.2">
+<!ENTITY cairo-version                "1.0.4">
 <!ENTITY pango-version                "1.10.2">
 <!ENTITY atk-version                  "1.10.3">
 <!ENTITY gtk2-version                 "2.8.11">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-03-27 13:07:21 UTC (rev 5754)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-03-27 16:42:24 UTC (rev 5755)
@@ -42,6 +42,15 @@
 -->
 
     <listitem>
+      <para>March 27th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to cairo-1.0.4.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 26th, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/lib/cairo.xml
===================================================================
--- trunk/BOOK/x/lib/cairo.xml	2006-03-27 13:07:21 UTC (rev 5754)
+++ trunk/BOOK/x/lib/cairo.xml	2006-03-27 16:42:24 UTC (rev 5755)
@@ -5,10 +5,10 @@
   %general-entities;
 
   <!ENTITY cairo-download-http "http://cairographics.org/releases/cairo-&cairo-version;.tar.gz">
-  <!ENTITY cairo-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/cairo-&cairo-version;.tar.gz">
-  <!ENTITY cairo-md5sum        "d0b7111a14f90ec3afa777ec40c44984">
+  <!ENTITY cairo-download-ftp  " ">
+  <!ENTITY cairo-md5sum        "9002b0e69b3f94831a22d3f2a7735ce2">
   <!ENTITY cairo-size          "1.4 MB">
-  <!ENTITY cairo-buildsize     "29.4 MB">
+  <!ENTITY cairo-buildsize     "30.6 MB">
   <!ENTITY cairo-time          "0.4 SBU">
 ]>
 
@@ -79,7 +79,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><ulink
     url="http://www.freedesktop.org/Software/glitz">glitz</ulink>,
-    <ulink url="http://xcb.freedesktop.org/wiki/">XCB</ulink> and
+    <ulink url="http://xcb.freedesktop.org/wiki/">XCB</ulink>, and
     <xref linkend="gtk-doc"/></para>
 
   </sect2>
@@ -99,7 +99,10 @@
     <para>Install <application>cairo</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>sed -i -e 's/type == GLITZ/color.fourcc == GLITZ/' \
+       -e 's/FORMAT_TYPE_COLOR/FOURCC_RGB/' \
+    src/cairo-glitz-surface.c &&
+./configure --prefix=/usr &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -110,6 +113,17 @@
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i -e '...' -e '...' src/cairo-glitz-surface.c</command>:
+    This command (copied from upstream CVS) fixes a build problem if you link
+    <application>glitz</application> into the build by passing
+    <option>--enable-glitz</option> to the <command>configure</command>
+    script.</para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 




More information about the blfs-book mailing list