update to geos-3.3.1 (older versions won't work with gcc 4.6)

Author: Jeff Whitaker

Changelog

@@ -1,4 +1,6 @@
 version 1.0.2 (not yet released)
+           * update include geos from 3.2.0 to 3.3.1 so it compiles with gcc
+             4.6.
            * added colorbar method that uses axes_grid toolkit to
              create colorbar axes.
            * replace hasattr(arr,'mask') with numpy.ma.isMA(arr).

MANIFEST.in

@@ -96,5 +96,5 @@ include doc/README.txt
 include doc/make.py
 include doc/conf.py
 include doc/index.rst
-recursive-include geos-3.2.0 *
+recursive-include geos-3.3.1 *
 recursive-include lib/mpl_toolkits/basemap/data *

README

@@ -12,7 +12,7 @@ matplotlib 1.0.1 (or higher)
 numpy 1.4 (or higher)
 
 The GEOS (Geometry Engine - Open Source) library (version 3.1.1 or higher).
-Source code is included in the geos-3.2.0 directory.
+Source code is included in the geos-3.3.1 directory.
 
 PIL (http://pythonware.com/products/pil) is optional (only
 needed for Basemap warpimage and bluemarble methods).
@@ -28,7 +28,7 @@ source code from proj.4 (http://proj.maptools.org) is included in the
 'src' directory under the terms given in LICENSE_proj4.
 
 source code for the GEOS library is
-included in the 'geos-3.2.0' directory under the terms given in
+included in the 'geos-3.3.1' directory under the terms given in
 LICENSE_geos.
 
 shapefile.py from pyshp.googlecode.com is included under the terms given
@@ -80,7 +80,7 @@ geos_c.h is in /usr/local/include, set GEOS_DIR to /usr/local).
 Then go to step (3).  If you don't have it, you can build it from
 the source code included with basemap by following these steps:
 
- > cd geos-3.2.0
+ > cd geos-3.3.1
  > export GEOS_DIR=<where you want the libs and headers to go>
    A reasonable choice on a Unix-like system is /usr/local, or
    if you don't have permission to write there, your home directory.

doc/users/installing.rst

@@ -24,7 +24,7 @@ numpy 1.2.1 (or later)
 **Required libraries that ship with basemap**
 
 `GEOS <http://trac.osgeo.org/geos/>`__ (Geometry Engine - Open Source) library 3.1.1 or later.
-    Source code is included in the geos-3.2.0 directory. 
+    Source code is included in the geos-3.3.1 directory. 
     When building from source, must be built and installed separately
     from basemap (see build instructions below).
     Included in Windows binary installers.
@@ -59,7 +59,7 @@ To install from the source, follow these steps:
   Then go to next step.  If you don't have it, you can build it from
   the source code included with basemap by following these steps::
 
-      cd geos-3.2.0
+      cd geos-3.3.1
       export GEOS_DIR=<where you want the libs and headers to go>
       # A reasonable choice on a Unix-like system is /usr/local, or
       # if you don't have permission to write there, your home directory.

geos-3.3.1/AUTHORS

@@ -0,0 +1,44 @@
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+2003-11-06
+
+Initial development of GEOS was funded by:
+
+  Vivid Solutions Inc (www.vividsolutions.com)
+  Refractions Research Inc (www.refractions.net)
+  British Columbia Advanced Systems Institute (www.asi.bc.ca)
+
+GEOS is based on algorithms originally developed in Java
+by Martin Davis ([email protected]) in the 
+JTS Topology Suite (www.vividsolutions.com/jts/jtshome.htm)
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+2004 to 2006 
+
+Continued development of GEOS funded by Refractions Research Inc.
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+2006
+
+Continued development of GEOS funded by Refractions Research Inc.
+
+Inclusion of new JTS functionality in JTS 1.5 to 1.7 funded 
+by Safe Software and Autodesk.
+
+Improved robustness of geometric operations for GEOS 3.0.0 funded 
+by the Bavarian State Ministry of Agriculture and Forestry and the 
+State Survey of Bavaria.
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+Developers:
+
+  Yury Bychkov ([email protected]) - Initial Porting
+  Sandro Santilli ([email protected]) - Bug Fixing / Maintenance
+  Martin Davis ([email protected]) - Architecture
+  Dave Blasby ([email protected]) - PostGIS Connectivity
+  Norman Vine ([email protected]) - Porting / C++ Expertise
+  Fernando Villa ([email protected]) - GNU Build System
+  Paul Ramsey ([email protected]) - Coordination / Build
+  Sean Gillies ([email protected]) - Scripting Interface
+  Frank Warmerdam ([email protected]) - VStudio porting
+  Mateusz Loskot ([email protected]) - Unit testing
+