* update geos to 3.12.1

* update gdal to 3.8.0
* update python3-rasterio to 1.3.9
* update pdal to 2.6
* update entwine to 3.0.0
* update saga9 to 9.2.0 (refs north-road/qgis-processing-saga-nextgen#34))
* include python3-pdal-plugins (implements #808)
* rebuild python3-pdal, saga*, qgis* with new PDAL using pdalcpp.lib to
  fill in for removed pdal_util.lib where necessary.

src/entwine/osgeo4w/package.sh

@@ -1,5 +1,5 @@
 export P=entwine
-export V=2.2.0
+export V=3.0.0
 export B=next
 export MAINTAINER=JuergenFischer
 export BUILDDEPENDS="curl-devel openssl-devel pdal-devel python3-core"

src/gdal-dev/osgeo4w/package.sh

@@ -44,7 +44,7 @@ SHA=$(cd ../gdal; git log -n1 --pretty=%h)
 [ -f osgeo4w/apps/$PYTHON/Lib/site-packages/setuptools/command/patched ] || {
 	patch -p0 --dry-run <easy_install.diff
 	patch -p0 <easy_install.diff
-	touch osgeo4w/apps/Python39/Lib/site-packages/setuptools/command/patched
+	touch osgeo4w/apps/$PYTHON/Lib/site-packages/setuptools/command/patched
 }
 
 #
@@ -155,7 +155,7 @@ export MRSID_SDK=$(cygpath -am gdaldeps/$MRSID_SDK)
 	cmakeenv
 	ninjaenv
 
-	export INCLUDE="$(cygpath -am osgeo4w/include);$(cygpath -am osgeo4w/apps/Python39/include);$(cygpath -am osgeo4w/include/boost-1_74);$INCLUDE"
+	export INCLUDE="$(cygpath -am osgeo4w/include);$(cygpath -am osgeo4w/apps/$PYTHON/include);$(cygpath -am osgeo4w/include/boost-1_74);$INCLUDE"
 	export LIB="$(cygpath -am osgeo4w/lib);$LIB"
 
 	[ -n "$OSGEO4W_SKIP_CLEAN" ] || rm -rf build
@@ -194,8 +194,8 @@ export MRSID_SDK=$(cygpath -am gdaldeps/$MRSID_SDK)
 		-D      OGR_ENABLE_DRIVER_FILEGDB_PLUGIN=ON \
 		-D         OGR_ENABLE_DRIVER_SOSI_PLUGIN=ON \
 		-D OGR_ENABLE_DRIVER_MSSQLSPATIAL_PLUGIN=ON \
-		-D                     Python_EXECUTABLE=$(cygpath -am ../osgeo4w/apps/Python39/python3.exe) \
-		-D             Python_NumPy_INCLUDE_DIRS=$(cygpath -am ../osgeo4w/apps/Python39/Lib/site-packages/numpy/core/include) \
+		-D                     Python_EXECUTABLE=$(cygpath -am ../osgeo4w/apps/$PYTHON/python3.exe) \
+		-D             Python_NumPy_INCLUDE_DIRS=$(cygpath -am ../osgeo4w/apps/$PYTHON/Lib/site-packages/numpy/core/include) \
 		-D                       SWIG_EXECUTABLE=$(cygpath -am ../osgeo4w/bin/swig.bat) \
 		-D                       ECW_INCLUDE_DIR=$(cygpath -am ../gdaldeps/ecw/include) \
 		-D                           ECW_LIBRARY=$(cygpath -am ../gdaldeps/ecw/lib/vc141/x64/NCSEcw.lib) \

src/gdal/osgeo4w/package.sh

@@ -1,5 +1,5 @@
 export P=gdal
-export V=3.7.3
+export V=3.8.0
 export B=next
 export MAINTAINER=JuergenFischer
 export BUILDDEPENDS="python3-core swig zlib-devel proj-devel libpng-devel curl-devel geos-devel libmysql-devel sqlite3-devel netcdf-devel libpq-devel expat-devel xerces-c-devel szip-devel hdf4-devel hdf5-devel hdf5-tools ogdi-devel libiconv-devel openjpeg-devel libspatialite-devel freexl-devel libkml-devel xz-devel zstd-devel msodbcsql-devel poppler-devel libwebp-devel oci-devel openfyba-devel freetype-devel python3-devel python3-numpy libjpeg-turbo-devel python3-setuptools opencl-devel libtiff-devel arrow-cpp-devel lz4-devel openssl-devel tiledb-devel lerc-devel kealib-devel odbc-cpp-wrapper-devel libjxl-devel"
@@ -34,7 +34,7 @@ fi
 [ -f osgeo4w/apps/$PYTHON/Lib/site-packages/setuptools/command/patched ] || {
 	patch -p0 --dry-run <easy_install.diff
 	patch -p0 <easy_install.diff
-	touch osgeo4w/apps/Python39/Lib/site-packages/setuptools/command/patched
+	touch osgeo4w/apps/$PYTHON/Lib/site-packages/setuptools/command/patched
 }
 
 #
@@ -117,7 +117,7 @@ export MRSID_SDK=$(cygpath -am gdaldeps/$MRSID_SDK)
 	cmakeenv
 	ninjaenv
 
-	export INCLUDE="$(cygpath -am osgeo4w/include);$(cygpath -am osgeo4w/apps/Python39/include);$(cygpath -am osgeo4w/include/boost-1_74);$INCLUDE"
+	export INCLUDE="$(cygpath -am osgeo4w/include);$(cygpath -am osgeo4w/apps/$PYTHON/include);$(cygpath -am osgeo4w/include/boost-1_74);$INCLUDE"
 	export LIB="$(cygpath -am osgeo4w/lib);$LIB"
 
 	[ -n "$OSGEO4W_SKIP_CLEAN" ] || rm -rf build
@@ -154,8 +154,8 @@ export MRSID_SDK=$(cygpath -am gdaldeps/$MRSID_SDK)
 		-D      OGR_ENABLE_DRIVER_FILEGDB_PLUGIN=ON \
 		-D         OGR_ENABLE_DRIVER_SOSI_PLUGIN=ON \
 		-D OGR_ENABLE_DRIVER_MSSQLSPATIAL_PLUGIN=ON \
-		-D                     Python_EXECUTABLE=$(cygpath -am ../osgeo4w/apps/Python39/python3.exe) \
-		-D             Python_NumPy_INCLUDE_DIRS=$(cygpath -am ../osgeo4w/apps/Python39/Lib/site-packages/numpy/core/include) \
+		-D                     Python_EXECUTABLE=$(cygpath -am ../osgeo4w/apps/$PYTHON/python3.exe) \
+		-D             Python_NumPy_INCLUDE_DIRS=$(cygpath -am ../osgeo4w/apps/$PYTHON/Lib/site-packages/numpy/core/include) \
 		-D                       SWIG_EXECUTABLE=$(cygpath -am ../osgeo4w/bin/swig.bat) \
 		-D                       ECW_INCLUDE_DIR=$(cygpath -am ../gdaldeps/ecw/include) \
 		-D                           ECW_LIBRARY=$(cygpath -am ../gdaldeps/ecw/lib/vc141/x64/NCSEcw.lib) \

src/geos/osgeo4w/package.sh

@@ -1,5 +1,5 @@
 export P=geos
-export V=3.12.0
+export V=3.12.1
 export B=next
 export MAINTAINER=JuergenFischer
 export BUILDDEPENDS=none

src/pdal/osgeo4w/package.sh

@@ -1,8 +1,8 @@
 export P=pdal
-export V=2.5.5
+export V=2.6.0
 export B=next
 export MAINTAINER=JuergenFischer
-export BUILDDEPENDS="gdal-devel libgeotiff-devel libtiff-devel zlib-devel curl-devel libxml2-devel hdf5-devel openssl-devel zstd-devel laszip-devel"
+export BUILDDEPENDS="gdal-devel libgeotiff-devel libtiff-devel zlib-devel curl-devel libxml2-devel hdf5-devel openssl-devel zstd-devel laszip-devel proj-devel"
 
 source ../../../scripts/build-helpers
 
@@ -33,6 +33,7 @@ fi
 		-D CMAKE_BUILD_TYPE=Release \
 		-D CMAKE_INSTALL_PREFIX=../install \
 		-D PDAL_PLUGIN_INSTALL_PATH=../install/apps/$P/plugins \
+		-D Python_EXECUTABLE=$(cygpath -am ../osgeo4w/apps/$PYTHON/python3.exe) \
 		../../$P-$V
 	cmake --build .
 	cmake --build . --target install || cmake --build . --target install

src/python3-pdal-plugins/osgeo4w/package.sh

@@ -0,0 +1,66 @@
+export P=python3-pdal-plugins
+export V=1.2.1
+export B=next
+export MAINTAINER=JuergenFischer
+export BUILDDEPENDS="python3-pip python3-wheel python3-devel python3-numpy pdal-devel"
+
+source ../../../scripts/build-helpers
+
+startlog
+
+cd ..
+
+if [ -d pdal ]; then
+	cd pdal
+	git fetch
+else
+	git clone https://github.com/PDAL/python-plugins pdal
+	cd pdal
+fi
+
+git checkout $V
+
+cd $OSGEO4W_PWD
+
+fetchenv osgeo4w/bin/o4w_env.bat
+
+vs2019env
+cmakeenv
+ninjaenv
+
+pip3 install scikit_build
+
+cat <<EOF >pip.env
+EOF
+
+export INCLUDE="$(cygpath -am osgeo4w/include);\$INCLUDE"
+export LIB="$(cygpath -am osgeo4w/lib);\$LIB"
+
+cd ../pdal
+
+pip3 install .
+
+export R=$OSGEO4W_REP/x86_64/release/$P
+mkdir -p $R/$P
+
+cat <<EOF >$R/setup.hint
+sdesc: "PDAL Python plugins plugin"
+ldesc: "PDAL Python plugins allow you to process data with PDAL into Numpy arrays. They support embedding Python in PDAL pipelines with the readers.numpy and filters.python stages."
+category: Commandline_Utilities
+requires: python3-core pdal-libs
+category: Libs
+requires: msvcrt2019
+maintainer: $MAINTAINER
+EOF
+
+tar -C ../osgeo4w -cjf $R/$P-$V-$B.tar.bz2 \
+	--xform "s,osgeo4w/apps/Python39/bin/,apps/pdal/plugins/," \
+	osgeo4w/apps/Python39/bin/libpdal_plugin_filter_python.dll \
+	osgeo4w/apps/Python39/bin/libpdal_plugin_reader_numpy.dll
+
+
+cp ../pdal/LICENSE $R/$P-$V-$B.txt
+
+tar -C .. -cjf $R/$P-$V-$B-src.tar.bz2 osgeo4w/package.sh
+
+endlog

src/python3-rasterio/osgeo4w/package.sh

@@ -1,30 +1,32 @@
 export P=python3-rasterio
-export V=pip
-export B=pip
+export V=1.3.9
+export B=next
 export MAINTAINER=JuergenFischer
 export BUILDDEPENDS="python3-pip python3-wheel python3-devel python3-setuptools python3-affine python3-attrs python3-click python3-cligj python3-numpy python3-snuggs python3-click-plugins gdal-devel"
 
 source ../../../scripts/build-helpers
 
 startlog
 
+p=${P#python3-}
+
+[ -f $p-$V.tar.gz ]  || wget https://files.pythonhosted.org/packages/bd/b8/84f5e6ee1d7915d20ceaa7dbbf2589787c5819907b75c4f2b95386f88961/$p-$V.tar.gz
+[ -d ../$p-$V || tar -C .. -xzf $p-$V.tar.gz
+
 major=$(sed -ne "s/# *define *GDAL_VERSION_MAJOR *//p" osgeo4w/include/gdal_version.h)
 minor=$(sed -ne "s/# *define *GDAL_VERSION_MINOR *//p" osgeo4w/include/gdal_version.h)
 rev=$(sed -ne "s/# *define *GDAL_VERSION_REV *//p" osgeo4w/include/gdal_version.h)
 major=${major%}
 minor=${minor%}
 rev=${rev%}
 
-cat <<EOF >pip.env
 export GDAL_VERSION=$major.$minor.$rev
 export INCLUDE="$(cygpath -am osgeo4w/include);\$INCLUDE"
 export LINK="$(cygpath -am osgeo4w/lib/gdal_i.lib)"
-export PIP_USE_PEP517=0
-EOF
 
 fetchenv osgeo4w/bin/o4w_env.bat
 
-pip install Cython
+pip3 install ../$p-$V
 
 adddepends="$RUNTIMEDEPENDS" packagewheel
 

src/qgis-ltr-dev/osgeo4w/package.sh

@@ -195,6 +195,7 @@ nextbinary
 		-D QCA_LIBRARY=$(cygpath -am $O4W_ROOT/apps/Qt5/lib/qca-qt5.lib) \
 		-D QWT_LIBRARY=$(cygpath -am $O4W_ROOT/apps/Qt5/lib/qwt.lib) \
 		-D QSCINTILLA_LIBRARY=$(cygpath -am $O4W_ROOT/apps/Qt5/lib/qscintilla2.lib) \
+		-D PDAL_UTIL_LIBRARY=$(cygpath -am $O4W_ROOT/lib/pdalcpp.lib) \
 		-D DART_TESTING_TIMEOUT=60 \
 		-D PUSH_TO_CDASH=TRUE \
 		$(cygpath -m $SRCDIR)

src/qgis-ltr/osgeo4w/package.sh

@@ -163,6 +163,7 @@ nextbinary
 		-D QSCINTILLA_LIBRARY=$(cygpath -am $O4W_ROOT/apps/Qt5/lib/qscintilla2.lib) \
 		-D DART_TESTING_TIMEOUT=60 \
 		-D PUSH_TO_CDASH=TRUE \
+		-D PDAL_UTIL_LIBRARY=$(cygpath -am $O4W_ROOT/lib/pdalcpp.lib) \
 		$(cygpath -m $SRCDIR)
 
 	if [ -z "$OSGEO4W_SKIP_CLEAN" ]; then

src/qgis-rel-dev/osgeo4w/package.sh

@@ -193,6 +193,7 @@ nextbinary
 		-D QCA_LIBRARY=$(cygpath -am $O4W_ROOT/apps/Qt5/lib/qca-qt5.lib) \
 		-D QWT_LIBRARY=$(cygpath -am $O4W_ROOT/apps/Qt5/lib/qwt.lib) \
 		-D QSCINTILLA_LIBRARY=$(cygpath -am $O4W_ROOT/apps/Qt5/lib/qscintilla2.lib) \
+		-D PDAL_UTIL_LIBRARY=$(cygpath -am $O4W_ROOT/lib/pdalcpp.lib) \
 		-D DART_TESTING_TIMEOUT=60 \
 		-D PUSH_TO_CDASH=TRUE \
 		$(cygpath -m $SRCDIR)

src/saga/osgeo4w/patch

@@ -2601,7 +2601,7 @@ diff -ur saga-7.8.2_src/saga-gis/src/tools/io/io_pdal/io_pdal.vcxproj ../saga-7.
      </ResourceCompile>
      <Link>
 -      <AdditionalDependencies>saga_api.lib;pdal_util.lib;pdalcpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>saga_api.lib;pdal_util.lib;pdalcpp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>saga_api.lib;pdalcpp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
        <SuppressStartupBanner>true</SuppressStartupBanner>
        <AdditionalLibraryDirectories>$(PDAL_32)\lib;..\..\..\..\bin\saga_vc_$(Platform)_d\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -2610,7 +2610,7 @@ diff -ur saga-7.8.2_src/saga-gis/src/tools/io/io_pdal/io_pdal.vcxproj ../saga-7.
      </ResourceCompile>
      <Link>
 -      <AdditionalDependencies>saga_api.lib;pdal_util.lib;pdalcpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>saga_api.lib;pdal_util.lib;pdalcpp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>saga_api.lib;pdalcpp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
        <SuppressStartupBanner>true</SuppressStartupBanner>
        <AdditionalLibraryDirectories>$(PDAL)\lib;..\..\..\..\bin\saga_vc_$(Platform)_d\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -2619,7 +2619,7 @@ diff -ur saga-7.8.2_src/saga-gis/src/tools/io/io_pdal/io_pdal.vcxproj ../saga-7.
      </ResourceCompile>
      <Link>
 -      <AdditionalDependencies>saga_api.lib;pdal_util.lib;pdalcpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>saga_api.lib;pdal_util.lib;pdalcpp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>saga_api.lib;pdalcpp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
        <SuppressStartupBanner>true</SuppressStartupBanner>
        <AdditionalLibraryDirectories>$(PDAL_32)\lib;..\..\..\..\bin\saga_vc_$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -2628,7 +2628,7 @@ diff -ur saga-7.8.2_src/saga-gis/src/tools/io/io_pdal/io_pdal.vcxproj ../saga-7.
      </ResourceCompile>
      <Link>
 -      <AdditionalDependencies>saga_api.lib;pdal_util.lib;pdalcpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>saga_api.lib;pdal_util.lib;pdalcpp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>saga_api.lib;pdalcpp.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
        <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
        <SuppressStartupBanner>true</SuppressStartupBanner>
        <AdditionalLibraryDirectories>$(PDAL)\lib;..\..\..\..\bin\saga_vc_$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

src/saga9/osgeo4w/package.sh

@@ -1,5 +1,5 @@
 export P=saga9
-export V=9.1.3
+export V=9.2.0
 export B=next
 export MAINTAINER=JuergenFischer
 export BUILDDEPENDS="wxwidgets-devel libharu-devel gdal-devel proj-devel libpq-devel curl-devel libpng-devel libtiff-devel libjpeg-turbo-devel zlib-devel expat-devel pdal-devel"
@@ -44,6 +44,7 @@ p=${P%$M}
 		-D CMAKE_BUILD_TYPE=Release \
 		-D CMAKE_MODULE_PATH=$(cygpath -am ../osgeo4w/lib/cmake) \
 		-D CURL_LIBRARIES=$(cygpath -am ../osgeo4w/lib/libcurl.lib) \
+		-D PDAL_UTIL_LIBRARY=$(cygpath -am ../osgeo4w/lib/pdalcpp.lib) \
 		-D wxWidgets_CONFIGURATION=mswu \
 		-D wxWidgets_ROOT_DIR=$(cygpath -am ../osgeo4w) \
 		-D wxWidgets_LIB_DIR=$(cygpath -am ../osgeo4w/lib/vc_x64_dll) \