[cairo-commit] cairo AUTHORS, 1.5, 1.6 ChangeLog, 1.173, 1.174 cairo.pc.in, 1.13, 1.14 configure.in, 1.48, 1.49

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/cairo
In directory pdx:/tmp/cvs-serv26456

Modified Files:
	AUTHORS ChangeLog cairo.pc.in configure.in 
Log Message:
Added OpenGL surface backend

Index: AUTHORS
===================================================================
RCS file: /cvs/cairo/cairo/AUTHORS,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** a/AUTHORS	31 Mar 2004 02:45:00 -0000	1.5
--- b/AUTHORS	9 Apr 2004 21:19:47 -0000	1.6
***************
*** 10,13 ****
--- 10,14 ----
  Keith Packard <keithp at keithp.com> Original concept, polygon tessellation, dashing
  Christof Petig <christof at petig-baender.de> Build fixes related to freetype
+ David Reveman <davidr at freedesktop.org> New pattern API, OpenGL backend
  Jamey Sharp <jamey at minilop.net> Surface/font backend virtualization, XCB backend
  Bill Spitzak <spitzak at d2.com> Build fix to find Xrender.h without xrender.pc

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -d -r1.173 -r1.174
*** a/ChangeLog	9 Apr 2004 21:14:56 -0000	1.173
--- b/ChangeLog	9 Apr 2004 21:19:47 -0000	1.174
***************
*** 1,4 ****
--- 1,16 ----
  2004-04-09  David Reveman  <c99drn at cs.umu.se>
  
+ 	* src/cairo_surface.c (_cairo_surface_create_pattern):
+ 	* src/cairo_pattern.c (_cairo_pattern_get_image): Fixed
+ 	incorrect rounding of pattern image size.
+ 
+ 	* AUTHORS: Added myself to the AUTHORS file.
+ 
+ 	* cairo.pc.in:
+ 	* src/Makefile.am:
+ 	* src/cairo-features.h.in:
+ 	* src/cairo.h:
+ 	* src/cairo_gl_surface.c (added): Added OpenGL surface backend.
+ 
  	* configure.in: Automatically detect available backends.
  

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** a/cairo.pc.in	6 Apr 2004 16:36:12 -0000	1.13
--- b/cairo.pc.in	9 Apr 2004 21:19:47 -0000	1.14
***************
*** 8,12 ****
  Version: @VERSION@
  
! Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@
  Libs: -L${libdir} -lcairo -lm @XRENDER_LIBS@ @PS_LIBS@ @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@
--- 8,12 ----
  Version: @VERSION@
  
! Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GL_REQUIRES@
  Libs: -L${libdir} -lcairo -lm @XRENDER_LIBS@ @PS_LIBS@ @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** a/configure.in	9 Apr 2004 21:14:56 -0000	1.48
--- b/configure.in	9 Apr 2004 21:19:47 -0000	1.49
***************
*** 137,140 ****
--- 137,165 ----
  dnl ===========================================================================
  
+ AC_ARG_ENABLE(gl,
+   [  --disable-gl            Disable cairo's OpenGL backend],
+   [use_gl=$enableval], [use_gl=yes])
+ 
+ if test "x$use_gl" = "xyes"; then
+   PKG_CHECK_MODULES(GL, glitz >= 0.1.0, [
+     GL_REQUIRES=glitz
+     use_gl=yes], [use_gl="no (requires glitz http://freedesktop.org/software/glitz)"])
+ fi
+ 
+ if test "x$use_gl" != "xyes"; then
+   GL_SURFACE_FEATURE=CAIRO_HAS_NO_GL_SURFACE
+   AM_CONDITIONAL(CAIRO_HAS_GL_SURFACE, false)  
+ else
+   GL_SURFACE_FEATURE=CAIRO_HAS_GL_SURFACE
+   AM_CONDITIONAL(CAIRO_HAS_GL_SURFACE, true)
+ fi
+ 
+ AC_SUBST(GL_LIBS)
+ AC_SUBST(GL_CFLAGS)
+ AC_SUBST(GL_SURFACE_FEATURE)
+ AC_SUBST(GL_REQUIRES)
+ 
+ dnl ===========================================================================
+ 
  PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
  PKG_CHECK_MODULES(CAIRO, libpixman >= 0.1.0)
***************
*** 204,207 ****
--- 229,233 ----
  echo "  PostScript: $use_ps"
  echo "  PNG: $use_png"
+ echo "  OpenGL: $use_gl"
  echo ""