[postgis-tickets] [SCM] PostGIS branch stable-2.5 updated. 2.5.5-2-g348793a
git at osgeo.org
git at osgeo.org
Mon Aug 17 07:32:36 PDT 2020
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, stable-2.5 has been updated
via 348793a33c1660ba1c30cf7448454abf5ffc65f9 (commit)
from bff0d66a690d56cd423dbb491d7f984f58d24fd0 (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 348793a33c1660ba1c30cf7448454abf5ffc65f9
Author: Regina Obe <lr at pcorp.us>
Date: Mon Aug 17 10:32:30 2020 -0400
Update versions of libs for windows
diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 41e3b75..dc8c61a 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -13,11 +13,10 @@ set -e
#POSTGIS_MICRO_VERSION=0SVN
#export GCC_TYPE=gcc48 #for pre-4.8.0 compiles this is blank
if [[ "${OVERRIDE}" == '' ]] ; then
-export SFCGAL_VER=1.3.2
-export GEOS_VER=3.7.2
+export GEOS_VER=3.8.1
export GDAL_VER=2.2.4
-export PROJ_VER=4.9.3
-export SFCGAL_VER=1.3.2
+export PROJ_VER=5.2.0
+export SFCGAL_VER=1.3.8
export PCRE_VER=8.33
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 29862d3..c98014a 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -25,6 +25,12 @@ export CGAL_VER=4.11
export BOOST_VER=1.53.0
#BOOST_VER_WU=1_49_0
export BOOST_VER_WU=1_53_0
+
+if [["${OS_BUILD}" == '64']] ; then
+ export GDAL_VER=2.4.4
+ export SFCGAL_VER=1.3.8
+fi;
+
fi;
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 0381948..cc4d201 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -1,11 +1,18 @@
#!/bin/bash
set -e
if [[ "${OVERRIDE}" == '' ]] ; then
-export SFCGAL_VER=1.3.2
-export GEOS_VER=3.7.2
+export SFCGAL_VER=1.3.8
+export GEOS_VER=3.8.1
export GDAL_VER=2.2.4
-export PROJ_VER=4.9.3
+export PROJ_VER=5.2.0
export SFCGAL_VER=1.3.2
+export ICONV_VER=1.13.1
+if [["${OS_BUILD}" == '64']] ; then
+ export GDAL_VER=2.4.4
+ export SFCGAL_VER=1.3.8
+ export ICONV_VER=1.15
+fi;
+
export PCRE_VER=8.33
export PROTOBUF_VER=3.2.0
export PROTOBUFC_VER=1.2.1
@@ -38,6 +45,9 @@ fi;
#set to something even if override is on but not set
if [[ "${LIBXML_VER}" == '' ]] ; then
export LIBXML_VER=2.7.8
+ if [["${GCC_TYPE}" == 'gcc81']] ; then
+ export LIBXML_VER=2.9.9
+ fi;
fi;
#set to something even if override is on but not set
@@ -85,7 +95,6 @@ else
fi;
fi;
-export LIBXML_VER=2.7.8
#export POSTGIS_SRC=${PROJECTS}/postgis/trunk
export GDAL_DATA="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/gdal"
@@ -93,7 +102,7 @@ export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD
export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
#PATH="${MINGPROJECTS}/gettext/rel-gettext-0.18.1/bin:${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtk/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}/bin:${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}/bin:${MINGPROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}/bin:${PATH}"
-PATH="${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
+PATH="${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/rel-libiconv-${ICONV_VER}w${OS_BUILD}${GCC_TYPE}/lib:${MINGPROJECTS}/rel-libiconv-${ICONV_VER}w${OS_BUILD}${GCC_TYPE}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
#add protobuf
export PATH="${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
@@ -126,13 +135,13 @@ 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.53.0
#BOOST_VER_WU=1_49_0
- export BOOST_VER_WU=1_53_0
+ #export BOOST_VER_WU=1_53_0
export PATH="${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/boost/rel-${BOOST_VER_WU}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
-CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
+CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-${ICONV_VER}w${OS_BUILD}${GCC_TYPE}/include" \
CFLAGS="-Wall -fno-omit-frame-pointer" \
LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
--host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
-----------------------------------------------------------------------
Summary of changes:
ci/winnie/build_postgis.sh | 7 +++----
ci/winnie/package_postgis.sh | 6 ++++++
ci/winnie/regress_postgis.sh | 27 ++++++++++++++++++---------
3 files changed, 27 insertions(+), 13 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list