[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-90-gf8b9956

[git at osgeo.org]

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  f8b99564cd50874bad0371b40a821d91b04c3c39 (commit)
      from  13f821e5906e1a2663eb43b410bb6bd1deba88b6 (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 f8b99564cd50874bad0371b40a821d91b04c3c39
Author: Regina Obe <lr at pcorp.us>
Date:   Thu Oct 15 01:35:55 2020 -0400

    Add logic to install postgis_sfcgal lib, upgrade default versions of libraries

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 4e86959..d40cc35 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -17,13 +17,13 @@
 #!/usr/bin/env bash
 if  [[ "${OVERRIDE}" == '' ]] ; then
 	export GEOS_VER=3.8.1
-	export GDAL_VER=2.4.4
-	export PROJ_VER=5.2.0
-	export SFCGAL_VER=1.3.2
-	export CGAL_VER=4.11
+	export GDAL_VER=3.0.4
+	export PROJ_VER=6.3.2
+	export SFCGAL_VER=1.3.8
+	export CGAL_VER=5.0
 	export ICON_VER=1.15
 	export ZLIB_VER=1.2.11
-  	export PROTOBUF_VER=3.2.0
+  export PROTOBUF_VER=3.2.0
 	export PROTOBUFC_VER=1.2.1
 	export JSON_VER=0.12
 	export PROJSO=libproj-13.dll
@@ -53,7 +53,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.0
 fi;
 
 echo "ZLIB_VER $ZLIB_VER"
@@ -195,10 +195,12 @@ cp ${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll
 
 cd ${POSTGIS_SRC}
 strip postgis/*.dll
+strip sfcgal/*.dll
 strip raster/rt_pg/*.dll
 strip liblwgeom/.libs/*.dll
 
 cp postgis/*.dll ${RELDIR}/${RELVERDIR}/lib
+cp sfcgal/*.dll ${RELDIR}/${RELVERDIR}/lib
 cp topology/*.dll ${RELDIR}/${RELVERDIR}/lib
 cp raster/rt_pg/*.dll ${RELDIR}/${RELVERDIR}/lib
 cp doc/*_comments.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 9eee87d..a89bb5e 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
-	export GEOS_VER=3.8.0
-	export GDAL_VER=2.4.4
-	export PROJ_VER=5.2.0
+	export GEOS_VER=3.8.1
+	export GDAL_VER=3.0.4
+	export PROJ_VER=6.3.2
 	export SFCGAL_VER=1.3.8
 	export CGAL_VER=5.0.2
 	export ICON_VER=1.15
@@ -134,8 +134,8 @@ fi
 
 if [ -n "$SFCGAL_VER" ]; then
 	##hard code versions of cgal etc. for now
-	export CGAL_VER=4.11
-	BOOST_VER=1.53.0
+	#export CGAL_VER=4.11
+	BOOST_VER=1.59.0
 	#BOOST_VER_WU=1_49_0
 	export BOOST_VER_WU=1_53_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}"
@@ -191,6 +191,7 @@ if [ "$MAKE_EXTENSION" == "1" ]; then
  strip raster/rt_pg/postgis_raster-*.dll
  cp topology/*.dll ${PGPATHEDB}/lib
  cp postgis/postgis*.dll ${PGPATHEDB}/lib
+ cp sfcgal/*.dll ${PGPATHEDB}/lib
  cp raster/rt_pg/postgis_raster-*.dll ${PGPATHEDB}/lib
  cp -r ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
  cp -r ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}next.sql ${PGPATHEDB}/share/extension

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

Summary of changes:
 ci/winnie/package_postgis.sh | 14 ++++++++------
 ci/winnie/regress_postgis.sh | 11 ++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
PostGIS