[cairo-commit] cairo BUGS, 1.15, 1.16 ChangeLog, 1.241, 1.242 Makefile.am, 1.4, 1.5 cairo.pc.in, 1.15, 1.16 configure.in, 1.61, 1.62

Carl Worth commit at pdx.freedesktop.org
Tue Oct 26 14:38:49 PDT 2004 

Committed by: cworth

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

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

        * test/.cvsignore:
        * test/Makefile.am:
        * test/README:
        * test/cairo_test.c:
        * test/cairo_test.h:
        * test/line_width-ref.png:
        * test/line_width.c:
        * test/move_to_show_surface-ref.png:
        * test/move_to_show_surface.c:
        * test/read_png.c:
        * test/read_png.h:
        * test/write_png.c:
        * test/write_png.h:
        * test/xmalloc.c:
        * test/xmalloc.h: Add initial regression test suite.

        * configure.in: Don't AC_SUBST a dozen different FOO_CFLAGS and
        FOO_LIBS. Instead, incrementally build up just CAIRO_CFLAGS and
        CAIRO_LIBS.

        * cairo.pc.in (Libs): Don't list flags that should get picked up
        via dependency information through Requires.

        * BUGS (font-size): Add description of move_to_show_surface.


Index: BUGS
===================================================================
RCS file: /cvs/cairo/cairo/BUGS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- BUGS	2 Aug 2004 18:51:57 -0000	1.15
+++ BUGS	26 Oct 2004 21:38:43 -0000	1.16
@@ -81,3 +81,14 @@
 --
 
 font-size="0" in an SVG file does very bad things.
+
+--
+
+move_to_show_surface (see cairo/test):
+
+ * 2004-10-25  Carl Worth  <cworth at cworth.org>
+ *
+ *   It looks like cairo_show_surface has no effect if it follows a
+ *   call to cairo_move_to to any coordinate other than 0,0. A little
+ *   bit of poking around suggests this isn't a regression, (at least
+ *   not since the last pixman snapshot).

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- ChangeLog	22 Oct 2004 01:40:50 -0000	1.241
+++ ChangeLog	26 Oct 2004 21:38:43 -0000	1.242
@@ -1,3 +1,30 @@
+2004-10-26  Carl Worth  <cworth at cworth.org>
+
+	* test/.cvsignore:
+	* test/Makefile.am:
+	* test/README:
+	* test/cairo_test.c:
+	* test/cairo_test.h:
+	* test/line_width-ref.png:
+	* test/line_width.c:
+	* test/move_to_show_surface-ref.png:
+	* test/move_to_show_surface.c:
+	* test/read_png.c:
+	* test/read_png.h:
+	* test/write_png.c:
+	* test/write_png.h:
+	* test/xmalloc.c:
+	* test/xmalloc.h: Add initial regression test suite.
+
+	* configure.in: Don't AC_SUBST a dozen different FOO_CFLAGS and
+	FOO_LIBS. Instead, incrementally build up just CAIRO_CFLAGS and
+	CAIRO_LIBS.
+
+	* cairo.pc.in (Libs): Don't list flags that should get picked up
+	via dependency information through Requires.
+
+	* BUGS (font-size): Add description of move_to_show_surface.
+
 2004-10-21  Carl Worth  <cworth at cworth.org>
 
 	* src/cairo_png_surface.c:

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	21 Oct 2004 15:51:52 -0000	1.4
+++ Makefile.am	26 Oct 2004 21:38:43 -0000	1.5
@@ -1,4 +1,4 @@
-SUBDIRS = src
+SUBDIRS = src test
 
 EXTRA_DIST = \
 	COPYING \

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cairo.pc.in	11 Sep 2004 11:23:17 -0000	1.15
+++ cairo.pc.in	26 Oct 2004 21:38:43 -0000	1.16
@@ -8,6 +8,6 @@
 Version: @VERSION@
 
 Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
-Libs: -L${libdir} -lcairo -lm @XRENDER_LIBS@ @PS_LIBS@ @FREETYPE_LIBS@
+Libs: -L${libdir} -lcairo -lm
 Cflags: -I${includedir} @FREETYPE_CFLAGS@
 

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- configure.in	4 Oct 2004 11:55:46 -0000	1.61
+++ configure.in	26 Oct 2004 21:38:43 -0000	1.62
@@ -60,9 +60,10 @@
   AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, true)
 fi
 
+CAIRO_CFLAGS="$CAIRO_CFLAGS $XRENDER_CFLAGS"
+CAIRO_LIBS="$CAIRO_LIBS $XRENDER_LIBS"
+
 AC_SUBST(XLIB_SURFACE_FEATURE)
-AC_SUBST(XRENDER_CFLAGS)
-AC_SUBST(XRENDER_LIBS)
 AC_SUBST(XRENDER_REQUIRES)
 
 dnl ===========================================================================
@@ -84,9 +85,10 @@
   AM_CONDITIONAL(CAIRO_HAS_XCB_SURFACE, true)
 fi
 
+CAIRO_CFLAGS="$CAIRO_CFLAGS $XCB_CFLAGS"
+CAIRO_LIBS="$CAIRO_LIBS $XCB_LIBS"
+
 AC_SUBST(XCB_SURFACE_FEATURE)
-AC_SUBST(XCB_CFLAGS)
-AC_SUBST(XCB_LIBS)
 
 dnl ===========================================================================
 
@@ -103,6 +105,8 @@
   AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, true)
 fi
 
+CAIRO_LIBS="$CAIRO_LIBS $PS_LIBS"
+
 AC_SUBST(PS_SURFACE_FEATURE)
 AC_SUBST(PS_LIBS)
 
@@ -129,9 +133,10 @@
   AM_CONDITIONAL(CAIRO_HAS_PNG_SURFACE, true)
 fi
 
+CAIRO_CFLAGS="$CAIRO_CFLAGS $PNG_CFLAGS"
+CAIRO_LIBS="$CAIRO_LIBS $PNG_LIBS"
+
 AC_SUBST(PNG_SURFACE_FEATURE)
-AC_SUBST(PNG_CFLAGS)
-AC_SUBST(PNG_LIBS)
 AC_SUBST(PNG_REQUIRES)
 
 dnl ===========================================================================
@@ -154,8 +159,9 @@
   AM_CONDITIONAL(CAIRO_HAS_GLITZ_SURFACE, true)
 fi
 
-AC_SUBST(GLITZ_LIBS)
-AC_SUBST(GLITZ_CFLAGS)
+CAIRO_CFLAGS="$CAIRO_CFLAGS $GLITZ_CFLAGS"
+CAIRO_LIBS="$CAIRO_LIBS $GLITZ_LIBS"
+
 AC_SUBST(GLITZ_SURFACE_FEATURE)
 AC_SUBST(GLITZ_REQUIRES)
 
@@ -176,7 +182,12 @@
 dnl ===========================================================================
 
 PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
-PKG_CHECK_MODULES(CAIRO, libpixman >= 0.1.1)
+CAIRO_CFLAGS="$CAIRO_CFLAGS $FONTCONFIG_CFLAGS"
+CAIRO_LIBS="$CAIRO_LIBS $FONTCONFIG_LIBS"
+
+PKG_CHECK_MODULES(PIXMAN, libpixman >= 0.1.1)
+CAIRO_CFLAGS="$CAIRO_CFLAGS $PIXMAN_CFLAGS"
+CAIRO_LIBS="$CAIRO_LIBS $PIXMAN_LIBS"
 
 # Test for freetype2 separate from pkg-config since at least up to
 # 2003-06-07, there was no freetype2.pc in the release.
@@ -218,13 +229,9 @@
 AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
 
-
 CAIRO_CFLAGS="$CAIRO_CFLAGS $FREETYPE_CFLAGS"
 CAIRO_LIBS="$CAIRO_LIBS $FREETYPE_LIBS"
 
-AC_SUBST(CAIRO_CFLAGS)
-AC_SUBST(CAIRO_LIBS)
-
 dnl ===========================================================================
 
 dnl Checks for precise integer types
@@ -239,7 +246,12 @@
 	-Wmissing-prototypes -Wmissing-declarations \
 	-Wnested-externs -fno-strict-aliasing"
 fi
-AC_SUBST(WARN_CFLAGS)
+
+CAIRO_CFLAGS="$CAIRO_CFLAGS $WARN_CFLAGS"
+CAIRO_LIBS = "$CAIRO_LIBS -lm"
+
+AC_SUBST(CAIRO_CFLAGS)
+AC_SUBST(CAIRO_LIBS)
 
 dnl ===========================================================================
 
@@ -248,6 +260,7 @@
 Makefile
 src/Makefile
 src/cairo-features.h
+test/Makefile
 ])
 
 dnl ===========================================================================

More information about the cairo-commit mailing list