From 827336dc34cab0799c4dbf3c63b6c2f5e6e144b8 Mon Sep 17 00:00:00 2001 From: Andrew Benton Date: Wed, 23 Nov 2011 23:25:44 +0000 Subject: [PATCH] Updated cairo to 1.10.2 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9006 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 2 +- introduction/welcome/changelog.xml | 9 ++ x/lib/cairo.xml | 148 +++++++++++++++++++---------- 3 files changed, 106 insertions(+), 53 deletions(-) diff --git a/general.ent b/general.ent index b3230e2da5..f12d8a2097 100644 --- a/general.ent +++ b/general.ent @@ -549,7 +549,7 @@ $Date$ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index af7244e024..2ee01b0a97 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,15 @@ --> + + November 23rd, 2011 + + + [abenton] - Updated cairo to 1.10.2. + + + + November 22nd, 2011 diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml index 2ab1e244bf..4ad78c3466 100644 --- a/x/lib/cairo.xml +++ b/x/lib/cairo.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -29,21 +29,22 @@ Introduction to cairo - cairo is a 2D graphics library with + Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System, win32, image buffers, PostScript, PDF and SVG. Experimental backends include OpenGL - (through glitz), Quartz and XCB file output. cairo is designed to produce - consistent output on all output media while taking advantage of display - hardware acceleration when available (e.g., through the X Render - Extension). The cairo API provides operations - similar to the drawing operators of PostScript and PDF. Operations in - cairo include stroking and filling cubic - Bézier splines, transforming and compositing translucent images, and + Quartz and XCB file output. cairo is designed to produce consistent output + on all output media while taking advantage of display hardware acceleration + when available (e.g., through the X Render Extension). The + Cairo API provides operations similar to the + drawing operators of PostScript and PDF. Operations in + Cairo include stroking and filling cubic + Bézier splines, transforming and compositing translucent images, and antialiased text rendering. All drawing operations can be transformed by - any affine transformation (scale, rotation, shear, etc.). + any affine + transformation (scale, rotation, shear, etc.). - &lfs65_checked; + &lfs70_checked; Package Information @@ -70,34 +71,32 @@ cairo Dependencies Required - , - , and - - + , , + , and Recommended - + (gtk requires + cairo to be built after libX11 is installed) Optional - glitz, + , DirectFB, - , - , - libspectre, and + Skia and Valgrind Optional (to provide extended test suite coverage) - (for testing the PDF backend), - (for testing the PDF backend), and - (for testing the SVG backend) - + (to test the postscript + backend), (for testing the PDF backend), + (for testing the PDF backend), + libspectre (to test + the PDF backend) and (for testing the SVG + backend) Note that the GTK, Poppler and librsvg packages are circular in that - using them for test suite coverage requires installing cairo first, - then installing the desired package(s), then installing cairo again. + using them for test suite coverage requires installing cairo first, then + installing the desired package(s), then installing cairo again. As the test + suite seems to be somewhat broken it doesn't seem worth the effort. User Notes: @@ -107,26 +106,19 @@ Installation of cairo - Install cairo by running the following + Install Cairo by running the following commands: -./configure --prefix=/usr && +./configure --prefix=/usr --enable-tee --enable-gl && make - + To test the results, issue: make -k check. - To test the results, issue: make check. Note that - as many as 29 of the tests are known to fail for unknown reasons. - If you do not have a gs binary in your path, many - - of the 205 tests will fail. Also, to enhance test - coverage, the tests should be run with an available X Window screen (e.g. - from a local xterm or equivalent window). + Note that the tests take a long time to run and many of them fail for + unknown reasons. - Now, as the root user: + Now, as the root + user: make install @@ -138,11 +130,27 @@ make - : Enable the xcb back end. - + : This is used by + Firefox. If you don't enable the Cairo's tee + surface back end you won't be able to build + Firefox with + . - : Prevent static libraries - being built and installed. + : Enable the + Cairo OpenGL back end. Remove this option if + you've not installed . + + : Enable + Cairo's back end. + + : Prevent static libraries being + built and installed. + + : Enable the + Cairo + OpenVG back + end (requires installed, configured with + --enable-gallium-egl and --enable-openvg). @@ -155,9 +163,11 @@ make Installed Directories - None - libcairo.{so,a} - /usr/include/cairo and /usr/share/gtk-doc/html/cairo + cairo-trace + libcairo.{so,a}, libcairo-gobject.{so,a} and + libcairo-script-interpreter.{so,a} + /usr/include/cairo, usr/lib/cairo and + /usr/share/gtk-doc/html/cairo @@ -166,6 +176,17 @@ make + + cairo-trace + + generates a log of all calls made by an application to + Cairo. + + cairo-trace + + + + libcairo.{so,a} @@ -177,6 +198,29 @@ make + + libcairo-gobject.{so,a} + + contains functions that integrate + Cairo with 's + GObject type system. + + libcairo-gobject.{so,a} + + + + + + libcairo-script-interpreter.{so,a} + + contains the script interpreter functions for executing and + manipulating Cairo execution traces. + + libcairo-script-interpreter.{so,a} + + + +