[cairo-commit] cairo ChangeLog, 1.1174, 1.1175 INSTALL, 1.4, 1.5 README, 1.21, 1.22 configure.in, 1.157, 1.158

[Christian Biesinger]

Committed by: biesi

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

Modified Files:
	ChangeLog INSTALL README configure.in 
Log Message:
2005-12-19  Christian Biesinger  <cbiesinger at web.de>

  * INSTALL: Mention new --enable-svg option
  * README: Add notes for the new BeOS backend
  * configure.in: Add disabled by default BeOS backend
  * src/Makefile.am: Add BeOS files
  * src/cairo-beos-surface.cpp: New
  * src/cairo-beos.h: New
  * src/cairo-features.h.in: BEOS_SURFACE_FEATURE
  * src/cairoint.h: BeOS mutex functions
  * test/.cvsignore: Ignore files generates by the BeOS tests
  * test/Makefile.am: Add cairo-test-beos.*
  * test/cairo-test-beos.cpp: New. (Must be a C++ file, hence not part of
  cairo-test.c)
  * test/cairo-test-beos.h: New.
  * test/cairo-test.c: (cairo_test_expecting): Test BeOS backend.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.1174
retrieving revision 1.1175
diff -u -d -r1.1174 -r1.1175
--- ChangeLog	19 Dec 2005 00:37:14 -0000	1.1174
+++ ChangeLog	19 Dec 2005 01:20:06 -0000	1.1175
@@ -1,5 +1,22 @@
 2005-12-19  Christian Biesinger  <cbiesinger at web.de>
 
+	* INSTALL: Mention new --enable-svg option
+	* README: Add notes for the new BeOS backend
+	* configure.in: Add disabled by default BeOS backend
+	* src/Makefile.am: Add BeOS files
+	* src/cairo-beos-surface.cpp: New
+	* src/cairo-beos.h: New
+	* src/cairo-features.h.in: BEOS_SURFACE_FEATURE
+	* src/cairoint.h: BeOS mutex functions
+	* test/.cvsignore: Ignore files generates by the BeOS tests
+	* test/Makefile.am: Add cairo-test-beos.*
+	* test/cairo-test-beos.cpp: New. (Must be a C++ file, hence not part of
+	cairo-test.c)
+	* test/cairo-test-beos.h: New.
+	* test/cairo-test.c: (cairo_test_expecting): Test BeOS backend.
+
+2005-12-19  Christian Biesinger  <cbiesinger at web.de>
+
 	reviewed by: cworth
 
 	* src/cairo-clip-private.h: Move enum to cairoint.h

Index: INSTALL
===================================================================
RCS file: /cvs/cairo/cairo/INSTALL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- INSTALL	31 Aug 2005 20:52:19 -0000	1.4
+++ INSTALL	19 Dec 2005 01:20:06 -0000	1.5
@@ -66,6 +66,7 @@
     --enable-atsui
     --enable-xcb
     --enable-glitz
+    --enable-beos
 
 	Some of cairo's backends are marked as experimental and will
 	not be built by default. If you would like to build and

Index: README
===================================================================
RCS file: /cvs/cairo/cairo/README,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- README	24 Aug 2005 16:12:37 -0000	1.21
+++ README	19 Dec 2005 01:20:06 -0000	1.22
@@ -98,6 +98,11 @@
 	------------
 	Xrender >= 0.6		http://freedesktop.org/Software/xlibs
 
+	beos backend
+	------------
+	No dependencies in itself other than an installed BeOS system, but cairo
+	requires a font backend. See the freetype dependency list.
+
 Font backends:
 
 	freetype font backend

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- configure.in	17 Dec 2005 00:23:04 -0000	1.157
+++ configure.in	19 Dec 2005 01:20:06 -0000	1.158
@@ -190,6 +190,46 @@
 fi
 AC_SUBST(WIN32_FONT_FEATURE)
 
+
+dnl ===========================================================================
+
+
+AC_MSG_CHECKING([for BeOS/Zeta])
+case "$host" in
+  *-*-beos)
+    cairo_platform_beos=yes
+    ;;
+  *)
+    cairo_platform_beos=no
+    ;;
+esac
+AC_MSG_RESULT([$cairo_platform_beos])
+
+AC_ARG_ENABLE(beos,
+  [  --enable-beos            Disable cairo's BeOS/Zeta backend],
+  [use_beos=$enableval], [use_beos=no])
+
+if test "x$cairo_platform_beos" != "xyes" ; then
+  if test "x$use_beos" = "xyes"; then
+    AC_MSG_WARN([The BeOS backend requires a BeOS platform; disabling])
+#    use_beos=no
+  fi
+fi
+
+if test "x$use_beos" = "xyes"; then
+  AC_PROG_CXX
+  dnl Add libbe and libzeta if available
+  AC_CHECK_LIB(be,main,CAIRO_LIBS="$CAIRO_LIBS -lbe")
+  AC_CHECK_LIB(zeta,main,CAIRO_LIBS="$CAIRO_LIBS -lzeta")
+fi
+
+AM_CONDITIONAL(CAIRO_HAS_BEOS_SURFACE, test "x$use_beos" = "xyes")
+if test "x$use_beos" = "xyes"; then
+  BEOS_SURFACE_FEATURE="#define CAIRO_HAS_BEOS_SURFACE 1"
+fi
+AC_SUBST(BEOS_SURFACE_FEATURE)
+
+
 dnl ===========================================================================
 
 AC_ARG_ENABLE(png,
@@ -682,6 +722,7 @@
 echo "  PDF:        $use_pdf"
 echo "  SVG:        $use_svg"
 echo "  glitz:      $use_glitz"
+echo "  BeOS:       $use_beos"
 echo ""
 echo "the following font backends:"
 echo "  FreeType:   $use_freetype"
@@ -732,3 +773,6 @@
    echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/ATSUI/'
 fi
 
+if test x"$use_beos" = "xyes" ; then
+   echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/BeOS/'
+fi