[cairo-commit] cairo ChangeLog, 1.865, 1.866 Makefile.am, 1.14, 1.15 cairo.pc.in, 1.20, 1.21 configure.in, 1.121, 1.122

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv5810

Modified Files:
	ChangeLog Makefile.am cairo.pc.in configure.in 
Log Message:

2005-08-10  Carl Worth  <cworth at cworth.org>

        From Keith Packard <keithp at keithp.com>,

        Build pixman internally as a private part of cairo, with suitable
        name changes to avoid any visible pixman symbols in the cairo
        library:

        * Makefile.am: Descend into pixman.

        * cairo.pc.in: Drop libpixman from Requires.

        * configure.in: Don't check for libpixman. Check version of
        pkg-config and use Requires.private instead of Requires in
        cairo.pc if possible. Generate pixman Makefiles.

        * pixman/Makefile.am: Rip out release-publish target and
        installation of libpixman.pc.

        * pixman/src/Makefile.am: Add pixman-remap.h. Drop libpixman.la
        target.

        * pixman/src/icint.h: Fix to include config.h rather than
        ../config.h

        * pixman/src/pixman-remap.h: This is the cpp magic to rename all
        pixman functions from the various fb, Fb, INT_pixman, pixman,
        Render, _Render, or no prefix to _cairo_pixman_ prefixes.

        * pixman/src/pixman.h: Include pixman-remap.h to get all the
        cairo-internalized names.

        * src/Makefile.am:
        * test/Makefile.am: Add -Ipixman/src to get at
        pixman-remap.h.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.865
retrieving revision 1.866
diff -u -d -r1.865 -r1.866
--- ChangeLog	10 Aug 2005 18:40:11 -0000	1.865
+++ ChangeLog	10 Aug 2005 19:36:51 -0000	1.866
@@ -1,3 +1,39 @@
+2005-08-10  Carl Worth  <cworth at cworth.org>
+
+	From Keith Packard <keithp at keithp.com>,
+	
+	Build pixman internally as a private part of cairo, with suitable
+	name changes to avoid any visible pixman symbols in the cairo
+	library:
+
+	* Makefile.am: Descend into pixman.
+	
+	* cairo.pc.in: Drop libpixman from Requires.
+	
+	* configure.in: Don't check for libpixman. Check version of
+	pkg-config and use Requires.private instead of Requires in
+	cairo.pc if possible. Generate pixman Makefiles.
+	
+	* pixman/Makefile.am: Rip out release-publish target and
+	installation of libpixman.pc.
+	
+	* pixman/src/Makefile.am: Add pixman-remap.h. Drop libpixman.la
+	target.
+	
+	* pixman/src/icint.h: Fix to include "config.h" rather than
+	"../config.h"
+	
+	* pixman/src/pixman-remap.h: This is the cpp magic to rename all
+	pixman functions from the various fb, Fb, INT_pixman, pixman,
+	Render, _Render, or no prefix to _cairo_pixman_ prefixes.
+
+	* pixman/src/pixman.h: Include pixman-remap.h to get all the
+	cairo-internalized names.
+	
+	* src/Makefile.am:
+	* test/Makefile.am: Add -I$(top_srcdir)pixman/src to get at
+	pixman-remap.h.
+
 2005-08-10  Vladimir Vukicevic  <vladimir at pobox.com>
 
 	* src/cairo-glitz-surface.c: Additional fix for 0-width/0-height

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	10 Aug 2005 18:30:45 -0000	1.14
+++ Makefile.am	10 Aug 2005 19:36:51 -0000	1.15
@@ -1,5 +1,5 @@
-DIST_SUBDIRS = src test doc
-SUBDIRS = src doc
+DIST_SUBDIRS = pixman src test doc
+SUBDIRS = pixman src doc
 
 # libpng is required for our test programs
 if CAIRO_HAS_PNG_FUNCTIONS

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cairo.pc.in	24 Feb 2005 16:20:14 -0000	1.20
+++ cairo.pc.in	10 Aug 2005 19:36:51 -0000	1.21
@@ -7,6 +7,6 @@
 Description: Multi-platform 2D graphics library
 Version: @VERSION@
 
-Requires: @FREETYPE_REQUIRES@ libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
+ at PKGCONFIG_REQUIRES@: @FREETYPE_REQUIRES@ @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
 Libs: @FREETYPE_LIBS@ -L${libdir} -lcairo 
 Cflags: @FREETYPE_CFLAGS@ -I${includedir}/cairo

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- configure.in	10 Aug 2005 18:08:38 -0000	1.121
+++ configure.in	10 Aug 2005 19:36:51 -0000	1.122
@@ -247,12 +247,6 @@
 
 dnl ===========================================================================
 
-PKG_CHECK_MODULES(PIXMAN, libpixman >= 0.1.5)
-CAIRO_CFLAGS="$CAIRO_CFLAGS $PIXMAN_CFLAGS"
-CAIRO_LIBS="$CAIRO_LIBS $PIXMAN_LIBS"
-
-dnl ===========================================================================
-
 AC_ARG_ENABLE(freetype,
   [  --disable-freetype      Disable cairo's freetype font backend],
   [use_freetype=$enableval], [use_freetype=yes])
@@ -438,9 +432,21 @@
 
 GTK_DOC_CHECK([1.3])
 
+dnl ===========================================================================
+dnl Check for recent pkg-config which supports Requires.private
+
+case `$PKG_CONFIG --version` in
+0.?|0.1[0-7]) PKGCONFIG_REQUIRES="Requires"; ;;
+*) PKGCONFIG_REQUIRES="Requires.private"; ;;
+esac
+
+AC_SUBST(PKGCONFIG_REQUIRES)
+
 AC_OUTPUT([
 cairo.pc
 Makefile
+pixman/Makefile
+pixman/src/Makefile
 src/Makefile
 src/cairo-features.h
 test/Makefile