Changeset 97ccf511

Timestamp:

03/25/2012 12:00:05 PM (12 years ago)

Author:

Krejzi <krejzi@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

be470ae

Parents:

d1291ad4

Message:

cairo 1.12

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9754 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/cairo.xml (modified) (5 diffs)

general.ent

@@ -601 +601 @@
 <!ENTITY qt-version                   "3.3.8d">
 <!ENTITY qt4-version                  "4.8.0">
-<!ENTITY cairo-version                "1.10.2">
+<!ENTITY cairo-version                "1.12">
 <!ENTITY cairomm-version              "1.9.2">
 <!ENTITY pango-version                "1.29.4">

introduction/welcome/changelog.xml

@@ -48 +48 @@
           <para>[krejzi] - pixman 0.24.4.</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - cairo 1.12.</para>
+        </listitem>
       </itemizedlist>
     </listitem>

x/lib/cairo.xml

@@ -6 +6 @@
 
   <!ENTITY cairo-download-http "http://cairographics.org/releases/cairo-&cairo-version;.tar.gz">
-  <!ENTITY cairo-download-ftp  "&gentoo-ftp-repo;/cairo-&cairo-version;.tar.gz">
-  <!ENTITY cairo-md5sum        "f101a9e88b783337b20b2e26dfd26d5f">
-  <!ENTITY cairo-size          "22.5 MB">
-  <!ENTITY cairo-buildsize     "145 MB (up to an additional 454 MB to run the test suite)">
-  <!ENTITY cairo-time          "0.7 SBU (up to an additional 2 SBU to run the test suite)">
+  <!ENTITY cairo-download-ftp  " ">
+  <!ENTITY cairo-md5sum        "e6c85575ba7094f88b637bdfd835a751">
+  <!ENTITY cairo-size          "61 MB">
+  <!ENTITY cairo-buildsize     "170 MB (up to an additional 454 MB to run the test suite)">
+  <!ENTITY cairo-time          "0.8 SBU (up to an additional 2 SBU to run the test suite)">
 ]>
 
@@ -71 +71 @@
     <bridgehead renderas="sect3">cairo Dependencies</bridgehead>
 
+    <!-- Cairo is here only because GTK+ and friends, so I'll make Xorg Libraries
+    a dependency here -->
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="pkgconfig"/>, <xref linkend="libpng"/>,
-    <xref linkend="pixman"/>, and <xref linkend="fontconfig"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="xorg7-lib"/> (gtk requires
-    cairo to be built with the libX11 backend) and <xref linkend="mesalib"/>
-    (required for the gl backend)</para>
-
+    <para role="required"><xref linkend="fontconfig"/>, <xref linkend="libpng"/>,
+    <xref linkend="pixman"/>, <xref linkend="pkgconfig"/> and 
+    <xref linkend="xorg7-lib"/></para>
+
+    <!-- I've never seen any package that needs Cairo GL backend -->
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/>, 
+    <para role="optional"><xref linkend="cogl"/>,
     <ulink url="http://www.directfb.org/">DirectFB</ulink>,
+    <xref linkend="libdrm"/>,
+    <xref linkend="gtk-doc"/>,
+    <xref linkend="mesalib"/>,
+    <xref linkend="qt4"/>,
     <ulink url="http://code.google.com/p/skia/">Skia</ulink> and
     <ulink url="http://www.valgrind.org">Valgrind</ulink></para>
@@ -114 +117 @@
 
 <screen><userinput>./configure --prefix=/usr \
-            --enable-tee \
-            --enable-gl \
-            --enable-xcb &amp;&amp;
+            --enable-tee --enable-xcb &amp;&amp;
 make</userinput></screen>
 
@@ -139 +140 @@
     <para><option>--enable-tee</option>: This is used by
     <application>Firefox</application>. If you don't enable the Cairo's tee
-    surface back end you won't be able to build
+    surface backend you won't be able to build
     <application>Firefox</application> with
     <option>--enable-system-cairo</option>.</para>
 
-    <para><option>--enable-gl</option>: Enable the
-    <application>Cairo</application> OpenGL back end. Remove this option if
-    you've not installed <xref linkend="mesalib"/>.</para>
+    <para><option>--enable-drm</option>: Enable 
+    <application>Cairo</application>'s libdrm backend.</para>
+
+    <para><option>--enable-gl</option>: Enable
+    <application>Cairo</application>'s OpenGL backend.</para>
 
     <para><option>--enable-xcb</option>: Enable
-    <application>Cairo</application>'s <xref linkend="libxcb"/> back end.
-    Remove this option if you have not yet installed libxcb.</para>
+    <application>Cairo</application>'s libxcb backend.
+    </para>
+
+    <para><option>--enable-vg</option>: Enable the
+    <application>Cairo</application> 
+    <ulink url="http://en.wikipedia.org/wiki/OpenVG">OpenVG</ulink> backend 
+    (requires <xref linkend="mesalib"/> installed, configured with
+    --enable-gallium-egl and --enable-openvg).</para>
 
     <para><option>--disable-static</option>: Prevent static libraries being
     built and installed.</para>
-
-    <para><option>--enable-vg</option>: Enable the
-    <application>Cairo</application> 
-    <ulink url="http://en.wikipedia.org/wiki/OpenVG">OpenVG</ulink> back
-    end (requires <xref linkend="mesalib"/> installed, configured with
-    --enable-gallium-egl and --enable-openvg).</para>
 
   </sect2>
@@ -171 +174 @@
 
       <seglistitem>
-        <seg>cairo-trace</seg>
+        <seg>cairo-sphinx and cairo-trace</seg>
         <seg>libcairo.{so,a}, libcairo-gobject.{so,a} and
         libcairo-script-interpreter.{so,a}</seg>
-        <seg>/usr/include/cairo, usr/lib/cairo and
+        <seg>/usr/include/cairo, /usr/lib/cairo and
         /usr/share/gtk-doc/html/cairo</seg>
       </seglistitem>