GDAL: add v3.9.0 (#44128)

1 files changed, 65 insertions, 41 deletions

diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py
index 00b12b25f2..9df8196557 100644
--- a/var/spack/repos/builtin/packages/gdal/package.py
+++ b/var/spack/repos/builtin/packages/gdal/package.py
@@ -32,6 +32,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
 
     license("MIT")
 
+    version("3.9.0", sha256="577f80e9d14ff7c90b6bfbc34201652b4546700c01543efb4f4c3050e0b3fda2")
     version("3.8.5", sha256="e8b4df2a8a7d25272f867455c0c230459545972f81f0eff2ddbf6a6f60dcb1e4")
     version("3.8.4", sha256="0c53ced95d29474236487202709b49015854f8e02e35e44ed0f4f4e12a7966ce")
     version("3.8.3", sha256="ae2d160f65016e208eca34ff14490ec4511f1fa03fd386ac130449d15e82929d")
@@ -73,29 +74,30 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
     version("3.0.2", sha256="c3765371ce391715c8f28bd6defbc70b57aa43341f6e94605f04fe3c92468983")
     version("3.0.1", sha256="45b4ae25dbd87282d589eca76481c426f72132d7a599556470d5c38263b09266")
     version("3.0.0", sha256="ad316fa052d94d9606e90b20a514b92b2dd64e3142dfdbd8f10981a5fcd5c43e")
-    version("2.4.4", sha256="a383bd3cf555d6e1169666b01b5b3025b2722ed39e834f1b65090f604405dcd8")
-    version("2.4.3", sha256="d52dc3e0cff3af3e898d887c4151442989f416e839948e73f0994f0224bbff60")
-    version("2.4.2", sha256="dcc132e469c5eb76fa4aaff238d32e45a5d947dc5b6c801a123b70045b618e0c")
-    version("2.4.1", sha256="fd51b4900b2fc49b98d8714f55fc8a78ebfd07218357f93fb796791115a5a1ad")
-    version("2.4.0", sha256="c3791dcc6d37e59f6efa86e2df2a55a4485237b0a48e330ae08949f0cdf00f27")
-    version("2.3.3", sha256="c3635e41766a648f945d235b922e3c5306e26a2ee5bbd730d2181e242f5f46fe")
-    version("2.3.2", sha256="3f6d78fe8807d1d6afb7bed27394f19467840a82bc36d65e66316fa0aa9d32a4")
-    version("2.3.1", sha256="9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a")
-    version("2.3.0", sha256="6f75e49aa30de140525ccb58688667efe3a2d770576feb7fbc91023b7f552aa2")
-    version("2.2.4", sha256="441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278")
-    version("2.2.3", sha256="a328d63d476b3653f5a25b5f7971e87a15cdf8860ab0729d4b1157ba988b8d0b")
-    version("2.2.2", sha256="eb25d6ee85f4f5ac1d5581958f8c6eed9b1d50746f82866fe92e507541def35b")
-    version("2.2.1", sha256="927098d54083ac919a497f787b835b099e9a194f2e5444dbff901f7426b86066")
-    version("2.2.0", sha256="0d4c326862e0f118e17418c042c2bcd037b25abd3fb198e1fc5d40b11a9fc8ea")
-    version("2.1.4", sha256="e06a7ae4c4ed2fd678cd045ff50a10ff5002f3b81cdfcd8ab03c39ce962d9b63")
-    version("2.1.3", sha256="b489793627e6cb8d2ff8d7737b61daf58382fe189fae4c581ddfd48c04b49005")
-    version("2.1.2", sha256="b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374")
-    version("2.1.1", sha256="87ce516ce757ad1edf1e21f007fbe232ed2e932af422e9893f40199711c41f92")
-    version("2.1.0", sha256="568b43441955b306364fcf97fb47d4c1512ac6f2f5f76b2ec39a890d2418ee03")
-    version("2.0.3", sha256="3c6c5ade299c7a52fc9c5d2111110c97032e1f0c2593ce6091c364b1a43b442a")
-    version("2.0.2", sha256="90f838853cc1c07e55893483faa7e923e4b4b1659c6bc9df3538366030a7e622")
-    version("2.0.1", sha256="2564c91ed8ed36274ee31002a25798f5babc4221e879cb5013867733d80f9920")
-    version("2.0.0", sha256="91704fafeea2349c5e268dc1e2d03921b3aae64b05ee01d59fdfc1a6b0ffc061")
+    with default_args(deprecated=True):
+        version("2.4.4", sha256="a383bd3cf555d6e1169666b01b5b3025b2722ed39e834f1b65090f604405dcd8")
+        version("2.4.3", sha256="d52dc3e0cff3af3e898d887c4151442989f416e839948e73f0994f0224bbff60")
+        version("2.4.2", sha256="dcc132e469c5eb76fa4aaff238d32e45a5d947dc5b6c801a123b70045b618e0c")
+        version("2.4.1", sha256="fd51b4900b2fc49b98d8714f55fc8a78ebfd07218357f93fb796791115a5a1ad")
+        version("2.4.0", sha256="c3791dcc6d37e59f6efa86e2df2a55a4485237b0a48e330ae08949f0cdf00f27")
+        version("2.3.3", sha256="c3635e41766a648f945d235b922e3c5306e26a2ee5bbd730d2181e242f5f46fe")
+        version("2.3.2", sha256="3f6d78fe8807d1d6afb7bed27394f19467840a82bc36d65e66316fa0aa9d32a4")
+        version("2.3.1", sha256="9c4625c45a3ee7e49a604ef221778983dd9fd8104922a87f20b99d9bedb7725a")
+        version("2.3.0", sha256="6f75e49aa30de140525ccb58688667efe3a2d770576feb7fbc91023b7f552aa2")
+        version("2.2.4", sha256="441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278")
+        version("2.2.3", sha256="a328d63d476b3653f5a25b5f7971e87a15cdf8860ab0729d4b1157ba988b8d0b")
+        version("2.2.2", sha256="eb25d6ee85f4f5ac1d5581958f8c6eed9b1d50746f82866fe92e507541def35b")
+        version("2.2.1", sha256="927098d54083ac919a497f787b835b099e9a194f2e5444dbff901f7426b86066")
+        version("2.2.0", sha256="0d4c326862e0f118e17418c042c2bcd037b25abd3fb198e1fc5d40b11a9fc8ea")
+        version("2.1.4", sha256="e06a7ae4c4ed2fd678cd045ff50a10ff5002f3b81cdfcd8ab03c39ce962d9b63")
+        version("2.1.3", sha256="b489793627e6cb8d2ff8d7737b61daf58382fe189fae4c581ddfd48c04b49005")
+        version("2.1.2", sha256="b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374")
+        version("2.1.1", sha256="87ce516ce757ad1edf1e21f007fbe232ed2e932af422e9893f40199711c41f92")
+        version("2.1.0", sha256="568b43441955b306364fcf97fb47d4c1512ac6f2f5f76b2ec39a890d2418ee03")
+        version("2.0.3", sha256="3c6c5ade299c7a52fc9c5d2111110c97032e1f0c2593ce6091c364b1a43b442a")
+        version("2.0.2", sha256="90f838853cc1c07e55893483faa7e923e4b4b1659c6bc9df3538366030a7e622")
+        version("2.0.1", sha256="2564c91ed8ed36274ee31002a25798f5babc4221e879cb5013867733d80f9920")
+        version("2.0.0", sha256="91704fafeea2349c5e268dc1e2d03921b3aae64b05ee01d59fdfc1a6b0ffc061")
 
     # Optional dependencies
     variant("archive", default=False, when="@3.7:", description="Optional for vsi7z VFS driver")
@@ -251,18 +253,22 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
 
     with when("build_system=cmake"):
         generator("ninja")
+        depends_on("cmake@3.16:", type="build", when="@3.9:")
         depends_on("cmake@3.9:", type="build")
 
     with when("build_system=autotools"):
         depends_on("gmake", type="build")
 
     # Required dependencies
+    # Versions come from gdal_check_package in cmake/helpers/CheckDependentLibraries.cmake
     depends_on("pkgconfig@0.25:", type="build")
+    depends_on("proj@6.3.1:", when="@3.9:")
     depends_on("proj@6:", when="@3:")
     depends_on("proj@:6", when="@2.5:2")
     depends_on("proj@:5", when="@2.4")
     depends_on("proj@:4", when="@:2.3")
     depends_on("zlib-api")
+    depends_on("libtiff@4.1:", when="@3.9:")
     depends_on("libtiff@4:", when="@3:")
     depends_on("libtiff@3.6.0:")  # 3.9.0+ needed to pass testsuite
     depends_on("libgeotiff@1.5:", when="@3:")
@@ -283,6 +289,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
     # depends_on('bsb', when='+bsb')
     depends_on("cfitsio", when="+cfitsio")
     depends_on("crunch", when="+crnlib")
+    depends_on("curl@7.68:", when="@3.9:+curl")
     depends_on("curl", when="+curl")
     depends_on("cryptopp", when="+cryptopp")
     depends_on("libdeflate", when="+deflate")
@@ -294,6 +301,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
     # depends_on('fme', when='+fme')
     depends_on("freexl", when="+freexl")
     depends_on("fyba", when="+fyba")
+    depends_on("geos@3.8:", when="@3.9:+geos")
     depends_on("geos@3.1:", when="+geos")
     depends_on("giflib", when="+gif")
     depends_on("grass@5.7:", when="+grass")
@@ -301,9 +309,11 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
     depends_on("libgta", when="+gta")
     depends_on("libheif@1.1:", when="+heif")
     depends_on("hdf", when="+hdf4")
-    depends_on("hdf5+cxx", when="+hdf5")
-    depends_on("hdf5@:1.13", when="@:3.5 +hdf5")
-    depends_on("hdf5@:1.12", when="@:3.4 +hdf5")
+    depends_on("hdf5@1.10:", when="@3.9:+hdf5")
+    depends_on("hdf5@:1.13", when="@:3.5+hdf5")
+    depends_on("hdf5@:1.12", when="@:3.4+hdf5")
+    depends_on("hdf5+cxx", when="@3.8:+hdf5+kea")
+    depends_on("hdf5+cxx", when="@:3.7+hdf5")
     depends_on("hadoop", when="+hdfs")
     depends_on("iconv", when="+iconv")
     # depends_on('idb', when='+idb')
@@ -318,6 +328,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
     # depends_on('libcsf', when='+libcsf')
     depends_on("libkml@1.3:", when="+libkml")
     depends_on("xz", when="+liblzma")
+    depends_on("qb3", when="+libqb3")
     depends_on("libxml2", when="+libxml2")
     # depends_on('luratech', when='+luratech')
     depends_on("lz4", when="+lz4")
@@ -330,6 +341,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
     # depends_on('mssql_ncli', when='+mssql_ncli')
     # depends_on('mssql_odbc', when='+mssql_odbc')
     depends_on("mysql", when="+mysql")
+    depends_on("netcdf-c@4.7:", when="@3.9:+netcdf")
     depends_on("netcdf-c", when="+netcdf")
     depends_on("unixodbc", when="+odbc")
     # depends_on('odbc-cpp-wrapper', when='+odbccpp')
@@ -337,6 +349,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
     # depends_on('lib-opencad', when='+opencad')
     depends_on("opencl", when="+opencl")
     depends_on("openexr@2.2:", when="+openexr")
+    depends_on("openjpeg@2.3.1:", when="@3.9:+openjpeg")
     depends_on("openjpeg", when="+openjpeg")
     depends_on("openssl", when="+openssl")
     depends_on("oracle-instant-client", when="+oracle")
@@ -345,26 +358,32 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
     depends_on("pcre2", when="@3.5:+pcre2")
     depends_on("pcre", when="@:3.4+pcre2")
     # depends_on('pdfium', when='+pdfium')
+    depends_on("libpng@1.6:", when="@3.9:+png")
     depends_on("libpng", when="+png")
     # depends_on('podofo', when='+podofo')
+    depends_on("poppler@0.86:", when="@3.9:+poppler")
+    depends_on("poppler@0.24:", when="@3:+poppler")
+    depends_on("poppler@:0.63", when="@:2.3+poppler")
+    depends_on("poppler@:0.71", when="@:2.4+poppler")
+    depends_on("poppler@:21", when="@:3.4.1+poppler")
     depends_on("poppler", when="+poppler")
-    depends_on("poppler@0.24:", when="@3: +poppler")
-    depends_on("poppler@:0.63", when="@:2.3 +poppler")
-    depends_on("poppler@:0.71", when="@:2.4 +poppler")
-    depends_on("poppler@:21", when="@:3.4.1 +poppler")
     depends_on("postgresql", when="+postgresql")
-    depends_on("qb3", when="+libqb3")
     depends_on("qhull", when="+qhull")
     depends_on("qhull@2015:", when="@3.5:+qhull")
     depends_on("qhull@:2020.1", when="@:3.3+qhull")
     # depends_on('rasdaman', when='+rasdaman')
-    # depends_on('rasterlite2@1.1:', when='+rasterlite2')
+    # depends_on('rasterlite2@1.1:', when='@3.7:+rasterlite2')
+    # depends_on('rasterlite2', when='+rasterlite2')
     # depends_on('rdblib', when='+rdb')
     # depends_on('sde', when='+sde')
     depends_on("sfcgal", when="+sfcgal")
+    depends_on("libspatialite@4.1.2:", when="@3.7:+spatialite")
     depends_on("libspatialite", when="+spatialite")
+    depends_on("sqlite@3.31:", when="@3.9:+sqlite3")
     depends_on("sqlite@3:", when="+sqlite3")
     # depends_on('teigha', when='+teigha')
+    # depends_on('tiledb@2.15:', when='@3.9:+tiledb')
+    # depends_on('tiledb@2.7:', when='@3.7:+tiledb')
     # depends_on('tiledb', when='+tiledb')
     depends_on("libwebp", when="+webp")
     depends_on("xerces-c@3.1:", when="+xercesc")
@@ -377,14 +396,15 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
     # extends('openjdk', when='+java')
     # extends('perl', when='+perl')
 
-    # see gdal_version_and_min_supported_python_version
-    # in swig/python/osgeo/__init__.py
-    depends_on("python@3.6:", type=("build", "link", "run"), when="@3.3:+python")
-    depends_on("python@2.0:", type=("build", "link", "run"), when="@3.2:+python")
+    # swig/python/pyproject.toml (3.9+)
+    # swig/python/setup.py.in (3.5-3.8)
+    # swig/python/osgeo/__init__.py (3.4-)
     depends_on("python", type=("build", "link", "run"), when="+python")
     # Uses distutils
     depends_on("python@:3.11", type=("build", "link", "run"), when="@:3.4+python")
-    # swig/python/setup.py
+    # swig/python/pyproject.toml (3.9+)
+    # swig/python/setup.py (3.8-)
+    depends_on("py-setuptools@67:", type="build", when="@3.9:+python")
     depends_on("py-setuptools@:57", type="build", when="@:3.2+python")  # needs 2to3
     depends_on("py-setuptools", type="build", when="+python")
     depends_on("py-numpy@1.0.0:", type=("build", "run"), when="+python")
@@ -403,13 +423,17 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):
     # https://gdal.org/development/rfc/rfc88_googletest.html
     depends_on("googletest@1.10:", type="test")
 
-    # https://trac.osgeo.org/gdal/wiki/SupportedCompilers
+    # https://gdal.org/development/rfc/rfc98_build_requirements_gdal_3_9.html
+    msg = "GDAL requires C++17 support"
+    conflicts("%gcc@:7", msg=msg)
+    conflicts("%clang@:4", msg=msg)
+    conflicts("%msvc@:19.14", msg=msg)
+
+    # https://gdal.org/development/rfc/rfc68_cplusplus11.html
     msg = "GDAL requires C++11 support"
     conflicts("%gcc@:4.8.0", msg=msg)
     conflicts("%clang@:3.2", msg=msg)
-    conflicts("%intel@:12", msg=msg)
-    conflicts("%xl@:13.0", msg=msg)
-    conflicts("%xl_r@:13.0", msg=msg)
+    conflicts("%msvc@:13", msg=msg)
 
     # https://github.com/OSGeo/gdal/issues/5994
     conflicts("~png", when="@3:3.5.0")