ci: update to Fedora 36

add GRASS[78] to build options
provide more Fedora build deps i.e. PDAL, GRASS
enable PDAL everywhere (was Qt5 only)

.docker/docker-qgis-build.sh

@@ -63,6 +63,12 @@ if [[ ${PATCH_QT_3D} == "true" ]]; then
   )
 fi
 
+if [[ ${WITH_GRASS7} == "ON" || ${WITH_GRASS8} == "ON" ]]; then
+  CMAKE_EXTRA_ARGS+=(
+    "-DGRASS_PREFIX$( grass --config version | cut -b 1 )=$( grass --config path )"
+  )
+fi
+
 cmake \
  -GNinja \
  -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
@@ -74,7 +80,8 @@ cmake \
  -DWITH_QUICK=${WITH_QUICK} \
  -DWITH_3D=${WITH_3D} \
  -DWITH_STAGED_PLUGINS=ON \
- -DWITH_GRASS=OFF \
+ -DWITH_GRASS7=${WITH_GRASS7} \
+ -DWITH_GRASS8=${WITH_GRASS8} \
  -DSUPPRESS_QT_WARNINGS=ON \
  -DENABLE_TESTS=ON \
  -DENABLE_MODELTEST=${WITH_QT5} \
@@ -94,7 +101,7 @@ cmake \
  -DWITH_SERVER=${WITH_QT5} \
  -DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_QT5} \
  -DWITH_ORACLE=${WITH_QT5} \
- -DWITH_PDAL=${WITH_QT5} \
+ -DWITH_PDAL=ON \
  -DWITH_QT5SERIALPORT=${WITH_QT5} \
  -DWITH_QTWEBKIT=${WITH_QT5} \
  -DWITH_OAUTH2_PLUGIN=${WITH_QT5} \

.docker/qgis3-qt6-build-deps.dockerfile

@@ -1,4 +1,6 @@
-FROM fedora:34 as single
+ARG DISTRO_VERSION=36
+
+FROM fedora:${DISTRO_VERSION} as single
 MAINTAINER Matthias Kuhn <matthias@opengis.ch>
 
 RUN dnf -y install \
@@ -13,12 +15,18 @@ RUN dnf -y install \
     git \
     gdal-devel \
     geos-devel \
+    grass \
+    grass-devel \
     gsl-devel \
     libpq-devel \
     libspatialite-devel \
+    libxml2-devel \
     libzip-devel \
     libzstd-devel \
+    netcdf-devel \
     ninja-build \
+    ocl-icd-devel \
+    PDAL-devel \
     proj-devel \
     protobuf-devel \
     protobuf-lite-devel \