Author: krejzi
Date: 2012-03-25 06:00:05 -0600 (Sun, 25 Mar 2012)
New Revision: 9754
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/lib/cairo.xml
Log:
cairo 1.12
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-03-25 11:14:09 UTC (rev 9753)
+++ trunk/BOOK/general.ent 2012-03-25 12:00:05 UTC (rev 9754)
@@ -600,7 +600,7 @@
<!-- Chapter 24 -->
<!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">
<!ENTITY pangomm-version "2.28.4">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-03-25 11:14:09 UTC
(rev 9753)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-03-25 12:00:05 UTC
(rev 9754)
@@ -47,6 +47,9 @@
<listitem>
<para>[krejzi] - pixman 0.24.4.</para>
</listitem>
+ <listitem>
+ <para>[krejzi] - cairo 1.12.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/x/lib/cairo.xml
===================================================================
--- trunk/BOOK/x/lib/cairo.xml 2012-03-25 11:14:09 UTC (rev 9753)
+++ trunk/BOOK/x/lib/cairo.xml 2012-03-25 12:00:05 UTC (rev 9754)
@@ -5,11 +5,11 @@
%general-entities;
<!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)">
]>
<sect1 id="cairo" xreflabel="cairo-&cairo-version;">
@@ -70,18 +70,21 @@
<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>
+ <para role="required"><xref linkend="fontconfig"/>, <xref
linkend="libpng"/>,
+ <xref linkend="pixman"/>, <xref linkend="pkgconfig"/> and
+ <xref linkend="xorg7-lib"/></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>
-
+ <!-- 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>
@@ -113,9 +116,7 @@
commands:</para>
<screen><userinput>./configure --prefix=/usr \
- --enable-tee \
- --enable-gl \
- --enable-xcb &&
+ --enable-tee --enable-xcb &&
make</userinput></screen>
<para>To test the results, issue: <command>make -k check</command>.</para>
@@ -138,27 +139,29 @@
<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>--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
+ <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>
+
</sect2>
<sect2 role="content">
@@ -170,10 +173,10 @@
<segtitle>Installed Directories</segtitle>
<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>
</segmentedlist>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
