[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-93-ge7ed833

[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  e7ed833b6a7d00f15d338aa2de38b0050a64928d (commit)
      from  7c05b5cdd8a9cf2b9f80666a0be2cac7cf06cd16 (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 e7ed833b6a7d00f15d338aa2de38b0050a64928d
Author: Regina Obe <lr at pcorp.us>
Date:   Tue Oct 20 15:17:18 2020 -0400

    update versions of stuff related to gdal

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 561f2f4..ed32be1 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -2,16 +2,16 @@
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
 	export GEOS_VER=3.8.1
-	export GDAL_VER=2.4.4
-	export PROJ_VER=5.2.0
+	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
+	export CGAL_VER=5.0
+	export ICON_VER=1.16
 	export ZLIB_VER=1.2.11
   export PROTOBUF_VER=3.2.0
 	export PROTOBUFC_VER=1.2.1
 	export JSON_VER=0.12
-	export PROJSO=libproj-13.dll
+	export PROJSO=libproj-15.dll
 fi;
 
 export PROTOBUF_VER=3.2.0
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index d40cc35..18233a5 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -21,7 +21,7 @@ if  [[ "${OVERRIDE}" == '' ]] ; then
 	export PROJ_VER=6.3.2
 	export SFCGAL_VER=1.3.8
 	export CGAL_VER=5.0
-	export ICON_VER=1.15
+	export ICON_VER=1.16
 	export ZLIB_VER=1.2.11
   export PROTOBUF_VER=3.2.0
 	export PROTOBUFC_VER=1.2.1
@@ -242,6 +242,8 @@ echo "GEOS VERSION: ${GEOS_VER} https://trac.osgeo.org/geos" >> $verfile
 echo "GDAL VERSION: ${GDAL_VER} https://gdal.org/download.html#current-releases" >> $verfile
 echo "PROJ VERSION: ${PROJ_VER} https://proj.org/download.html#current-release" >> $verfile
 
+echo "LIBICONV VERSION: ${ICON_VER} http://ftp.gnu.org/gnu/libiconv/libiconv-${ICONV_VER}.tar.gz" >> $verfile
+
 if [ -n "$SFCGAL_VER"  ]; then
     echo "CGAL VERSION: ${CGAL_VER} http://www.cgal.org" >> $verfile
     echo "BOOST VERSION: ${BOOST_VER} http://www.boost.org" >> $verfile
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index a89bb5e..f808b8f 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -20,7 +20,7 @@ export JSON_VER=0.12
 export PCRE_VER=8.33
 
 if  [[ "${ICON_VER}" == '' ]] ; then
-  export ICON_VER=1.15
+  export ICON_VER=1.16
 fi;
 
 echo "ICON_VER ${ICON_VER}"
@@ -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.0
 fi;
 
 echo "ZLIB_VER $ZLIB_VER"
@@ -137,7 +137,7 @@ if [ -n "$SFCGAL_VER" ]; then
 	#export CGAL_VER=4.11
 	BOOST_VER=1.59.0
 	#BOOST_VER_WU=1_49_0
-	export BOOST_VER_WU=1_53_0
+	export BOOST_VER_WU=1_59_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}"
 
 

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

Summary of changes:
 ci/winnie/build_postgis.sh   | 10 +++++-----
 ci/winnie/package_postgis.sh |  4 +++-
 ci/winnie/regress_postgis.sh |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
PostGIS