[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0alpha1-10-g5476f08

git at osgeo.org git at osgeo.org
Tue Sep 21 13:10:21 PDT 2021


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  5476f08d1eafe2807b206ac95197d7ce46d20549 (commit)
       via  25dc016f86904b8e6ac2f6c13712ba2c61632419 (commit)
      from  cb726d5cd6c8b6630b9862af77311921d79f61b4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5476f08d1eafe2807b206ac95197d7ce46d20549
Author: Regina Obe <lr at pcorp.us>
Date:   Tue Sep 21 16:10:16 2021 -0400

    Bump winnie to SFCGAL 1.4.0 and CGAL 5.3, also fix GEOS. References https://git.osgeo.org/gitea/postgis/postgis/pulls/56

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 5c103d1..7b99c57 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -4,8 +4,8 @@ if  [[ "${OVERRIDE}" == '' ]] ; then
 	export GEOS_VER=3.9.0
 	export GDAL_VER=3.2.0
 	export PROJ_VER=7.1.1
-	export SFCGAL_VER=1.3.9
-	export CGAL_VER=5.0
+	export SFCGAL_VER=1.4.0
+	export CGAL_VER=5.3
 	export ICON_VER=1.16
 	export ZLIB_VER=1.2.11
   export PROTOBUF_VER=3.2.0
@@ -38,7 +38,7 @@ fi;
 
 #set to something even if override is on but not set
 if  [[ "${CGAL_VER}" == '' ]] ; then
-  export CGAL_VER=4.11
+  export CGAL_VER=5.3
 fi;
 
 #export GDAL_VER=2.4.0
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 125da45..b6fcd38 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -16,11 +16,11 @@
 #otherwise use the ones jenkins passes thru
 #!/usr/bin/env bash
 if  [[ "${OVERRIDE}" == '' ]] ; then
-	export GEOS_VER=3.9.0
-	export GDAL_VER=3.2.0
+	export GEOS_VER=3.9.1
+	export GDAL_VER=3.2.3
 	export PROJ_VER=7.1.1
-	export SFCGAL_VER=1.3.9
-	export CGAL_VER=5.0
+	export SFCGAL_VER=1.4.0
+	export CGAL_VER=5.3
 	export ICON_VER=1.16
 	export ZLIB_VER=1.2.11
   export PROTOBUF_VER=3.2.0
@@ -53,7 +53,7 @@ fi;
 
 #set to something even if override is on but not set
 if  [[ "${CGAL_VER}" == '' ]] ; then
-  export CGAL_VER=5.0
+  export CGAL_VER=5.3
 fi;
 
 echo "ZLIB_VER $ZLIB_VER"
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index ded2d26..e4f5d75 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
-	export GEOS_VER=3.9.0
+	export GEOS_VER=3.9.1
 	export GDAL_VER=3.2.0
 	export PROJ_VER=7.1.1
-	export SFCGAL_VER=1.3.9
-	export CGAL_VER=5.0.2
+	export SFCGAL_VER=1.4.0
+	export CGAL_VER=5.3.0
 	export ICON_VER=1.15
 	export ZLIB_VER=1.2.11
   export PROTOBUF_VER=3.2.0
@@ -38,7 +38,7 @@ fi;
 
 #set to something even if override is on but not set
 if  [[ "${CGAL_VER}" == '' ]] ; then
-  export CGAL_VER=5.0
+  export CGAL_VER=5.3
 fi;
 
 echo "ZLIB_VER $ZLIB_VER"
@@ -135,9 +135,9 @@ fi
 if [ -n "$SFCGAL_VER" ]; then
 	##hard code versions of cgal etc. for now
 	#export CGAL_VER=4.11
-	BOOST_VER=1.59.0
+	BOOST_VER=1.73.0
 	#BOOST_VER_WU=1_49_0
-	export BOOST_VER_WU=1_59_0
+	export BOOST_VER_WU=1_73_0
 	export PATH="${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/boost/rel-${BOOST_VER_WU}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
 
 

commit 25dc016f86904b8e6ac2f6c13712ba2c61632419
Author: Regina Obe <lr at pcorp.us>
Date:   Tue Sep 21 16:06:30 2021 -0400

    Add back ST_AsFlatGeobuf now that it is passing

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index 77ece32..b7de9b2 100644
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -10,7 +10,7 @@
 	<xsl:output method="text" />
 	<xsl:variable name='testversion'>3.2.0</xsl:variable>
 	<xsl:variable name='fnexclude14'>AddGeometryColumn DropGeometryColumn DropGeometryTable</xsl:variable>
-	<xsl:variable name='fnexclude'>AddGeometryColumn DropGeometryColumn DropGeometryTable ST_AsFlatGeobuf ST_AsMVT</xsl:variable>
+	<xsl:variable name='fnexclude'>AddGeometryColumn DropGeometryColumn DropGeometryTable ST_AsMVT</xsl:variable>
 	<!--This is just a place holder to state functions not supported or tested separately -->
 
 	<xsl:variable name='var_srid'>3395</xsl:variable>

-----------------------------------------------------------------------

Summary of changes:
 ci/winnie/build_postgis.sh         |  6 +++---
 ci/winnie/package_postgis.sh       | 10 +++++-----
 ci/winnie/regress_postgis.sh       | 12 ++++++------
 doc/xsl/postgis_gardentest.sql.xsl |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list