From 6e08fa525f2ea3472f84fb569f406033b121b653 Mon Sep 17 00:00:00 2001 From: Randy McMurchy Date: Thu, 5 Oct 2006 12:51:08 +0000 Subject: [PATCH] Updated to cairo-1.2.4 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6329 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 6 ++--- introduction/welcome/changelog.xml | 9 +++++++ x/lib/cairo.xml | 43 +++++++++++++++--------------- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/general.ent b/general.ent index 49917e19ab..d4069dc4c7 100644 --- a/general.ent +++ b/general.ent @@ -1,8 +1,8 @@ - + - + @@ -371,7 +371,7 @@ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 89eb40eee3..a6d59aaba6 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,15 @@ --> + + October 5th, 2006 + + + [randy] - Updated to cairo-1.2.4. + + + + October 1st, 2006 diff --git a/x/lib/cairo.xml b/x/lib/cairo.xml index 5fd6c0d5fb..94dc9f95df 100644 --- a/x/lib/cairo.xml +++ b/x/lib/cairo.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -31,9 +31,9 @@ cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets - include the X Window System, win32, and image - buffers. Experimental backends include OpenGL (through glitz), Quartz, - XCB, PostScript and PDF file output. cairo is designed to produce + 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 @@ -74,9 +74,21 @@ Optional glitz, + DirectFB, XCB, and + Optional (to provide extended test suite + coverage) + (for testing the PDF backend), + (for testing the PDF backend), + (for testing the SVG backend), and + LTP + + 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. + User Notes: @@ -89,18 +101,13 @@ X Render pkg-config file. If you use XFree86 as your X Window system, ensure this file exists - (/usr/X11R6/lib/pkgconfig/xrender.pc). Instructions to - create this file have just recently been added to the BLFS book, so you may - need to go back to the XFree86 section to create - it. + (/usr/X11R6/lib/pkgconfig/xrender.pc) before beginning + the installation. Install cairo by running the following commands: -sed -i -e 's/type == GLITZ/color.fourcc == GLITZ/' \ - -e 's/FORMAT_TYPE_COLOR/FOURCC_RGB/' \ - src/cairo-glitz-surface.c && -./configure --prefix=/usr && +./configure --prefix=/usr && make To test the results, issue: make check. @@ -114,12 +121,6 @@ make Command Explanations - sed -i -e '...' -e '...' src/cairo-glitz-surface.c: - This command (copied from upstream CVS) fixes a build problem if you link - glitz into the build by passing - to the configure - script. -