[Commit] Xr cairo.pc.in, NONE, 1.1 .cvsignore, 1.4, 1.5 BUGS, 1.2, 1.3 ChangeLog, 1.30, 1.31 Makefile.am, 1.2, 1.3 README, 1.3, 1.4 configure.in, 1.5, 1.6 xr.pc.in, 1.1, NONE

Carl Worth commit at keithp.com
Fri Jul 18 12:34:21 PDT 2003


Committed by: cworth

Update of /local/src/CVS/Xr
In directory home.keithp.com:/tmp/cvs-serv11854

Modified Files:
	.cvsignore BUGS ChangeLog Makefile.am README configure.in 
Added Files:
	cairo.pc.in 
Removed Files:
	xr.pc.in 
Log Message:
Renamed everything from Xr* to cairo_*

--- NEW FILE: cairo.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: cairo
Description: Multi-platform 2D graphics library
Version: @VERSION@

Requires: xc xft
Libs: -L${libdir} -lcairo -lm
Cflags: -I${includedir}


Index: .cvsignore
===================================================================
RCS file: /local/src/CVS/Xr/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	8 May 2003 21:21:48 -0000	1.4
+++ .cvsignore	18 Jul 2003 18:34:19 -0000	1.5
@@ -2,6 +2,7 @@
 Makefile.in
 aclocal.m4
 autom4te.cache
+cairo.pc
 config.cache
 config.guess
 config.h
@@ -15,4 +16,4 @@
 stamp-h
 stamp-h1
 stamp-h.in
-xr.pc
+

Index: BUGS
===================================================================
RCS file: /local/src/CVS/Xr/BUGS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUGS	25 Apr 2003 20:34:00 -0000	1.2
+++ BUGS	18 Jul 2003 18:34:19 -0000	1.3
@@ -1,2 +1,3 @@
-SEGV if XrSetRGBColor is called before XrSetTargetDrawable
-SEGV if XrFill is called before XrSetRGBColor
+SEGV if cairo_set_rgb_color is called before cairo_set_target_drawable
+SEGV if cairo_fill is called before cairo_set_rgb_color
+

Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/Xr/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	3 Jul 2003 15:22:44 -0000	1.30
+++ ChangeLog	18 Jul 2003 18:34:19 -0000	1.31
@@ -1,3 +1,10 @@
+2003-07-18  Carl Worth  <cworth at isi.edu>
+
+	* src/cairo.h: Renamed everything from Xr* to cairo_*.
+
+	* util/xr2cairo: Added utility script xr2cairo to help users fix
+	their source code.
+
 2003-07-03  Carl Worth  <cworth at isi.edu>
 
 	* src/xrmatrix.c (XrMatrixGetAffine): Added XrMatrixGetAffine

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/Xr/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	8 May 2003 21:21:48 -0000	1.2
+++ Makefile.am	18 Jul 2003 18:34:19 -0000	1.3
@@ -2,7 +2,7 @@
 
 EXTRA_DIST = \
 	COPYING \
-	xr.pc.in
+	cairo.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xr.pc
+pkgconfig_DATA = cairo.pc

Index: README
===================================================================
RCS file: /local/src/CVS/Xr/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README	15 May 2003 01:30:57 -0000	1.3
+++ README	18 Jul 2003 18:34:19 -0000	1.4
@@ -1,4 +1,4 @@
-Xr - Rendering library
+Cairo - Multi-platform 2D graphics library
 
 Compiling
 ---------
@@ -6,27 +6,27 @@
 
 Description
 -----------
-Xr provides anti-aliased vector-based rendering for X. Paths consist
+Cairo provides anti-aliased vector-based rendering for X. Paths consist
 of line segments and cubic splines and can be rendered at any width
 with various join and cap styles. All colors may be specified with
 optional translucence (opacity/alpha) and combined using the extended
 Porter/Duff compositing algebra as found in the X Render Extension.
 
-Xr exports a stateful rendering API similar in spirit to the path
+Cairo exports a stateful rendering API similar in spirit to the path
 construction, text, and painting operators of PostScript, (with the
 significant addition of translucence in the imaging model). When
 complete, the API is intended to support the complete imaging model of
 PDF 1.4.
 
-Xr relies on the Xc library for backend rendering. Xc provides an
+Cairo relies on the Xc library for backend rendering. Xc provides an
 abstract interface for rendering to multiple target types. As of this
-writing, Xc allows Xr to target X drawables as well as generic image
+writing, Xc allows Cairo to target X drawables as well as generic image
 buffers. Future backends such as PostScript, PDF, and perhaps OpenGL
 are currently being planned.
 
 Dependencies
 ------------
-Xr currently requires the following supporting libraries:
+Cairo currently requires the following supporting libraries:
 
 	Xc
 	Xft
@@ -36,28 +36,28 @@
 
 Documentation
 -------------
-There's not much documentation yet apart from the Xr.h header
+There's not much documentation yet apart from the cairo.h header
 file. We'll be correcting that shortly.
 
 In the meantime, the xrtest module in CVS provides a few example
-programs using Xr. These may be helpful to a programmer just beginning
-with Xr. Also, familiarity with the PostScript imaging model will
-help in understanding Xr.
+programs using Cairo. These may be helpful to a programmer just beginning
+with Cairo. Also, familiarity with the PostScript imaging model will
+help in understanding Cairo.
 
 History
 -------
-Xr was developed by Carl Worth <cworth at isi.edu> and Keith Packard
+Cairo was developed by Carl Worth <cworth at isi.edu> and Keith Packard
 <keithp at keithp.com>. Many thanks are due to Lyle Ramshaw without whose
 patient help our ignorance would be much more apparent.
 
 Mailing List
 ------------
-If you have trouble with Xr or you have some ideas for how it could be
-improved, please feel free to send a message to xr at xwin.org.
+If you have trouble with Cairo or you have some ideas for how it could be
+improved, please feel free to send a message to cairo at cairographics.org
 
-Xr is still under active development and all discussion happens on
+Cairo is still under active development and all discussion happens on
 that list. So if you want to lurk or, (even better), take part in the
 development, take a look. Subscription information and archives are
 available:
 
-	http://xwin.org/cgi-bin/mailman/listinfo/xr
+	http://cairographics.org/cgi-bin/mailman/listinfo/cairo

Index: configure.in
===================================================================
RCS file: /local/src/CVS/Xr/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.in	8 May 2003 21:21:48 -0000	1.5
+++ configure.in	18 Jul 2003 18:34:19 -0000	1.6
@@ -1,9 +1,9 @@
-AC_INIT(src/Xr.h)
+AC_INIT(src/cairo.h)
 
 dnl ===========================================================================
 
 # Package version number, (as distinct from shared library version)
-XR_VERSION=0.1.0
+CAIRO_VERSION=0.1.0
 
 # libtool shared library version
 
@@ -29,7 +29,7 @@
 
 dnl ===========================================================================
 
-AM_INIT_AUTOMAKE(xr, $XR_VERSION)
+AM_INIT_AUTOMAKE(cairo, $CAIRO_VERSION)
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
@@ -45,14 +45,14 @@
 
 dnl ===========================================================================
 
-PKG_CHECK_MODULES(XR, xc >= $XC_REQUIRED xft >= $XFT_REQUIRED)
-AC_SUBST(XR_CFLAGS)
-AC_SUBST(XR_LIBS)
+PKG_CHECK_MODULES(CAIRO, xc >= $XC_REQUIRED xft >= $XFT_REQUIRED)
+AC_SUBST(CAIRO_CFLAGS)
+AC_SUBST(CAIRO_LIBS)
 
 dnl ===========================================================================
 
 AC_OUTPUT([
-xr.pc
+cairo.pc
 Makefile
 src/Makefile
 ])

--- xr.pc.in DELETED ---




More information about the Commit mailing list