[SCM] PostGIS branch master updated. 3.5.0-465-gda1095acf

[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  da1095acf25ae160557d4e32973f63d3f523c319 (commit)
      from  45dd053484484d914737e7649ffe10a2d50e5903 (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 da1095acf25ae160557d4e32973f63d3f523c319
Author: Regina Obe <lr at pcorp.us>
Date:   Tue Jul 15 20:07:48 2025 -0400

    CI Winnie and Berrie64 changes
    
     * Fix postgisgui packaging exception on winnie
     * Have berrie64 now build with sfcgal master support.
       This is to allow her to do sfcgal garden tests and not fail
       because sfcgal is missing.
      Closes #5945 for PostGIS 3.6.0

diff --git a/ci/berrie64/configs.sh b/ci/berrie64/configs.sh
index 9b2e7aae8..bb83179a6 100644
--- a/ci/berrie64/configs.sh
+++ b/ci/berrie64/configs.sh
@@ -1,13 +1,16 @@
 export WORKSPACE=/home/jenkins/workspace
 export GEOS_VER=3.14.0
+export SFCGAL_VER=master
 
 export OS_BUILD=64
 export PG_VER=17
 export GEOS_PATH=${WORKSPACE}/geos/rel-${GEOS_VER}
+export SFCGAL_PATH=${WORKSPACE}/sfcgal/rel-sfcgal-${SFCGAL_VER}
 #export GEOS_PATH=~/geos/rel-${GEOS_VER}
 export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
-export PATH=${PGPATH}/bin:${PGPATH}/lib:${GEOS_PATH}/bin:${GEOS_PATH}/lib:${PATH}
-export PKG_CONFIG_PATH="${GEOS_PATH}/lib/pkgconfig"
+export PATH=${PGPATH}/bin:${PGPATH}/lib:${GEOS_PATH}/bin:${GEOS_PATH}/lib:${SFCGAL_PATH}/bin:${SFCGAL_PATH}/lib:${PATH}
+
+export PKG_CONFIG_PATH="${GEOS_PATH}/lib/pkgconfig:${SFCGAL_PATH}/lib/pkgconfig"
 export PGPORT=55434
 export PGDATA=$PGPATH/data_${PGPORT}
 export PGHOST=localhost
diff --git a/ci/berrie64/postgis_regress.sh b/ci/berrie64/postgis_regress.sh
index ed4620b63..730b15382 100644
--- a/ci/berrie64/postgis_regress.sh
+++ b/ci/berrie64/postgis_regress.sh
@@ -14,7 +14,9 @@ export CONFIG_FILE="$CUR_DIR/configs.sh"
 echo $PATH
 
 sh autogen.sh
-./configure --with-pgconfig=${PGPATH}/bin/pg_config --with-geosconfig=${GEOS_PATH}/bin/geos-config --with-library-minor-version --enable-lto --without-interrupt-tests --prefix=${PGPATH}
+./configure --with-pgconfig=${PGPATH}/bin/pg_config --with-geosconfig=${GEOS_PATH}/bin/geos-config --with-library-minor-version --enable-lto \
+    --with-sfcgal=${SFCGAL_PATH}/bin/sfcgal-config \
+    --without-interrupt-tests --prefix=${PGPATH}
 #make clean
 make
 export err_status=0
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index dc7f9680c..27fda2311 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -51,12 +51,6 @@ mkdir $outdir/lib
 mkdir $outdir/utils
 
 
-
-#pg 15 is shipping with newer ssl
-cp ${PGPATHEDB}/bin/libcrypto-3-x64.dll $outdir/bin/postgisgui
-cp ${PGPATHEDB}/bin/libssl-3-x64.dll $outdir/bin/postgisgui
-
-
 cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libstdc++-6.dll $outdir/bin
 cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libgcc*.dll $outdir/bin
 
@@ -65,6 +59,9 @@ if [ -n "${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}" ]; then
 	mkdir $outdir/bin/postgisgui
 	mkdir $outdir/bin/postgisgui/share
 	mkdir $outdir/bin/postgisgui/lib
+	#pg 15 is shipping with newer ssl
+	cp ${PGPATHEDB}/bin/libcrypto-3-x64.dll $outdir/bin/postgisgui
+	cp ${PGPATHEDB}/bin/libssl-3-x64.dll $outdir/bin/postgisgui
 	cp -r ${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin/postgisgui
 	cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libstdc++-6.dll $outdir/bin/postgisgui
 	cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libgcc*.dll $outdir/bin/postgisgui
@@ -86,6 +83,9 @@ if [ -n "${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}" ]; then
 
 	cp loader/shp2pgsql-gui.exe ${RELDIR}/${RELVERDIR}/bin/postgisgui
 	cp loader/.libs/shp2pgsql-gui.exe ${RELDIR}/${RELVERDIR}/bin/postgisgui
+
+	#shp2pgsql-gui now has dependency on geos (though in theory it shouldn't)
+	cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui
 fi;
 
 # proj
@@ -157,8 +157,6 @@ cp topology/loader/* ${RELDIR}/${RELVERDIR}/bin
 
 #cp liblwgeom/.libs/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui
 
-#shp2pgsql-gui now has dependency on geos (though in theory it shouldn't)
-cp -p ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll ${RELDIR}/${RELVERDIR}/bin/postgisgui
 cp spatial_ref_sys.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
 cp topology/topology.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
 #cp topology/topology_upgrade_*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}

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

Summary of changes:
 ci/berrie64/configs.sh         |  7 +++++--
 ci/berrie64/postgis_regress.sh |  4 +++-
 ci/winnie/package_postgis.sh   | 14 ++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
PostGIS