[cairo-commit] pycairo configure.ac, 1.49, 1.50 ChangeLog, 1.224, 1.225

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo
In directory kemper:/tmp/cvs-serv24769

Modified Files:
	configure.ac ChangeLog 
Log Message:
'SC'

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- configure.ac	26 Jun 2006 13:59:34 -0000	1.49
+++ configure.ac	1 Jul 2006 08:05:52 -0000	1.50
@@ -8,7 +8,7 @@
 m4_define(pycairo_version, pycairo_version_major.pycairo_version_minor.pycairo_version_micro)
 
 # versions of packages we require
-m4_define(cairo_required_version,    1.1.8)
+m4_define(cairo_required_version,    1.2.0)
 m4_define(gtk_required_version,      2.2.0)
 m4_define(pygtk_required_version,    2.2.0)
 m4_define(libsvg_cairo_required_version, 0.1.6)
@@ -28,8 +28,7 @@
 
 AM_INIT_AUTOMAKE([1.9 -Wall])
 
-
-# Options
+# Options ---
 AC_ARG_WITH(pygtk,
             [AC_HELP_STRING([--with-pygtk], [support pygtk [default=yes]])],
 	    [],
@@ -39,15 +38,13 @@
 # put the ACLOCAL flags in the makefile
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
-
-# Checks for programs
+# Checks for programs ---
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 AM_PATH_PYTHON(2.3)
 
-
-# Checks for libraries
+# Checks for libraries ---
 
 # get rid of the -export-dynamic stuff from the configure flags ...
 export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
@@ -79,17 +76,6 @@
 fi
 AM_CONDITIONAL(WITH_PYGTK, test x$with_pygtk = xyes)
 
-# Numeric Python
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-AC_CHECK_HEADER([Numeric/arrayobject.h],
-  [have_numpy=yes], [have_numpy=no],
-  [#include <Python.h>])
-CPPFLAGS="$save_CPPFLAGS"
-if test x$have_numpy = xyes; then
-  AC_DEFINE(HAVE_NUMPY, [1], [Define to 1 if Numeric python is found])
-fi
-
 # is libsvg-cairo installed?
 PKG_CHECK_MODULES(LIBSVG_CAIRO,
   libsvg-cairo >= libsvg_cairo_required_version,
@@ -99,12 +85,21 @@
 fi
 AM_CONDITIONAL(HAVE_LIBSVG_CAIRO, test x$have_libsvg_cairo = xyes)
 
-
-# Checks for header files
+# Checks for header files ---
 AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 
+# Numeric Python
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_CHECK_HEADER([Numeric/arrayobject.h],
+  [have_numpy=yes], [have_numpy=no],
+  [#include <Python.h>])
+CPPFLAGS="$save_CPPFLAGS"
+if test x$have_numpy = xyes; then
+  AC_DEFINE(HAVE_NUMPY, [1], [Define to 1 if Numeric python is found])
+fi
 
-# checks for types and compilers
+# checks for types and compilers ---
 AC_C_CONST
 
 # add gcc debugging options
@@ -143,10 +138,10 @@
     fi
 esac
 
+# Checks for library functions ---
+# Checks for system services ---
 
-# Checks for library functions
-
-
+# Output ---
 AC_CONFIG_FILES([
 Makefile
 pycairo.pc

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- ChangeLog	26 Jun 2006 13:59:34 -0000	1.224
+++ ChangeLog	1 Jul 2006 08:05:52 -0000	1.225
@@ -1,3 +1,14 @@
+2006-07-01  Steve Chaplin  <steve1097 # yahoo.com.au>
+
+	* configure.ac : fix problem where Numeric was not being detected.
+	require cairo 1.2.0
+
+	* cairo/cairomodule.c : add cairo.FORMAT_RGB16_565
+
+	* cairo/pycairo-surface.c (image_surface_create_for_data):
+	add support for CAIRO_FORMAT_RGB16_565
+	(xlib_surface_get_height, xlib_surface_get_width): new bindings
+
 2006-06-26  Steve Chaplin  <steve1097 # yahoo.com.au>
 
 	* INSTALL: Remove obsolete notes about RGBA patch